diff options
| author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-07-23 15:01:54 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-07-23 15:01:54 +0000 |
| commit | 4297fcb821c3188449b64184af73e41491a6118f (patch) | |
| tree | 3f31e0bd4bcfa107a345c1670e65290e785ee091 /cfrontend/Cexec.v | |
| parent | 7c9500e438384c6c0ce478c8c73b3887137ac924 (diff) | |
| download | compcert-4297fcb821c3188449b64184af73e41491a6118f.tar.gz compcert-4297fcb821c3188449b64184af73e41491a6118f.zip | |
- Revised non-overflow constraints on memory injections so that
injections compose (Values, Memdata, Memory)
- Memory chunks: Mfloat64 now has alignment 8; introduced Mfloat64al32
that works like old Mfloat64 (i.e. has alignment 4); simplified
handling of memcpy builtin accordingly.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1983 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'cfrontend/Cexec.v')
| -rw-r--r-- | cfrontend/Cexec.v | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cfrontend/Cexec.v b/cfrontend/Cexec.v index f589fab3..5427ac69 100644 --- a/cfrontend/Cexec.v +++ b/cfrontend/Cexec.v @@ -435,7 +435,7 @@ Definition do_ef_free Definition memcpy_args_ok (sz al: Z) (bdst: block) (odst: Z) (bsrc: block) (osrc: Z) : Prop := - (al = 1 \/ al = 2 \/ al = 4) + (al = 1 \/ al = 2 \/ al = 4 \/ al = 8) /\ sz > 0 /\ (al | sz) /\ (al | osrc) /\ (al | odst) /\ (bsrc <> bdst \/ osrc = odst \/ osrc + sz <= odst \/ odst + sz <= osrc). @@ -445,8 +445,9 @@ Remark memcpy_check_args: {memcpy_args_ok sz al bdst odst bsrc osrc} + {~memcpy_args_ok sz al bdst odst bsrc osrc}. Proof with try (right; intuition omega). intros. - assert (X: {al = 1 \/ al = 2 \/ al = 4} + {~(al = 1 \/ al = 2 \/ al = 4)}). - destruct (zeq al 1); auto. destruct (zeq al 2); auto. destruct (zeq al 4); auto... + assert (X: {al = 1 \/ al = 2 \/ al = 4 \/ al = 8} + {~(al = 1 \/ al = 2 \/ al = 4 \/ al = 8)}). + destruct (zeq al 1); auto. destruct (zeq al 2); auto. + destruct (zeq al 4); auto. destruct (zeq al 8); auto... unfold memcpy_args_ok. destruct X... assert (al > 0) by (intuition omega). destruct (zlt 0 sz)... |