diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-05-07 13:02:59 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-05-07 13:02:59 +0200 |
| commit | 10def48b639b8e83ae6cc8bf9c14da8c12e98370 (patch) | |
| tree | 845a0160e69cdfe4c7c152a6ef8ad34a6abcae23 /arm | |
| parent | 4705c24a336d831dd5afb02288fda17c0093c438 (diff) | |
| parent | 56bac3dc3d45c219db5d9c7b6a97794c00f8115e (diff) | |
| download | compcert-10def48b639b8e83ae6cc8bf9c14da8c12e98370.tar.gz compcert-10def48b639b8e83ae6cc8bf9c14da8c12e98370.zip | |
Merge branch 'master' into json_export
Diffstat (limited to 'arm')
| -rw-r--r-- | arm/Op.v | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -878,10 +878,10 @@ Proof. apply Values.Val.add_inject; auto. apply eval_shift_inj; auto. apply Values.Val.add_inject; auto. - apply Values.Val.sun_inject; auto. - apply Values.Val.sun_inject; auto. apply eval_shift_inj; auto. - apply Values.Val.sun_inject; auto. apply eval_shift_inj; auto. - apply (@Values.Val.sun_inject f (Vint i) (Vint i) v v'); auto. + apply Values.Val.sub_inject; auto. + apply Values.Val.sub_inject; auto. apply eval_shift_inj; auto. + apply Values.Val.sub_inject; auto. apply eval_shift_inj; auto. + apply (@Values.Val.sub_inject f (Vint i) (Vint i) v v'); auto. inv H4; inv H2; simpl; auto. apply Values.Val.add_inject; auto. inv H4; inv H2; simpl; auto. |