steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: suppress signal-handler stack frame generation 

This is a hack; see #295
db4
Joe Groff 2011-10-25 19:52:47 -07:00
parent 7bd7d0234d
commit d6eae2f42d
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
basis/cpu/x86/64/bootstrap.factor
View File

@ -39,9 +39,9 @@ IN: bootstrap.x86
! alignment ! alignment
RSP stack-frame-size bootstrap-cell - SUB RSP stack-frame-size bootstrap-cell - SUB
! store entry point ! store entry point
RSP stack-frame-size bootstrap-cell 3 * - [+] RAX MOV RSP stack-frame-size 3 bootstrap-cells - [+] RAX MOV
! store stack frame size ! store stack frame size
RSP stack-frame-size bootstrap-cell 2 * - [+] stack-frame-size MOV RSP stack-frame-size 2 bootstrap-cells - [+] stack-frame-size MOV
] jit-prolog jit-define ] jit-prolog jit-define
[ [
@ -93,46 +93,53 @@ IN: bootstrap.x86
USE: locals USE: locals
:: jit-save-volatile-regs ( -- save-size ) :: jit-save-volatile-regs ( -- frame-size )
! do we also need to save XMM? ! do we also need to save XMM?
volatile-regs length bootstrap-cell * 16 align :> save-size volatile-regs length bootstrap-cells 16 align stack-frame-size + :> frame-size
RSP 2 bootstrap-cells [+] save-size ADD ! bump up stack frame size RSP frame-size bootstrap-cell - SUB ! minus a cell for return address
RSP save-size SUB
volatile-regs volatile-regs
[| r i | RSP i bootstrap-cell * [+] r MOV ] each-index [| r i | RSP i bootstrap-cells [+] r MOV ] each-index
save-size ; ! Now that the registers are saved, we can make the stack frame
RAX 0 MOV rc-absolute-cell rel-this
RSP frame-size 3 bootstrap-cells - [+] RAX MOV
RSP frame-size 2 bootstrap-cells - [+] frame-size MOV
frame-size ;
:: jit-restore-volatile-regs ( save-size -- ) :: jit-restore-volatile-regs ( frame-size -- )
volatile-regs volatile-regs
[| r i | r RSP i bootstrap-cell * [+] MOV ] each-index [| r i | r RSP i bootstrap-cells [+] MOV ] each-index
RSP save-size ADD ; RSP frame-size bootstrap-cell - ADD ;
! The signal-handler and leaf-signal-handler subprimitives are special-cased
! in vm/quotations.cpp not to trigger generation of a stack frame, so they can
! peform their own prolog/epilog preserving registers.
[| | [| |
jit-save-volatile-regs :> save-size jit-save-volatile-regs :> frame-size
jit-save-context jit-save-context
RAX vm-reg vm-signal-handler-addr-offset [+] MOV RAX vm-reg vm-signal-handler-addr-offset [+] MOV
RAX CALL RAX CALL
save-size jit-restore-volatile-regs frame-size jit-restore-volatile-regs
] \ signal-handler define-sub-primitive ] \ signal-handler define-sub-primitive
[| | [| |
jit-save-volatile-regs :> save-size jit-save-volatile-regs :> frame-size
jit-save-context jit-save-context
RAX vm-reg vm-signal-handler-addr-offset [+] MOV RAX vm-reg vm-signal-handler-addr-offset [+] MOV
RAX CALL RAX CALL
! Stack at this point has a fake stack frame set up to represent the ! Stack at this point has a fake stack frame set up to represent the
! leaf procedure we interrupted. We must tear down that frame in ! leaf procedure we interrupted. We must tear down that frame in
! addition to our own before resuming. ! addition to our own before resuming.
! Grab our resume address and place it just underneath the leaf proc's ! Grab our frame's return address and place it just underneath the leaf proc's
! return address, since we can't touch any registers once they've been ! return address, since we can't touch any registers once they've been
! restored. If we got this far there should be no faults here and we ! restored. If we got this far there should be no faults here and we
! can get away with corrupting the stack frame. ! can get away with corrupting the stack frame.
RAX RSP save-size 3 bootstrap-cells + [+] MOV RAX RSP frame-size bootstrap-cell - [+] MOV
RSP save-size 6 bootstrap-cells + [+] RAX MOV RSP frame-size 2 bootstrap-cells + [+] RAX MOV
! Popping 3 extra cells here plus the 3 cells the epilogue pops leaves ! Popping 3 extra cells here leaves the resume address at the top of the stack
! the resume address at the top of the stack for when the epilogue RETs. ! when we RET.
save-size 3 bootstrap-cells + jit-restore-volatile-regs frame-size 3 bootstrap-cells + jit-restore-volatile-regs
] \ leaf-signal-handler define-sub-primitive ] \ leaf-signal-handler define-sub-primitive
[ [

6
vm/quotations.cpp
View File

@ -84,7 +84,11 @@ bool quotation_jit::declare_p(cell i, cell length)
bool quotation_jit::word_stack_frame_p(cell obj) bool quotation_jit::word_stack_frame_p(cell obj)
{ {
return to_boolean(untag<word>(obj)->subprimitive) // Subprimitives should be flagged with whether they require a stack frame.
// See #295.
return (to_boolean(untag<word>(obj)->subprimitive)
&& obj != parent->special_objects[SIGNAL_HANDLER_WORD]
&& obj != parent->special_objects[LEAF_SIGNAL_HANDLER_WORD])
|| obj == parent->special_objects[JIT_PRIMITIVE_WORD]; || obj == parent->special_objects[JIT_PRIMITIVE_WORD];
} }