0.8.9.6.netbsd.2:

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

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index 0669b44..1a135be 100644 (file)
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -23,15 +23,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 __NetBSD__ /* (but *not* OpenBSD) */
 #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 NetBSD (but not OpenBSD)
  * want alignment in bytes. */
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
 #define align_4byte    4
 #define align_8byte    8
 #define align_16byte   16
@@ -163,7 +163,7 @@ Lstack:
 /* Save the NPX state */
        fwait                   # Catch any pending NPX exceptions.
        subl    $108,%esp       # Make room for the NPX state.
-       fnsave  (%esp)          # resets NPX
+       fnsave  (%esp)          # save and reset NPX
 
        movl    (%esp),%eax     # Load NPX control word.
        andl    $0xfffff3ff,%eax        # Set rounding mode to nearest.
@@ -223,12 +223,12 @@ Ldone:
        sub     $8,%esp         # Ensure 3 slots are allocated, one above.
        mov     %ebx,%ebp       # Switch to new frame.
 
-       /* Indirect the closure. */
        call    *CLOSURE_FUN_OFFSET(%eax)
        
-       /* Multi-value return; blow off any extra values. */
+       /* If the function returned multiple values, it will return to
+          this point.  Lose them */
        mov     %ebx, %esp
-       /* single value return */
+       /* A singled value function returns here */
 
 /* Restore the stack, in case there was a stack change. */
        popl    %esp            # c-sp
@@ -672,6 +672,20 @@ GNAME(alloc_16_to_edi):
        .size   GNAME(alloc_16_to_edi),.-GNAME(alloc_16_to_edi)
                
 
+       .align  align_4byte,0x90
+       .globl  GNAME(post_signal_tramp)
+       .type   GNAME(post_signal_tramp),@function
+GNAME(post_signal_tramp):
+       /* this is notionally the second half of a function whose first half
+        * doesn't exist.  This is where call_into_lisp returns when called 
+        * using return_to_lisp_function */
+       addl $12,%esp   /* clear call_into_lisp args from stack */
+       popa            /* restore registers */
+       popl %ebp       
+       ret
+       .size GNAME(post_signal_tramp),.-GNAME(post_signal_tramp)
+
+       
 \f
 #ifdef GENCGC_INLINE_ALLOC /* LISP_FEATURE_GENCGC */