diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /powerpc/Stacklayout.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'powerpc/Stacklayout.v')
-rw-r--r-- | powerpc/Stacklayout.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/powerpc/Stacklayout.v b/powerpc/Stacklayout.v index be823c1e..a751fd98 100644 --- a/powerpc/Stacklayout.v +++ b/powerpc/Stacklayout.v @@ -117,10 +117,10 @@ Proof. fe_ofs_float_callee_save, fe_num_float_callee_save, fe_stack_data. set (x1 := align (8 + 4 * bound_outgoing b) 8). - assert (8 | x1). unfold x1; apply align_divides. omega. + assert (8 | x1). unfold x1; apply align_divides. omega. set (x2 := x1 + 4 * bound_local b). assert (4 | x2). unfold x2; apply Zdivide_plus_r; auto. - apply Zdivides_trans with 8. exists 2; auto. auto. + apply Zdivides_trans with 8. exists 2; auto. auto. exists (bound_local b); ring. set (x3 := x2 + 4). assert (4 | x3). unfold x3; apply Zdivide_plus_r; auto. exists 1; auto. |