rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update frame logic to be compatible with SysV x86 ABI. Improves diagnostics.

Browse Source
This commit is contained in:
Graydon Hoare
2010-11-16 13:51:32 -08:00
parent 44b051f34a
commit 26ecec4e12
6 changed files with 127 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/boot/be/abi.ml
View File

@@ -189,6 +189,7 @@ type abi =
abi_tp_cell: Il.cell; abi_tp_cell: Il.cell;
abi_implicit_args_sz: int64; abi_implicit_args_sz: int64;
abi_frame_base_sz: int64; abi_frame_base_sz: int64;
abi_callee_saves_sz: int64;
abi_frame_info_sz: int64; abi_frame_info_sz: int64;
abi_spill_slot: (Il.spill -> Il.mem); abi_spill_slot: (Il.spill -> Il.mem);
} }

2
src/boot/be/macho.ml
View File

@@ -987,7 +987,7 @@ let emit_file
Il.emit e (Il.umov edx_pointee (X86.ro X86.eax)); Il.emit e (Il.umov edx_pointee (X86.ro X86.eax));
Il.emit e (Il.Push (X86.ro X86.eax)); Il.emit e (Il.Push (X86.ro X86.eax));
(* Calculte and store envp. *) (* Calculate and store envp. *)
Il.emit e (Il.binary Il.ADD Il.emit e (Il.binary Il.ADD
(X86.rc X86.eax) (X86.ro X86.eax) (X86.rc X86.eax) (X86.ro X86.eax)
(X86.imm (Asm.IMM 1L))); (X86.imm (Asm.IMM 1L)));

132
src/boot/be/x86.ml
View File

@@ -199,8 +199,14 @@ let reg_str r =
(* This is a basic ABI. You might need to customize it by platform. *) (* This is a basic ABI. You might need to customize it by platform. *)
let (n_hardregs:int) = 6;; let (n_hardregs:int) = 6;;
let (n_callee_saves:int) = 4;;
(* Includes ebx, esi, edi; does *not* include ebp, which has ABI-specified
* rules concerning its location and save/restore sequence.
*
* See http://refspecs.freestandards.org/elf/abi386-4.pdf
* Page 36, Figure 3-15 and friends.
*)
let (n_callee_saves:int) = 3;;
let is_ty32 (ty:Il.scalar_ty) : bool = let is_ty32 (ty:Il.scalar_ty) : bool =
match ty with match ty with
@@ -553,52 +559,61 @@ let wordptr_n (reg:Il.reg) (i:int) : Il.cell =
let get_element_ptr = Il.get_element_ptr word_bits reg_str ;; let get_element_ptr = Il.get_element_ptr word_bits reg_str ;;
let save_callee_saves (e:Il.emitter) : unit = let establish_frame_base (e:Il.emitter) : unit =
(* Establish i386-ABI-compliant frame base. *)
Il.emit e (Il.Push (ro ebp)); Il.emit e (Il.Push (ro ebp));
Il.emit e (Il.umov (rc ebp) (ro esp));
;;
let save_callee_saves (e:Il.emitter) : unit =
Il.emit e (Il.Push (ro edi)); Il.emit e (Il.Push (ro edi));
Il.emit e (Il.Push (ro esi)); Il.emit e (Il.Push (ro esi));
Il.emit e (Il.Push (ro ebx)); Il.emit e (Il.Push (ro ebx));
;; ;;
let restore_callee_saves (e:Il.emitter) : unit = let restore_callee_saves (e:Il.emitter) : unit =
Il.emit e (Il.Pop (rc ebx)); Il.emit e (Il.Pop (rc ebx));
Il.emit e (Il.Pop (rc esi)); Il.emit e (Il.Pop (rc esi));
Il.emit e (Il.Pop (rc edi)); Il.emit e (Il.Pop (rc edi));
;;
let leave_frame (e:Il.emitter) : unit =
Il.emit e (Il.Pop (rc ebp)); Il.emit e (Il.Pop (rc ebp));
;; ;;
(* restores registers from the frame base without updating esp: (* restores registers from the frame base without updating esp:
* - sets ebp, edi, esi, ebx to stored values from frame base * - restores the callee-saves: edi, esi, ebx
* - restores ebp to stored values from frame base
* - sets `retpc' register to stored retpc from frame base * - sets `retpc' register to stored retpc from frame base
* - sets `base' register to current fp * - sets `base' register to current fp
*) *)
let restore_frame_base (e:Il.emitter) (base:Il.reg) (retpc:Il.reg) : unit = let restore_frame_regs (e:Il.emitter) (base:Il.reg) (retpc:Il.reg)
: unit =
let emit = Il.emit e in let emit = Il.emit e in
let mov dst src = emit (Il.umov dst src) in let mov dst src = emit (Il.umov dst src) in
mov (r base) (ro ebp); mov (r base) (ro ebp);
mov (rc ebx) (c (word_at base)); mov (rc ebx) (c (word_n base (-3)));
mov (rc esi) (c (word_n base 1)); mov (rc esi) (c (word_n base (-2)));
mov (rc edi) (c (word_n base 2)); mov (rc edi) (c (word_n base (-1)));
mov (rc ebp) (c (word_n base 3)); mov (rc ebp) (c (word_at base));
mov (r retpc) (c (word_n base 4)); mov (r retpc) (c (word_n base 1));
;; ;;
(* (*
* Our arrangement on x86 is this: * Our arrangement on x86 is this:
* *
* *ebp+20+(4*N) = [argN ] * *ebp+8+(4*N) = [argN ]
* ... * ...
* *ebp+28 = [arg2 ] = obj/closure ptr * *ebp+16 = [arg2 ] = obj/closure ptr
* *ebp+24 = [arg1 ] = task ptr * *ebp+12 = [arg1 ] = task ptr
* *ebp+20 = [arg0 ] = out ptr * *ebp+8 = [arg0 ] = out ptr
* *ebp+16 = [retpc ] * *ebp+4 = [retpc ]
* *ebp+12 = [old_ebp] * *ebp = [old_ebp]
* *ebp+8 = [old_edi] * *ebp-4 = [old_edi]
* *ebp+4 = [old_esi] * *ebp-8 = [old_esi]
* *ebp = [old_ebx] * *ebp-12 = [old_ebx]
* *
* For x86-cdecl: * For x86-cdecl:
* *
@@ -607,7 +622,7 @@ let restore_frame_base (e:Il.emitter) (base:Il.reg) (retpc:Il.reg) : unit =
* *
*) *)
let frame_base_words = 5 (* eip,ebp,edi,esi,ebx *) ;; let frame_base_words = 2 (* eip,ebp *) ;;
let frame_base_sz = Int64.mul (Int64.of_int frame_base_words) word_sz;; let frame_base_sz = Int64.mul (Int64.of_int frame_base_words) word_sz;;
let frame_info_words = 2 (* crate ptr, crate-rel frame info disp *) ;; let frame_info_words = 2 (* crate ptr, crate-rel frame info disp *) ;;
@@ -616,6 +631,8 @@ let frame_info_sz = Int64.mul (Int64.of_int frame_info_words) word_sz;;
let implicit_arg_words = 3 (* task ptr, out ptr, closure ptr *);; let implicit_arg_words = 3 (* task ptr, out ptr, closure ptr *);;
let implicit_args_sz = Int64.mul (Int64.of_int implicit_arg_words) word_sz;; let implicit_args_sz = Int64.mul (Int64.of_int implicit_arg_words) word_sz;;
let callee_saves_sz = Int64.mul (Int64.of_int n_callee_saves) word_sz;;
let out_ptr = wordptr_n (Il.Hreg ebp) (frame_base_words);; let out_ptr = wordptr_n (Il.Hreg ebp) (frame_base_words);;
let task_ptr = wordptr_n (Il.Hreg ebp) (frame_base_words+1);; let task_ptr = wordptr_n (Il.Hreg ebp) (frame_base_words+1);;
let closure_ptr = wordptr_n (Il.Hreg ebp) (frame_base_words+2);; let closure_ptr = wordptr_n (Il.Hreg ebp) (frame_base_words+2);;
@@ -625,7 +642,8 @@ let ty_param_n i =
let spill_slot (i:Il.spill) : Il.mem = let spill_slot (i:Il.spill) : Il.mem =
let imm = (Asm.IMM let imm = (Asm.IMM
(Int64.neg (Int64.neg
(Int64.add frame_info_sz (Int64.add
(Int64.add frame_info_sz callee_saves_sz)
(Int64.mul word_sz (Int64.mul word_sz
(Int64.of_int (i+1)))))) (Int64.of_int (i+1))))))
in in
@@ -664,6 +682,7 @@ let emit_c_call
let emit = Il.emit e in let emit = Il.emit e in
let mov dst src = emit (Il.umov dst src) in let mov dst src = emit (Il.umov dst src) in
let imov dst src = emit (Il.imov dst src) in let imov dst src = emit (Il.imov dst src) in
let add dst src = emit (Il.binary Il.ADD dst (Il.Cell dst) src) in
let binary op dst imm = emit (Il.binary op dst (c dst) (immi imm)) in let binary op dst imm = emit (Il.binary op dst (c dst) (immi imm)) in
(* rust calls get task as arg0 *) (* rust calls get task as arg0 *)
@@ -735,6 +754,7 @@ let emit_c_call
emit (Il.call ret fptr); emit (Il.call ret fptr);
mov (rc esp) (c (word_n (h ebp) Abi.task_field_rust_sp)); mov (rc esp) (c (word_n (h ebp) Abi.task_field_rust_sp));
mov (rc ebp) (ro esp); mov (rc ebp) (ro esp);
add (rc ebp) (immi callee_saves_sz);
| _ -> | _ ->
emit (Il.call ret fptr); emit (Il.call ret fptr);
@@ -846,8 +866,10 @@ let crawl_stack_calling_glue
mark repeat_jmp_fix; mark repeat_jmp_fix;
mov (rc esi) (c (fp_n (-1))); (* esi <- crate ptr *) mov (rc esi) (* esi <- crate ptr *)
mov (rc edi) (c (fp_n (-2))); (* edi <- frame glue functions. *) (c (fp_n ((-1) - n_callee_saves)));
mov (rc edi) (* edi <- frame glue functions. *)
(c (fp_n ((-2) - n_callee_saves)));
emit (Il.cmp (ro edi) (immi 0L)); emit (Il.cmp (ro edi) (immi 0L));
emit emit
@@ -874,7 +896,7 @@ let crawl_stack_calling_glue
pop (rc eax); pop (rc eax);
mark skip_jmp_fix; mark skip_jmp_fix;
mov (rc edi) (c (fp_n 3)); (* load next fp (callee-saves[3]) *) mov (rc edi) (c (fp_n 0)); (* load next fp (fp[0]) *)
emit (Il.cmp (ro edi) (immi 0L)); emit (Il.cmp (ro edi) (immi 0L));
emit (Il.jmp Il.JE emit (Il.jmp Il.JE
(codefix exit_jmp_fix)); (* if nonzero *) (codefix exit_jmp_fix)); (* if nonzero *)
@@ -980,6 +1002,8 @@ let gc_glue
(c (edi_n Abi.task_field_rust_sp)); (c (edi_n Abi.task_field_rust_sp));
(* Mark pass. *) (* Mark pass. *)
push (ro ebp);
save_callee_saves e; save_callee_saves e;
push (ro eax); push (ro eax);
crawl_stack_calling_glue e Abi.frame_glue_fns_field_mark; crawl_stack_calling_glue e Abi.frame_glue_fns_field_mark;
@@ -1005,6 +1029,7 @@ let gc_glue
pop (rc eax); pop (rc eax);
restore_callee_saves e; restore_callee_saves e;
pop (rc ebp);
Il.emit e Il.Ret; Il.emit e Il.Ret;
;; ;;
@@ -1182,11 +1207,12 @@ let rec size_calculation_stack_highwater (size:size) : int =
+ 1 + 1
;; ;;
let minimal_call_sz = Int64.add frame_base_sz callee_saves_sz;;
let boundary_sz = let boundary_sz =
(Asm.IMM (Asm.IMM
(Int64.add (* Extra non-frame room: *) (Int64.add (* Extra non-frame room: *)
frame_base_sz (* to safely enter the next frame, *) minimal_call_sz (* to safely enter the next frame, *)
frame_base_sz)) (* and make a 'grow' upcall there. *) minimal_call_sz)) (* and make a 'grow' upcall there. *)
;; ;;
let stack_growth_check let stack_growth_check
@@ -1273,8 +1299,8 @@ let minimal_fn_prologue
let sub dst src = emit (Il.binary Il.SUB dst (Il.Cell dst) src) in let sub dst src = emit (Il.binary Il.SUB dst (Il.Cell dst) src) in
(* See diagram and explanation in full_fn_prologue, below. *) (* See diagram and explanation in full_fn_prologue, below. *)
establish_frame_base e;
save_callee_saves e; save_callee_saves e;
mov (rc ebp) (ro esp); (* Establish frame base. *)
sub (rc esp) (imm call_and_frame_sz); (* Establish a frame. *) sub (rc esp) (imm call_and_frame_sz); (* Establish a frame. *)
mov (rc edi) (ro esp); (* Zero the frame. *) mov (rc edi) (ro esp); (* Zero the frame. *)
mov (rc ecx) (imm call_and_frame_sz); mov (rc ecx) (imm call_and_frame_sz);
@@ -1329,9 +1355,9 @@ let full_fn_prologue
* | ... | * | ... |
* | caller arg 0 | * | caller arg 0 |
* | retpc | <-- sp we received, top of callee frame * | retpc | <-- sp we received, top of callee frame
* | callee save 1 | * | callee save 1 | <-- ebp after frame-base setup
* | ... | * | ... |
* | callee save N | <-- ebp and esp after saving callee-saves * | callee save N | <-- esp after saving callee-saves
* | ... | * | ... |
* | callee frame | * | callee frame |
* | + spill | * | + spill |
@@ -1344,19 +1370,20 @@ let full_fn_prologue
* | next save N | <-- bottom of region we must reserve * | next save N | <-- bottom of region we must reserve
* | ... | * | ... |
* *
* A "frame base" is the retpc and set of callee-saves. * A "frame base" is the retpc + ebp.
* *
* We need to reserve room for our frame *and* the next frame-base, because * We need to reserve room for our frame *and* the next frame-base and
* we're going to be blindly entering the next frame-base (pushing eip and * callee-saves, because we're going to be blindly entering the next
* callee-saves) before we perform the next check. * frame-base (pushing eip and callee-saves) before we perform the next
* check.
*) *)
(* Already have room to save regs on entry. *) (* Already have room to save regs on entry. *)
establish_frame_base e;
save_callee_saves e; save_callee_saves e;
let restart_pc = e.Il.emit_pc in let restart_pc = e.Il.emit_pc in
mov (rc ebp) (ro esp); (* Establish frame base. *)
mov (rc esi) (c task_ptr); (* esi = task *) mov (rc esi) (c task_ptr); (* esi = task *)
mov mov
(rc esi) (rc esi)
@@ -1444,12 +1471,14 @@ let fn_prologue
;; ;;
let fn_epilogue (e:Il.emitter) : unit = let fn_epilogue (e:Il.emitter) : unit =
(* Tear down existing frame. *) (* Tear down existing frame. *)
let emit = Il.emit e in let emit = Il.emit e in
let mov dst src = emit (Il.umov dst src) in let mov dst src = emit (Il.umov dst src) in
let sub dst src = emit (Il.binary Il.SUB dst (Il.Cell dst) src) in
sub (rc ebp) (immi callee_saves_sz);
mov (rc esp) (ro ebp); mov (rc esp) (ro ebp);
restore_callee_saves e; restore_callee_saves e;
leave_frame e;
emit Il.Ret; emit Il.Ret;
;; ;;
@@ -1543,8 +1572,8 @@ let fn_tail_call
end; end;
(* edx <- ebp; restore ebp, edi, esi, ebx; ecx <- retpc *) (* edx <- ebp; restore ebp, edi, esi, ebx; ecx <- retpc *)
annotate e "tail call: restore callee-saves from frame base"; annotate e "tail call: restore registers from frame base";
restore_frame_base e (h edx) (h ecx); restore_frame_regs e (h edx) (h ecx);
(* move edx past frame base and adjust for difference in call sizes *) (* move edx past frame base and adjust for difference in call sizes *)
annotate e "tail call: adjust temporary fp"; annotate e "tail call: adjust temporary fp";
binary Il.ADD (rc edx) (Int64.add frame_base_sz argsz_diff); binary Il.ADD (rc edx) (Int64.add frame_base_sz argsz_diff);
@@ -1637,6 +1666,7 @@ let activate_glue (e:Il.emitter) : unit =
let binary op dst imm = emit (Il.binary op dst (c dst) (immi imm)) in let binary op dst imm = emit (Il.binary op dst (c dst) (immi imm)) in
mov (rc edx) (c (sp_n 1)); (* edx <- task *) mov (rc edx) (c (sp_n 1)); (* edx <- task *)
establish_frame_base e;
save_callee_saves e; save_callee_saves e;
mov mov
(edx_n Abi.task_field_runtime_sp) (edx_n Abi.task_field_runtime_sp)
@@ -1690,10 +1720,11 @@ let activate_glue (e:Il.emitter) : unit =
*) *)
binary Il.ADD (edx_n Abi.task_field_rust_sp) binary Il.ADD (edx_n Abi.task_field_rust_sp)
(Int64.mul (Int64.of_int (n_callee_saves + 1)) word_sz); (Int64.mul (Int64.of_int (n_callee_saves + 2)) word_sz);
(**** IN TASK STACK ****) (**** IN TASK STACK ****)
restore_callee_saves e; restore_callee_saves e;
leave_frame e;
emit Il.Ret; emit Il.Ret;
(***********************) (***********************)
() ()
@@ -1736,6 +1767,7 @@ let yield_glue (e:Il.emitter) : unit =
mov mov
(rc esp) (rc esp)
(c (edx_n Abi.task_field_rust_sp)); (* esp <- task->rust_sp *) (c (edx_n Abi.task_field_rust_sp)); (* esp <- task->rust_sp *)
establish_frame_base e;
save_callee_saves e; save_callee_saves e;
mov (* task->rust_sp <- esp *) mov (* task->rust_sp <- esp *)
(edx_n Abi.task_field_rust_sp) (edx_n Abi.task_field_rust_sp)
@@ -1746,6 +1778,7 @@ let yield_glue (e:Il.emitter) : unit =
(**** IN C STACK ****) (**** IN C STACK ****)
restore_callee_saves e; restore_callee_saves e;
leave_frame e;
emit Il.Ret; emit Il.Ret;
(***********************) (***********************)
() ()
@@ -1771,30 +1804,30 @@ let objfile_start
let mov dst src = emit (Il.umov dst src) in let mov dst src = emit (Il.umov dst src) in
let push_pos32 = push_pos32 e in let push_pos32 = push_pos32 e in
Il.emit_full e (Some start_fixup) Il.Dead; Il.emit_full e (Some start_fixup) Il.Dead;
establish_frame_base e;
save_callee_saves e; save_callee_saves e;
mov (rc ebp) (ro esp);
(* If we're very lucky, the platform will have left us with (* If we're very lucky, the platform will have left us with
* something sensible in the startup stack like so: * something sensible in the startup stack like so:
* *
* *ebp+24 = [arg1 ] = argv * *ebp+12 = [arg1 ] = argv
* *ebp+20 = [arg0 ] = argc * *ebp+8 = [arg0 ] = argc
* *ebp+16 = [retpc ] * *ebp+4 = [retpc ]
* *ebp+12 = [old_ebp] * *ebp = [old_ebp]
* *ebp+8 = [old_edi] * *ebp-4 = [old_edi]
* *ebp+4 = [old_esi] * *ebp-8 = [old_esi]
* *ebp = [old_ebx] * *ebp-12 = [old_ebx]
* *
* This is not the case everywhere, but we start with this * This is not the case everywhere, but we start with this
* assumption and correct it in the runtime library. * assumption and correct it in the runtime library.
*) *)
(* Copy argv. *) (* Copy argv. *)
mov (rc eax) (c (ebp_n (2 + n_callee_saves))); mov (rc eax) (c (ebp_n 3));
Il.emit e (Il.Push (ro eax)); Il.emit e (Il.Push (ro eax));
(* Copy argc. *) (* Copy argc. *)
mov (rc eax) (c (ebp_n (1 + n_callee_saves))); mov (rc eax) (c (ebp_n 2));
Il.emit e (Il.Push (ro eax)); Il.emit e (Il.Push (ro eax));
push_pos32 crate_fixup; push_pos32 crate_fixup;
@@ -1807,8 +1840,8 @@ let objfile_start
Il.emit e (Il.Pop (rc ecx)); Il.emit e (Il.Pop (rc ecx));
Il.emit e (Il.Pop (rc ecx)); Il.emit e (Il.Pop (rc ecx));
Il.emit e (Il.Pop (rc ecx)); Il.emit e (Il.Pop (rc ecx));
Il.emit e (Il.umov (rc esp) (ro ebp));
restore_callee_saves e; restore_callee_saves e;
leave_frame e;
Il.emit e Il.Ret; Il.emit e Il.Ret;
;; ;;
@@ -1847,6 +1880,7 @@ let (abi:Abi.abi) =
Abi.abi_dwarf_fp_reg = dwarf_ebp; Abi.abi_dwarf_fp_reg = dwarf_ebp;
Abi.abi_tp_cell = task_ptr; Abi.abi_tp_cell = task_ptr;
Abi.abi_frame_base_sz = frame_base_sz; Abi.abi_frame_base_sz = frame_base_sz;
Abi.abi_callee_saves_sz = callee_saves_sz;
Abi.abi_frame_info_sz = frame_info_sz; Abi.abi_frame_info_sz = frame_info_sz;
Abi.abi_implicit_args_sz = implicit_args_sz; Abi.abi_implicit_args_sz = implicit_args_sz;
Abi.abi_spill_slot = spill_slot; Abi.abi_spill_slot = spill_slot;

28
src/boot/me/layout.ml
View File

@@ -26,27 +26,30 @@ let layout_visitor
* |output ptr (implicit arg) | * |output ptr (implicit arg) |
* +----------------------------+ <-- fp + abi_frame_base_sz * +----------------------------+ <-- fp + abi_frame_base_sz
* |return pc | * |return pc |
* |callee-save registers | * |old fp | <-- fp
* +----------------------------+
* |other callee-save registers |
* |... | * |... |
* +----------------------------+ <-- fp * +----------------------------+ <-- fp - callee_saves
* |crate ptr | * |crate ptr |
* |crate-rel frame info disp | * |crate-rel frame info disp |
* +----------------------------+ <-- fp - abi_frame_info_sz * +----------------------------+ <-- fp - (callee_saves
* |spills determined in ra | * |spills determined in ra | + abi_frame_info_sz)
* |... | * |... |
* |... | * |... |
* +----------------------------+ <-- fp - (abi_frame_info_sz * +----------------------------+ <-- fp - (callee_saves
* |... | + spillsz) * |... | + abi_frame_info_sz
* |frame-allocated stuff | * |frame-allocated stuff | + spillsz)
* |determined in resolve | * |determined in resolve |
* |laid out in layout | * |laid out in layout |
* |... | * |... |
* |... | * |... |
* +----------------------------+ <-- fp - framesz * +----------------------------+ <-- fp - (callee_saves + framesz)
* |call space | == sp + callsz * |call space | == sp + callsz
* |... | * |... |
* |... | * |... |
* +----------------------------+ <-- fp - (framesz + callsz) == sp * +----------------------------+ <-- fp - (callee_saves
* + framesz + callsz) == sp
* *
* - Slot offsets fall into three classes: * - Slot offsets fall into three classes:
* *
@@ -246,11 +249,13 @@ let layout_visitor
let (frame_id, frame_blocks) = Stack.top frame_stack in let (frame_id, frame_blocks) = Stack.top frame_stack in
let frame_spill = Hashtbl.find cx.ctxt_spill_fixups frame_id in let frame_spill = Hashtbl.find cx.ctxt_spill_fixups frame_id in
let sz = let sz =
(* NB: the "frame size" does not include the callee-saves. *)
add_sz add_sz
(add_sz (add_sz
(rty_sz (frame_rty frame_blocks)) (rty_sz (frame_rty frame_blocks))
(SIZE_fixup_mem_sz frame_spill)) (SIZE_fixup_mem_sz frame_spill))
(SIZE_fixed cx.ctxt_abi.Abi.abi_frame_info_sz) (SIZE_fixed
cx.ctxt_abi.Abi.abi_frame_info_sz)
in in
let curr = Hashtbl.find cx.ctxt_frame_sizes frame_id in let curr = Hashtbl.find cx.ctxt_frame_sizes frame_id in
let sz = max_sz curr sz in let sz = max_sz curr sz in
@@ -354,8 +359,9 @@ let layout_visitor
let (frame_id, frame_blocks) = Stack.top frame_stack in let (frame_id, frame_blocks) = Stack.top frame_stack in
let frame_spill = Hashtbl.find cx.ctxt_spill_fixups frame_id in let frame_spill = Hashtbl.find cx.ctxt_spill_fixups frame_id in
let spill_sz = SIZE_fixup_mem_sz frame_spill in let spill_sz = SIZE_fixup_mem_sz frame_spill in
let callee_saves_sz = SIZE_fixed cx.ctxt_abi.Abi.abi_callee_saves_sz in
let info_sz = SIZE_fixed cx.ctxt_abi.Abi.abi_frame_info_sz in let info_sz = SIZE_fixed cx.ctxt_abi.Abi.abi_frame_info_sz in
let locals_off = add_sz spill_sz info_sz in let locals_off = add_sz spill_sz (add_sz info_sz callee_saves_sz) in
let off = let off =
if Stack.is_empty frame_blocks if Stack.is_empty frame_blocks
then locals_off then locals_off

13
src/boot/me/trans.ml
View File

@@ -142,8 +142,13 @@ let trans_visitor
let arg0_disp = let arg0_disp =
Int64.add abi.Abi.abi_frame_base_sz abi.Abi.abi_implicit_args_sz Int64.add abi.Abi.abi_frame_base_sz abi.Abi.abi_implicit_args_sz
in in
let frame_crate_ptr = word_n (-1) in let frame_info_disp =
let frame_fns_disp = word_n (-2) in Int64.neg (Int64.add
abi.Abi.abi_frame_info_sz
abi.Abi.abi_callee_saves_sz)
in
let frame_fns_disp = Int64.add frame_info_disp (word_n 0) in
let frame_crate_ptr_disp = Int64.add frame_info_disp (word_n 1) in
let fn_ty (id:node_id) : Ast.ty = let fn_ty (id:node_id) : Ast.ty =
Hashtbl.find cx.ctxt_all_item_types id Hashtbl.find cx.ctxt_all_item_types id
@@ -396,7 +401,7 @@ let trans_visitor
and cell_cast = Il.cell_cast and cell_cast = Il.cell_cast
and curr_crate_ptr _ : Il.cell = and curr_crate_ptr _ : Il.cell =
word_at (fp_imm frame_crate_ptr) word_at (fp_imm frame_crate_ptr_disp)
and crate_rel_to_ptr (rel:Il.operand) (rty:Il.referent_ty) : Il.cell = and crate_rel_to_ptr (rel:Il.operand) (rty:Il.referent_ty) : Il.cell =
(in_quad_category "crate_rel -> ptr" (in_quad_category "crate_rel -> ptr"
@@ -1645,7 +1650,7 @@ let trans_visitor
iflog (fun _ -> annotate "write frame-info pointers"); iflog (fun _ -> annotate "write frame-info pointers");
Abi.load_fixup_addr (emitter()) Abi.load_fixup_addr (emitter())
crate_ptr_reg cx.ctxt_crate_fixup Il.OpaqueTy; crate_ptr_reg cx.ctxt_crate_fixup Il.OpaqueTy;
mov (word_at (fp_imm frame_crate_ptr)) (Il.Cell (crate_ptr_cell)); mov (word_at (fp_imm frame_crate_ptr_disp)) (Il.Cell (crate_ptr_cell));
imov (word_at (fp_imm frame_fns_disp)) frame_fns imov (word_at (fp_imm frame_fns_disp)) frame_fns
and check_interrupt_flag _ = and check_interrupt_flag _ =

28
src/rt/rust_task.cpp
View File

@@ -149,18 +149,22 @@ rust_task::start(uintptr_t exit_task_glue,
*spp-- = (uintptr_t) this; // task *spp-- = (uintptr_t) this; // task
*spp-- = (uintptr_t) 0; // output *spp-- = (uintptr_t) 0; // output
*spp-- = (uintptr_t) 0; // retpc *spp-- = (uintptr_t) 0; // retpc
uintptr_t exit_task_frame_base;
for (size_t j = 0; j < n_callee_saves; ++j) { for (size_t j = 0; j < n_callee_saves; ++j) {
// We want 'frame_base' to point to the old fp in this (exit-task)
// frame, because we're going to inject this frame-pointer into the
// callee-save frame pointer value in the *next* (spawnee) frame. A
// cheap trick, but this means the spawnee frame will restore the
// proper frame pointer of the glue frame as it runs its epilogue.
if (j == callee_save_fp)
exit_task_frame_base = (uintptr_t)spp;
*spp-- = 0; *spp-- = 0;
} }
// We want 'frame_base' to point to the last callee-save in this
// (exit-task) frame, because we're going to inject this
// frame-pointer into the callee-save frame pointer value in the
// *next* (spawnee) frame. A cheap trick, but this means the
// spawnee frame will restore the proper frame pointer of the glue
// frame as it runs its epilogue.
uintptr_t frame_base = (uintptr_t) (spp+1);
*spp-- = (uintptr_t) dom->root_crate; // crate ptr *spp-- = (uintptr_t) dom->root_crate; // crate ptr
*spp-- = (uintptr_t) 0; // frame_glue_fns *spp-- = (uintptr_t) 0; // frame_glue_fns
@@ -195,7 +199,7 @@ rust_task::start(uintptr_t exit_task_glue,
for (size_t j = 0; j < n_callee_saves; ++j) { for (size_t j = 0; j < n_callee_saves; ++j) {
// callee-saves to carry in when we activate // callee-saves to carry in when we activate
if (j == callee_save_fp) if (j == callee_save_fp)
*spp-- = frame_base; *spp-- = exit_task_frame_base;
else else
*spp-- = (uintptr_t)NULL; *spp-- = (uintptr_t)NULL;
} }
@@ -432,9 +436,9 @@ rust_task::get_fp() {
uintptr_t uintptr_t
rust_task::get_previous_fp(uintptr_t fp) { rust_task::get_previous_fp(uintptr_t fp) {
// fp happens to, coincidentally (!) also point to the last // FIXME: terribly X86-specific.
// callee-save on the task stack. // *fp == previous_fp.
return get_callee_save_fp((uintptr_t*)fp); return *((uintptr_t*)fp);
} }
frame_glue_fns* frame_glue_fns*