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 af5db22..85d5238 100644 (file)
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -246,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
@@ -369,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