aboutsummaryrefslogtreecommitdiffstats
path: root/backend/Tunnelingproof.v
diff options
context:
space:
mode:
Diffstat (limited to 'backend/Tunnelingproof.v')
-rw-r--r--backend/Tunnelingproof.v13
1 files changed, 6 insertions, 7 deletions
diff --git a/backend/Tunnelingproof.v b/backend/Tunnelingproof.v
index 126b7b87..3bc92f75 100644
--- a/backend/Tunnelingproof.v
+++ b/backend/Tunnelingproof.v
@@ -66,7 +66,7 @@ Local Hint Resolve target_None Z.abs_nonneg: core.
Lemma get_nonneg td pc t d: get td pc = (t, d) -> (0 <= d)%Z.
Proof.
- unfold get. destruct (td!_) as [(t0&d0)|]; intros H; inversion H; subst; simpl; omega || auto.
+ unfold get. destruct (td!_) as [(t0&d0)|]; intros H; inversion H; subst; simpl; lia || auto.
Qed.
Local Hint Resolve get_nonneg: core.
@@ -469,11 +469,10 @@ Proof.
* econstructor; eauto.
+ (* FT_branch *)
simpl; right.
- rewrite EQ; repeat (econstructor; omega || eauto).
+ rewrite EQ; repeat (econstructor; lia || eauto).
+ (* FT_cond *)
simpl; right.
- repeat (econstructor; omega || eauto); simpl.
- apply Nat.max_case; omega.
+ repeat (econstructor; lia || eauto); simpl.
destruct (peq _ _); try congruence.
- (* Lop *)
exploit eval_operation_lessdef. apply reglist_lessdef; eauto. eauto. eauto.
@@ -568,7 +567,7 @@ Proof.
eapply exec_Lbranch; eauto.
fold (branch_target f pc). econstructor; eauto.
- (* Lbranch (eliminated) *)
- right; split. simpl. omega. split. auto. constructor; auto.
+ right; split. simpl. lia. split. auto. constructor; auto.
- (* Lcond (preserved) *)
simpl; left; destruct (peq _ _) eqn: EQ.
+ econstructor; split.
@@ -583,8 +582,8 @@ Proof.
destruct (peq _ _) eqn: EQ; try inv H1.
right; split; simpl.
+ destruct b.
- generalize (Nat.le_max_l (bound (branch_target f) pc1) (bound (branch_target f) pc2)); omega.
- generalize (Nat.le_max_r (bound (branch_target f) pc1) (bound (branch_target f) pc2)); omega.
+ generalize (Nat.le_max_l (bound (branch_target f) pc1) (bound (branch_target f) pc2)); lia.
+ generalize (Nat.le_max_r (bound (branch_target f) pc1) (bound (branch_target f) pc2)); lia.
+ destruct b.
-- repeat (constructor; auto).
-- rewrite e; repeat (constructor; auto).