diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /ia32/ValueAOp.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'ia32/ValueAOp.v')
-rw-r--r-- | ia32/ValueAOp.v | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ia32/ValueAOp.v b/ia32/ValueAOp.v index 93fd8954..ad18c4f6 100644 --- a/ia32/ValueAOp.v +++ b/ia32/ValueAOp.v @@ -132,7 +132,7 @@ Proof. inv VM. destruct cond; auto with va. inv H0. - destruct cond; simpl; eauto with va. + destruct cond; simpl; eauto with va. inv H2. destruct cond; simpl; eauto with va. destruct cond; auto with va. @@ -149,7 +149,7 @@ Lemma symbol_address_sound_2: forall id ofs, vmatch bc (Genv.symbol_address ge id ofs) (Ifptr (Gl id ofs)). Proof. - intros. unfold Genv.symbol_address. destruct (Genv.find_symbol ge id) as [b|] eqn:F. + intros. unfold Genv.symbol_address. destruct (Genv.find_symbol ge id) as [b|] eqn:F. constructor. constructor. apply GENV; auto. constructor. Qed. @@ -173,7 +173,7 @@ Theorem eval_static_addressing_sound: Proof. unfold eval_addressing, eval_static_addressing; intros; destruct addr; InvHyps; eauto with va. - rewrite Int.add_zero_l; auto with va. + rewrite Int.add_zero_l; auto with va. Qed. Theorem eval_static_operation_sound: @@ -187,7 +187,7 @@ Proof. destruct (propagate_float_constants tt); constructor. destruct (propagate_float_constants tt); constructor. eapply eval_static_addressing_sound; eauto. - apply of_optbool_sound. eapply eval_static_condition_sound; eauto. + apply of_optbool_sound. eapply eval_static_condition_sound; eauto. Qed. End SOUNDNESS. |