diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-01-14 14:23:26 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-01-14 14:23:26 +0000 |
| commit | a82c9c0e4a0b8e37c9c3ea5ae99714982563606f (patch) | |
| tree | 93b9999698a4cd47ec4cb5fcdcdfd215d62f8e9e /ia32/Asmgenproof.v | |
| parent | bb8f49c419eb8205ef541edcbe17f4d14aa99564 (diff) | |
Merge of the nonstrict-ops branch:
- Most RTL operators now evaluate to Some Vundef instead of None
when undefined behavior occurs.
- More aggressive instruction selection.
- "Bertotization" of pattern-matchings now implemented by a proper preprocessor.
- Cast optimization moved to cfrontend/Cminorgen; removed backend/CastOptim.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1790 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'ia32/Asmgenproof.v')
| -rw-r--r-- | ia32/Asmgenproof.v | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ia32/Asmgenproof.v b/ia32/Asmgenproof.v index e8c6757..a49a7ff 100644 --- a/ia32/Asmgenproof.v +++ b/ia32/Asmgenproof.v @@ -844,8 +844,9 @@ Proof. intros [v' [A B]]. rewrite (sp_val _ _ _ AG) in A. left; eapply exec_straight_steps; eauto; intros. simpl in H1. exploit transl_op_correct; eauto. intros [rs2 [P [Q R]]]. + assert (S: Val.lessdef v (rs2 (preg_of res))) by (eapply Val.lessdef_trans; eauto). exists rs2; split. eauto. - split. rewrite <- Q in B. + split. unfold undef_op. destruct op; try (eapply agree_set_undef_mreg; eauto). eapply agree_set_undef_move_mreg; eauto. @@ -1119,8 +1120,10 @@ Proof. intros; red; intros; inv MS. assert (f0 = f) by congruence. subst f0. exploit eval_condition_lessdef. eapply preg_vals; eauto. eauto. eauto. intros EC. left; eapply exec_straight_steps_goto; eauto. - intros. simpl in H2. - exploit transl_cond_correct; eauto. intros [rs' [A [B C]]]. + intros. simpl in H2. + destruct (transl_cond_correct tge tf cond args _ _ rs m' H2) + as [rs' [A [B C]]]. + unfold PregEq.t in B; rewrite EC in B. destruct (testcond_for_condition cond); simpl in *. (* simple jcc *) exists (Pjcc c1 lbl); exists k; exists rs'. @@ -1165,7 +1168,9 @@ Proof. intros; red; intros; inv MS. exploit eval_condition_lessdef. eapply preg_vals; eauto. eauto. eauto. intros EC. left; eapply exec_straight_steps; eauto. intros. simpl in H0. - exploit transl_cond_correct; eauto. intros [rs' [A [B C]]]. + destruct (transl_cond_correct tge tf cond args _ _ rs m' H0) + as [rs' [A [B C]]]. + unfold PregEq.t in B; rewrite EC in B. destruct (testcond_for_condition cond); simpl in *. (* simple jcc *) econstructor; split. |