1.0.45.36: Fix solaris x86-64 page size issue

[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 85d5238..c29aceb 100644 (file)
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -25,15 +25,15 @@
 #include "genesis/thread.h"
        
 /* Minimize conditionalization for different OS naming schemes. */
-#if defined __linux__  || defined __FreeBSD__ /* (but *not* OpenBSD) */
+#if defined __linux__  || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __sun
 #define GNAME(var) var
 #else
 #define GNAME(var) _##var
 #endif
 
-/* Get the right type of alignment. Linux and FreeBSD (but not OpenBSD)
+/* Get the right type of alignment. Linux, FreeBSD and OpenBSD
  * want alignment in bytes. */
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined __NetBSD__ || defined(__sun)
 #define align_4byte    4
 #define align_8byte    8
 #define align_16byte   16
@@ -67,7 +67,7 @@
  * for this instruction in the SIGILL handler and if we see it, we
  * advance the EIP by two bytes to skip over ud2 instruction and
  * call sigtrap_handler. */
-#if defined(LISP_FEATURE_DARWIN)
+#if defined(LISP_FEATURE_UD2_BREAKPOINTS)
 #define TRAP ud2
 #else
 #define TRAP int3
@@ -128,8 +128,7 @@ GNAME(call_into_c):
        .globl  GNAME(call_into_lisp_first_time)
        TYPE(GNAME(call_into_lisp_first_time))
                
-/* The *ALIEN-STACK* pointer is set up on the first call_into_lisp when
- * the stack changes.  We don't worry too much about saving registers 
+/* We don't worry too much about saving registers 
  * here, because we never expect to return from the initial call to lisp 
  * anyway */
        
@@ -137,7 +136,6 @@ GNAME(call_into_c):
 GNAME(call_into_lisp_first_time):
        push    %rbp            # Save old frame pointer.
        mov     %rsp,%rbp       # Establish new frame.
-       mov     %rsp,ALIEN_STACK + SYMBOL_VALUE_OFFSET
 #if defined(LISP_FEATURE_DARWIN)
        movq    GSYM(GNAME(all_threads)),%rax
 #else
@@ -211,10 +209,10 @@ Ldone:
        xor     %rbx,%rbx       # available
 
        /* Alloc new frame. */
-       mov     %rsp,%rbx       # The current sp marks start of new frame.
-       push    %rbp            # fp in save location S0
-       sub     $16,%rsp        # Ensure 3 slots are allocated, one above.
-       mov     %rbx,%rbp       # Switch to new frame.
+       push    %rbp            # Dummy for return address
+       push    %rbp            # fp in save location S1
+       mov     %rsp,%rbp       # The current sp marks start of new frame.
+       sub     $8,%rsp         # Ensure 3 slots are allocated, two above.
 
 Lcall:
        call    *CLOSURE_FUN_OFFSET(%rax)
@@ -237,7 +235,7 @@ LsingleValue:
 
 /* FIXME Restore the NPX state. */
 
-       /* return value is already in rax where lisp expects it */
+       mov     %rdx,%rax       # c-val
        leave
        ret
        SIZE(GNAME(call_into_lisp))
@@ -268,6 +266,7 @@ GNAME(fpu_restore):
        .globl  GNAME(undefined_tramp)
        TYPE(GNAME(undefined_tramp))
 GNAME(undefined_tramp):
+       pop     8(%rbp)         # Save return PC for backtrace.
        TRAP
        .byte   trap_Error
         .byte   2