diff options
| author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2011-03-09 13:35:00 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2011-03-09 13:35:00 +0000 |
| commit | 3ffda353b0d92ccd0ff3693ad0be81531c3c0537 (patch) | |
| tree | 9a07da4e83919d763086e379de161fd4cfe8ab02 /backend | |
| parent | 06c55ab8fa4c0bf59479faf03d30a51c780da36e (diff) | |
| download | compcert-kvx-3ffda353b0d92ccd0ff3693ad0be81531c3c0537.tar.gz compcert-kvx-3ffda353b0d92ccd0ff3693ad0be81531c3c0537.zip | |
Updated for Coq 8.3pl1. Some cleanups in test/*/Makefile.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1597 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/CSE.v | 10 | ||||
| -rw-r--r-- | backend/Coloringaux.ml | 5 | ||||
| -rw-r--r-- | backend/Coloringproof.v | 2 | ||||
| -rw-r--r-- | backend/InterfGraph.v | 4 |
4 files changed, 6 insertions, 15 deletions
diff --git a/backend/CSE.v b/backend/CSE.v index 4347c334..45b50d6f 100644 --- a/backend/CSE.v +++ b/backend/CSE.v @@ -57,15 +57,7 @@ Definition eq_valnum: forall (x y: valnum), {x=y}+{x<>y} := peq. Definition eq_list_valnum (x y: list valnum) : {x=y}+{x<>y}. Proof. - induction x; intros; case y; intros. - left; auto. - right; congruence. - right; congruence. - case (eq_valnum a v); intros. - case (IHx l); intros. - left; congruence. - right; congruence. - right; congruence. + decide equality. apply eq_valnum. Qed. Definition eq_rhs (x y: rhs) : {x=y}+{x<>y}. diff --git a/backend/Coloringaux.ml b/backend/Coloringaux.ml index 04209726..02081d56 100644 --- a/backend/Coloringaux.ml +++ b/backend/Coloringaux.ml @@ -169,13 +169,12 @@ end module IntSet = Set.Make(struct type t = int - let compare x y = - if x < y then -1 else if x > y then 1 else 0 + let compare (x:int) (y:int) = compare x y end) module IntPairSet = Set.Make(struct type t = int * int - let compare (x1, y1) (x2, y2) = + let compare ((x1, y1): (int * int)) (x2, y2) = if x1 < x2 then -1 else if x1 > x2 then 1 else if y1 < y2 then -1 else diff --git a/backend/Coloringproof.v b/backend/Coloringproof.v index bb97c87a..ca0637a7 100644 --- a/backend/Coloringproof.v +++ b/backend/Coloringproof.v @@ -658,7 +658,7 @@ Lemma check_coloring_3_correct: Proof. unfold check_coloring_3; intros. exploit Regset.for_all_2; eauto. - red; intros. hnf in H1. congruence. + red; intros. congruence. apply Regset.mem_2. eauto. simpl. intro. elim (andb_prop _ _ H1); intros. split. apply loc_is_acceptable_correct; auto. diff --git a/backend/InterfGraph.v b/backend/InterfGraph.v index a73e7d71..ec64e99b 100644 --- a/backend/InterfGraph.v +++ b/backend/InterfGraph.v @@ -243,7 +243,7 @@ Proof. apply Regset.add_2; apply Regset.add_2; tauto. intros. rewrite SetRegReg.fold_1. apply H. - intuition. left. apply SetRegReg.elements_1. auto. + intuition. Qed. Lemma in_setregreg_fold': @@ -276,7 +276,7 @@ Proof. apply Regset.add_2; auto. intros. rewrite SetRegMreg.fold_1. apply H with mr2. - intuition. left. apply SetRegMreg.elements_1. auto. + intuition. Qed. Lemma all_interf_regs_correct_1: |