diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-10-16 18:34:30 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-10-16 18:34:30 +0200 |
| commit | d4e2f7b715b21efe0d693415ab63dad5a22afa92 (patch) | |
| tree | b29b8e158a61865a16f6dba7ea14eba767bf4516 | |
| parent | 9ee131bd329d1941eb37eb347f36a0c613a719a9 (diff) | |
| download | compcert-kvx-d4e2f7b715b21efe0d693415ab63dad5a22afa92.tar.gz compcert-kvx-d4e2f7b715b21efe0d693415ab63dad5a22afa92.zip | |
eq_condition already existed
| -rw-r--r-- | backend/Duplicate.v | 2 | ||||
| -rw-r--r-- | backend/Duplicateproof.v | 2 | ||||
| -rw-r--r-- | mppa_k1c/Op.v | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/backend/Duplicate.v b/backend/Duplicate.v index d1458bd4..68a7f413 100644 --- a/backend/Duplicate.v +++ b/backend/Duplicate.v @@ -157,7 +157,7 @@ Definition verify_match_inst revmap inst tinst := | Icond cond' lr' n1' n2' => do u1 <- verify_is_copy revmap n1 n1'; do u2 <- verify_is_copy revmap n2 n2'; - if (condition_eq cond cond') then + if (eq_condition cond cond') then if (list_eq_dec Pos.eq_dec lr lr') then OK tt else Error (msg "Different lr in Icond") else Error (msg "Different cond in Icond") diff --git a/backend/Duplicateproof.v b/backend/Duplicateproof.v index 54dd6196..d16505dd 100644 --- a/backend/Duplicateproof.v +++ b/backend/Duplicateproof.v @@ -132,7 +132,7 @@ Proof. - destruct i'; try (inversion H; fail). monadInv H. destruct x. eapply verify_is_copy_correct in EQ. destruct x0. eapply verify_is_copy_correct in EQ1. - destruct (condition_eq _ _); try discriminate. + destruct (eq_condition _ _); try discriminate. destruct (list_eq_dec _ _ _); try discriminate. subst. constructor; assumption. (* Ijumptable *) diff --git a/mppa_k1c/Op.v b/mppa_k1c/Op.v index ce9a5dcd..f9a774e8 100644 --- a/mppa_k1c/Op.v +++ b/mppa_k1c/Op.v @@ -51,12 +51,6 @@ Inductive condition : Type := | Ccompfs (c: comparison) (**r 32-bit floating-point comparison *) | Cnotcompfs (c: comparison). (**r negation of a floating-point comparison *) -Definition condition_eq: forall (x y: condition), {x = y} + {x <> y}. -Proof. - generalize comparison_eq int_eq int64_eq. - decide equality. -Defined. - Inductive condition0 : Type := | Ccomp0 (c: comparison) (**r signed integer comparison with 0 *) | Ccompu0 (c: comparison) (**r unsigned integer comparison with 0 *) |