1.0.25.37: block deferrables when gc pending in PA

[sbcl.git] / src / runtime / x86-64-assem.S

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index eb7d78f..85d5238 100644 (file)
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -105,9 +105,6 @@
        .globl  GNAME(call_into_c)
        TYPE(GNAME(call_into_c))
 GNAME(call_into_c):
-        /* ABI requires that the direction flag be clear on function
-         * entry and exit. */
-        cld
        push    %rbp            # Save old frame pointer.
        mov     %rsp,%rbp       # Establish new frame.
 
@@ -146,10 +143,7 @@ GNAME(call_into_lisp_first_time):
 #else
         movq    GNAME(all_threads),%rax
 #endif
-       mov     THREAD_CONTROL_STACK_START_OFFSET(%rax) ,%rsp
-       /* don't think too hard about what happens if we get interrupted
-       * here */
-        add    $(THREAD_CONTROL_STACK_SIZE)-16,%rsp
+       mov     THREAD_CONTROL_STACK_END_OFFSET(%rax) ,%rsp
        jmp     Lstack
 \f
        .text   
@@ -182,10 +176,19 @@ Lstack:
        push    %rsi    #
        push    %rdx    #
 #ifdef LISP_FEATURE_SB_THREAD
+#ifdef LISP_FEATURE_GCC_TLS
+       movq    %fs:0, %rax
+       movq    GNAME(current_thread)@TPOFF(%rax), %r12
+#else
+#ifdef LISP_FEATURE_DARWIN
+       mov     GSYM(GNAME(specials)),%rdi
+#else
        mov     specials,%rdi
-       call    pthread_getspecific
+#endif
+       call    GNAME(pthread_getspecific)
        mov     %rax,%r12
 #endif
+#endif
        pop     %rcx    # num args
        pop     %rbx    # arg vector
        pop     %rax    # function ptr/lexenv
@@ -232,10 +235,6 @@ LsingleValue:
        pop     %r12
        pop     %rbx
 
-        /* ABI requires that the direction flag be clear on function
-         * entry and exit. */
-        cld
-        
 /* FIXME Restore the NPX state. */
 
        /* return value is already in rax where lisp expects it */
@@ -247,19 +246,17 @@ LsingleValue:
        .text
        .globl  GNAME(fpu_save)
        TYPE(GNAME(fpu_save))
-       .align  2,0x90
+       .align  align_16byte,0x90
 GNAME(fpu_save):
-       mov     4(%rsp),%rax
-       fnsave  (%rax)          # Save the NPX state. (resets NPX)
+       fnsave  (%rdi)          # Save the NPX state. (resets NPX)
        ret
        SIZE(GNAME(fpu_save))
 
        .globl  GNAME(fpu_restore)
        TYPE(GNAME(fpu_restore))
-       .align  2,0x90
+       .align  align_16byte,0x90
 GNAME(fpu_restore):
-       mov     4(%rsp),%rax
-       frstor  (%rax)          # Restore the NPX state.
+       frstor  (%rdi)          # Restore the NPX state.
        ret
        SIZE(GNAME(fpu_restore))
 \f
@@ -370,6 +367,7 @@ GNAME(fun_end_breakpoint_guts):
 multiple_value_return:
        
        .globl  GNAME(fun_end_breakpoint_trap)
+       .align  align_16byte,0x90
 GNAME(fun_end_breakpoint_trap):
        TRAP
        .byte   trap_FunEndBreakpoint