diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2017-02-13 10:49:33 +0100 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2017-02-13 11:05:29 +0100 |
| commit | c736e7d34560fef54ec4ab652be28bf2df4e907f (patch) | |
| tree | d0e0063dcbf256cfeda0645684f429283b481c5d /powerpc/Asmgenproof.v | |
| parent | dce9ff8da2710aa81fbcf6d1498de35ea9ad06f4 (diff) | |
| download | compcert-kvx-c736e7d34560fef54ec4ab652be28bf2df4e907f.tar.gz compcert-kvx-c736e7d34560fef54ec4ab652be28bf2df4e907f.zip | |
ARM, PowerPC: update Asmgenproof for Coq 8.6
Diffstat (limited to 'powerpc/Asmgenproof.v')
| -rw-r--r-- | powerpc/Asmgenproof.v | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/powerpc/Asmgenproof.v b/powerpc/Asmgenproof.v index 447a53a0..6f0390b9 100644 --- a/powerpc/Asmgenproof.v +++ b/powerpc/Asmgenproof.v @@ -876,7 +876,7 @@ Local Transparent destroyed_by_jumptable. - (* internal function *) exploit functions_translated; eauto. intros [tf [A B]]. monadInv B. generalize EQ; intros EQ'. monadInv EQ'. - destruct (zlt Ptrofs.max_unsigned (list_length_z x0.(fn_code))); inversion EQ1. clear EQ1. + destruct (zlt Ptrofs.max_unsigned (list_length_z x0.(fn_code))); inversion EQ1. clear EQ1. subst x0. unfold store_stack in *. exploit Mem.alloc_extends. eauto. eauto. apply Zle_refl. apply Zle_refl. intros [m1' [C D]]. @@ -887,15 +887,23 @@ Local Transparent destroyed_by_jumptable. intros [m3' [P Q]]. (* Execution of function prologue *) monadInv EQ0. rewrite transl_code'_transl_code in EQ1. + set (tfbody := Pallocframe (fn_stacksize f) (fn_link_ofs f) + (fn_retaddr_ofs f) + :: Pmflr GPR0 + :: Pstw GPR0 (Cint (Ptrofs.to_int (fn_retaddr_ofs f))) + GPR1 + :: Pcfi_rel_offset + (Ptrofs.to_int (fn_retaddr_ofs f)) :: x0) in *. + set (tf := {| fn_sig := Mach.fn_sig f; fn_code := tfbody |}) in *. set (rs2 := nextinstr (rs0#GPR1 <- sp #GPR0 <- Vundef)). set (rs3 := nextinstr (rs2#GPR0 <- (rs0#LR))). set (rs4 := nextinstr rs3). set (rs5 := nextinstr rs4). assert (EXEC_PROLOGUE: - exec_straight tge x - x.(fn_code) rs0 m' - x1 rs5 m3'). - rewrite <- H5 at 2. simpl. + exec_straight tge tf + tf.(fn_code) rs0 m' + x0 rs5 m3'). + change (fn_code tf) with tfbody; unfold tfbody. apply exec_straight_step with rs2 m2'. unfold exec_instr. rewrite C. fold sp. rewrite <- (sp_val _ _ _ AG). rewrite F. auto. auto. @@ -911,7 +919,6 @@ Local Transparent destroyed_by_jumptable. econstructor; eauto. change (rs5 PC) with (Val.offset_ptr (Val.offset_ptr (Val.offset_ptr (Val.offset_ptr (rs0 PC) Ptrofs.one) Ptrofs.one) Ptrofs.one) Ptrofs.one). rewrite ATPC. simpl. constructor; eauto. - subst x; simpl in g. unfold fn_code. eapply code_tail_next_int. omega. eapply code_tail_next_int. omega. eapply code_tail_next_int. omega. |