From 056658bd2986d9e12ac07a54d25c08eb8a62ff60 Mon Sep 17 00:00:00 2001 From: Léo Gourdin Date: Wed, 28 Jul 2021 10:32:09 +0200 Subject: remove todos, clean --- riscV/BTL_SEsimplify.v | 25 ++++--------------------- riscV/ExpansionOracle.ml | 1 - riscV/RTLpathSE_simplify.v | 23 ++++------------------- 3 files changed, 8 insertions(+), 41 deletions(-) (limited to 'riscV') diff --git a/riscV/BTL_SEsimplify.v b/riscV/BTL_SEsimplify.v index baa4edeb..ab01f7ac 100644 --- a/riscV/BTL_SEsimplify.v +++ b/riscV/BTL_SEsimplify.v @@ -854,23 +854,6 @@ Proof. Qed. Local Hint Resolve optbool_mktotal: core. -(* TODO gourdinl move to common/Values ? *) -Theorem swap_cmpf_bool: - forall c x y, - Val.cmpf_bool (swap_comparison c) x y = Val.cmpf_bool c y x. -Proof. - destruct x; destruct y; simpl; auto. rewrite Float.cmp_swap. auto. -Qed. -Local Hint Resolve swap_cmpf_bool: core. - -Theorem swap_cmpfs_bool: - forall c x y, - Val.cmpfs_bool (swap_comparison c) x y = Val.cmpfs_bool c y x. -Proof. - destruct x; destruct y; simpl; auto. rewrite Float32.cmp_swap. auto. -Qed. -Local Hint Resolve swap_cmpfs_bool: core. - (** * Intermediates lemmas on each expanded instruction *) Lemma simplify_ccomp_correct (ctx: iblock_exec_context) (hrs: ristate) (st: sistate) @@ -1140,9 +1123,9 @@ Proof. rewrite !REG_EQ, OKv1, OKv2; trivial; unfold Val.cmpf. - replace (Clt) with (swap_comparison Cgt) by auto; - rewrite swap_cmpf_bool; trivial. + rewrite Val.swap_cmpf_bool; trivial. - replace (Cle) with (swap_comparison Cge) by auto; - rewrite swap_cmpf_bool; trivial. + rewrite Val.swap_cmpf_bool; trivial. Qed. Lemma simplify_cnotcompf_correct (ctx: iblock_exec_context) (hrs: ristate) (st: sistate) @@ -1181,9 +1164,9 @@ Proof. rewrite !REG_EQ, OKv1, OKv2; trivial; unfold Val.cmpfs. - replace (Clt) with (swap_comparison Cgt) by auto; - rewrite swap_cmpfs_bool; trivial. + rewrite Val.swap_cmpfs_bool; trivial. - replace (Cle) with (swap_comparison Cge) by auto; - rewrite swap_cmpfs_bool; trivial. + rewrite Val.swap_cmpfs_bool; trivial. Qed. Lemma simplify_cnotcompfs_correct (ctx: iblock_exec_context) (hrs: ristate) (st: sistate) diff --git a/riscV/ExpansionOracle.ml b/riscV/ExpansionOracle.ml index 7295ae0d..49ca7e96 100644 --- a/riscV/ExpansionOracle.ml +++ b/riscV/ExpansionOracle.ml @@ -24,7 +24,6 @@ open Asmgen (** Tools *) -(** TODO gourdinl move to BTLcommonaux *) let rec iblock_to_list ib = match ib with | Bseq (ib1, ib2) -> iblock_to_list ib1 @ iblock_to_list ib2 diff --git a/riscV/RTLpathSE_simplify.v b/riscV/RTLpathSE_simplify.v index 2739bc5d..2370ad66 100644 --- a/riscV/RTLpathSE_simplify.v +++ b/riscV/RTLpathSE_simplify.v @@ -838,21 +838,6 @@ Proof. destruct v; simpl; auto. Qed. -(* TODO gourdinl move to common/Values ? *) -Theorem swap_cmpf_bool: - forall c x y, - Val.cmpf_bool (swap_comparison c) x y = Val.cmpf_bool c y x. -Proof. - destruct x; destruct y; simpl; auto. rewrite Float.cmp_swap. auto. -Qed. - -Theorem swap_cmpfs_bool: - forall c x y, - Val.cmpfs_bool (swap_comparison c) x y = Val.cmpfs_bool c y x. -Proof. - destruct x; destruct y; simpl; auto. rewrite Float32.cmp_swap. auto. -Qed. - (** * Intermediates lemmas on each expanded instruction *) Lemma simplify_ccomp_correct ge sp hst st c r r0 rs0 m0 v v0: forall @@ -1239,9 +1224,9 @@ Proof. unfold Val.cmpf. - apply xor_neg_eqne_cmpf. - replace (Clt) with (swap_comparison Cgt) by auto; - rewrite swap_cmpf_bool; trivial. + rewrite Val.swap_cmpf_bool; trivial. - replace (Cle) with (swap_comparison Cge) by auto; - rewrite swap_cmpf_bool; trivial. + rewrite Val.swap_cmpf_bool; trivial. Qed. Lemma simplify_cnotcompf_correct ge sp hst st c r r0 rs0 m0 v v0: forall @@ -1290,9 +1275,9 @@ Proof. unfold Val.cmpfs. - apply xor_neg_eqne_cmpfs. - replace (Clt) with (swap_comparison Cgt) by auto; - rewrite swap_cmpfs_bool; trivial. + rewrite Val.swap_cmpfs_bool; trivial. - replace (Cle) with (swap_comparison Cge) by auto; - rewrite swap_cmpfs_bool; trivial. + rewrite Val.swap_cmpfs_bool; trivial. Qed. Lemma simplify_cnotcompfs_correct ge sp hst st c r r0 rs0 m0 v v0: forall -- cgit