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 /arm/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 'arm/ValueAOp.v')
| -rw-r--r-- | arm/ValueAOp.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm/ValueAOp.v b/arm/ValueAOp.v index b388bf12..64a34329 100644 --- a/arm/ValueAOp.v +++ b/arm/ValueAOp.v @@ -189,7 +189,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: @@ -204,7 +204,7 @@ Proof. destruct (propagate_float_constants tt); constructor. rewrite Int.add_zero_l; eauto with va. fold (Val.sub (Vint i) a1). auto with va. - apply of_optbool_sound. eapply eval_static_condition_sound; eauto. + apply of_optbool_sound. eapply eval_static_condition_sound; eauto. Qed. End SOUNDNESS. |