From 4297fcb821c3188449b64184af73e41491a6118f Mon Sep 17 00:00:00 2001 From: xleroy Date: Mon, 23 Jul 2012 15:01:54 +0000 Subject: - 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 --- ia32/standard/Stacklayout.v | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ia32/standard/Stacklayout.v') diff --git a/ia32/standard/Stacklayout.v b/ia32/standard/Stacklayout.v index 063fb4f7..be854fde 100644 --- a/ia32/standard/Stacklayout.v +++ b/ia32/standard/Stacklayout.v @@ -107,7 +107,7 @@ Remark frame_env_aligned: /\ (8 | fe.(fe_ofs_float_local)) /\ (8 | fe.(fe_ofs_float_callee_save)) /\ (4 | fe.(fe_ofs_retaddr)) - /\ (4 | fe.(fe_stack_data)) + /\ (8 | fe.(fe_stack_data)) /\ (4 | fe.(fe_size)). Proof. intros. @@ -128,8 +128,7 @@ Proof. set (x6 := x5 + 8 * bound_float_local b). assert (8 | x6). unfold x6. apply Zdivide_plus_r; auto. exists (bound_float_local b); ring. set (x7 := x6 + 8 * bound_float_callee_save b). - assert (4 | x7). - apply Zdivides_trans with 8. exists 2; auto. + assert (8 | x7). unfold x7. apply Zdivide_plus_r; auto. exists (bound_float_callee_save b); ring. set (x8 := align (x7 + bound_stack_data b) 4). assert (4 | x8). apply align_divides. omega. -- cgit