diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-10-05 08:11:34 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-10-05 08:11:34 +0000 |
| commit | a6c369cbd63996c1571ae601b7d92070f024b22c (patch) | |
| tree | dc4f3f5a52ae4ea230f307ce5f442137f014b79b /cfrontend/Cexec.v | |
| parent | b55147379939553eccd4289fd18e7f161619be4d (diff) | |
Merge of the "alignas" branch.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2342 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'cfrontend/Cexec.v')
| -rw-r--r-- | cfrontend/Cexec.v | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cfrontend/Cexec.v b/cfrontend/Cexec.v index 70a02c1..f83c700 100644 --- a/cfrontend/Cexec.v +++ b/cfrontend/Cexec.v @@ -285,7 +285,7 @@ Definition do_deref_loc (w: world) (ty: type) (m: mem) (b: block) (ofs: int) : o end. Definition assign_copy_ok (ty: type) (b: block) (ofs: int) (b': block) (ofs': int) : Prop := - (alignof ty | Int.unsigned ofs') /\ (alignof ty | Int.unsigned ofs) /\ + (alignof_blockcopy ty | Int.unsigned ofs') /\ (alignof_blockcopy ty | Int.unsigned ofs) /\ (b' <> b \/ Int.unsigned ofs' = Int.unsigned ofs \/ Int.unsigned ofs' + sizeof ty <= Int.unsigned ofs \/ Int.unsigned ofs + sizeof ty <= Int.unsigned ofs'). @@ -295,9 +295,10 @@ Remark check_assign_copy: { assign_copy_ok ty b ofs b' ofs' } + {~ assign_copy_ok ty b ofs b' ofs' }. Proof with try (right; intuition omega). intros. unfold assign_copy_ok. - assert (alignof ty > 0). apply alignof_pos; auto. - destruct (Zdivide_dec (alignof ty) (Int.unsigned ofs')); auto... - destruct (Zdivide_dec (alignof ty) (Int.unsigned ofs)); auto... + assert (alignof_blockcopy ty > 0). + { unfold alignof_blockcopy. apply Z.min_case. omega. apply alignof_pos. } + destruct (Zdivide_dec (alignof_blockcopy ty) (Int.unsigned ofs')); auto... + destruct (Zdivide_dec (alignof_blockcopy ty) (Int.unsigned ofs)); auto... assert (Y: {b' <> b \/ Int.unsigned ofs' = Int.unsigned ofs \/ Int.unsigned ofs' + sizeof ty <= Int.unsigned ofs \/ |