diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-11 08:30:14 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-11 08:30:14 +0200 |
| commit | d5b86a98560c36fbcb3ab8d2698e09147acda512 (patch) | |
| tree | f3ab850a1620fa5d3dbbe439998d09de8e0d817d /common/Memory.v | |
| parent | ea2d6b70ed06c60dba9ba81cf53883c85fb92068 (diff) | |
| parent | 3872ce9f9806d9af334b1fde092145edf664d170 (diff) | |
| download | compcert-d5b86a98560c36fbcb3ab8d2698e09147acda512.tar.gz compcert-d5b86a98560c36fbcb3ab8d2698e09147acda512.zip | |
Merge branch 'master' into add-file
Diffstat (limited to 'common/Memory.v')
| -rw-r--r-- | common/Memory.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/Memory.v b/common/Memory.v index f32d21c7..672012be 100644 --- a/common/Memory.v +++ b/common/Memory.v @@ -1500,11 +1500,11 @@ Qed. Theorem loadbytes_storebytes_same: loadbytes m2 b ofs (Z_of_nat (length bytes)) = Some bytes. Proof. - intros. unfold storebytes in STORE. unfold loadbytes. + intros. assert (STORE2:=STORE). unfold storebytes in STORE2. unfold loadbytes. destruct (range_perm_dec m1 b ofs (ofs + Z_of_nat (length bytes)) Cur Writable); try discriminate. rewrite pred_dec_true. - decEq. inv STORE; simpl. rewrite PMap.gss. rewrite nat_of_Z_of_nat. + decEq. inv STORE2; simpl. rewrite PMap.gss. rewrite nat_of_Z_of_nat. apply getN_setN_same. red; eauto with mem. Qed. |