Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions aarch64/Asmexpand.ml
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ let expand_instruction instr =
end;
assert (retaddrofs = Z.(add linkofs (of_uint 8)));
let sz1 = Z.(sub sz linkofs) in
assert (Z.modulo sz1 _16 = Z.zero);
if Z.(le sz1 (of_uint 512)) then begin
emit (Pstp(X15, X30, ADpreincr(XSP, I64.repr (Z.neg sz1))));
emit (Pcfi_adjust sz1)
Expand All @@ -513,6 +514,7 @@ let expand_instruction instr =
emit (Pstp(X15, X30, ADimm(XSP, I64.zero)))
end;
let sz2 = Z.(sub sz sz1) in
assert (Z.modulo sz2 _16 = Z.zero);
if Z.(gt sz2 zero) then begin
expand_addimm64 XSP XSP (Ptrofs.repr (Z.neg sz2));
emit (Pcfi_adjust sz2)
Expand Down
14 changes: 8 additions & 6 deletions aarch64/Stacklayout.v
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The stack pointer is kept 16-aligned.
Definition fe_ofs_arg := 0.

Definition make_env (b: bounds) : frame_env :=
let olink := align (4 * b.(bound_outgoing)) 8 in (* back link *)
let olink := align (4 * b.(bound_outgoing)) 16 in (* back link *)
let oretaddr := olink + 8 in (* return address *)
let ocs := oretaddr + 8 in (* callee-saves *)
let ol := align (size_callee_save_area b ocs) 8 in (* locals *)
Expand All @@ -60,7 +60,7 @@ Lemma frame_env_separated:
Proof.
Local Opaque Z.add Z.mul sepconj range.
intros; simpl.
set (olink := align (4 * b.(bound_outgoing)) 8).
set (olink := align (4 * b.(bound_outgoing)) 16).
set (oretaddr := olink + 8).
set (ocs := oretaddr + 8).
set (ol := align (size_callee_save_area b ocs) 8).
Expand Down Expand Up @@ -100,7 +100,7 @@ Lemma frame_env_range:
0 <= fe_stack_data fe /\ fe_stack_data fe + bound_stack_data b <= fe_size fe.
Proof.
intros; simpl.
set (olink := align (4 * b.(bound_outgoing)) 8).
set (olink := align (4 * b.(bound_outgoing)) 16).
set (oretaddr := olink + 8).
set (ocs := oretaddr + 8).
set (ol := align (size_callee_save_area b ocs) 8).
Expand All @@ -126,15 +126,17 @@ Lemma frame_env_aligned:
/\ (align_chunk Mptr | fe_ofs_retaddr fe).
Proof.
intros; simpl.
set (olink := align (4 * b.(bound_outgoing)) 8).
set (olink := align (4 * b.(bound_outgoing)) 16).
set (oretaddr := olink + 8).
set (ocs := oretaddr + 8).
set (ol := align (size_callee_save_area b ocs) 8).
set (ostkdata := align (ol + 4 * b.(bound_local)) 8).
change (align_chunk Mptr) with 8.
assert ((8 | olink)).
{ apply Z.divide_trans with 16. exists 2; auto. apply align_divides; lia. }
split. apply Z.divide_0_r.
split. apply align_divides; lia.
split. apply align_divides; lia.
split. apply align_divides; lia.
apply Z.divide_add_r. apply align_divides; lia. apply Z.divide_refl.
split. auto.
apply Z.divide_add_r; auto using Z.divide_refl.
Qed.
Loading