use radix literals

[factor.git] / basis / cpu / x86 / 64 / bootstrap.factor

diff --git a/basis/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor
index 0c132411fbf2248de40b584f567d19b852ccdc82..8ed80af2c694c530c681f019333adc5143b899c5 100755 (executable)
--- a/basis/cpu/x86/64/bootstrap.factor
+++ b/basis/cpu/x86/64/bootstrap.factor
@@ -91,12 +91,17 @@ IN: bootstrap.x86
     "end_callback" jit-call
 ] \ c-to-factor define-sub-primitive
 
+: signal-handler-save-regs ( -- regs )
+    { RAX RCX RDX RBX RBP RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 } ;
+
 :: jit-signal-handler-prolog ( -- frame-size )
-    ! do we also need to save XMM?
-    volatile-regs length bootstrap-cells 16 align stack-frame-size + :> frame-size
-    RSP frame-size bootstrap-cell - SUB ! minus a cell for return address
-    volatile-regs
-    [| r i | RSP i bootstrap-cells [+] r MOV ] each-index
+    signal-handler-save-regs :> save-regs
+    save-regs length 1 + bootstrap-cells 16 align stack-frame-size + :> frame-size
+    ! minus a cell each for flags, return address
+    ! use LEA so we don't dirty flags
+    RSP RSP frame-size 2 bootstrap-cells - neg [+] LEA
+    save-regs [| r i | RSP i bootstrap-cells [+] r MOV ] each-index
+    PUSHF
     ! 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
@@ -104,9 +109,10 @@ IN: bootstrap.x86
     frame-size ;
 
 :: jit-signal-handler-epilog ( frame-size -- )
-    volatile-regs
+    POPF
+    signal-handler-save-regs
     [| r i | r RSP i bootstrap-cells [+] MOV ] each-index
-    RSP frame-size bootstrap-cell - ADD ;
+    RSP RSP frame-size 2 bootstrap-cells - [+] LEA ;
 
 [
     arg1 ds-reg [] MOV
@@ -128,6 +134,9 @@ IN: bootstrap.x86
     jit-load-context
     jit-restore-context
 
+    ! Clear the fault flag
+    vm-reg vm-fault-flag-offset [+] 0 MOV
+
     ! Call quotation
     jit-jump-quot
 ] \ unwind-native-frames define-sub-primitive
@@ -184,7 +193,7 @@ IN: bootstrap.x86
 \ lazy-jit-compile define-combinator-primitive
 
 [
-    temp2 HEX: ffffffff MOV f rc-absolute-cell rel-literal
+    temp2 0xffffffff MOV f rc-absolute-cell rel-literal
     temp1 temp2 CMP
 ] pic-check-tuple jit-define
 
@@ -330,8 +339,9 @@ IN: bootstrap.x86
     jit-push-param
     jit-jump-quot ;
 
-: jit-safepoint ( -- )
-    0 [RIP+] EAX MOV rc-relative rel-safepoint ;
+[
+    0 [RIP+] EAX MOV rc-relative rel-safepoint
+] \ jit-safepoint jit-define
 
 [
     jit-start-context-and-delete