1.0.47.4: Fix slot-documentation for SB-POSIX:TERMIOS slot CC.

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

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index 4a5090c..5a89a4a 100644 (file)
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -79,7 +79,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 END()
 #define TRAP ud2
 #else
@@ -173,8 +173,7 @@ Lfp_rtn_value:
        .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 */
        
@@ -183,7 +182,6 @@ GNAME(call_into_lisp_first_time):
        pushl   %ebp            # Save old frame pointer.
        movl    %esp,%ebp       # Establish new frame.
 #ifndef LISP_FEATURE_WIN32
-       movl    %esp,ALIEN_STACK + SYMBOL_VALUE_OFFSET
        movl    GNAME(all_threads),%eax
        /* pthread machinery takes care of this for other threads */
        movl    THREAD_CONTROL_STACK_END_OFFSET(%eax) ,%esp
@@ -274,10 +272,10 @@ Ldone:
 #endif
 
        /* Alloc new frame. */
-       mov     %esp,%ebx       # The current sp marks start of new frame.
-       push    %ebp            # fp in save location S0
-       sub     $8,%esp         # Ensure 3 slots are allocated, one above.
-       mov     %ebx,%ebp       # Switch to new frame.
+       push    %ebp            # Dummy for return address
+       push    %ebp            # fp in save location S1
+       mov     %esp,%ebp       # The current sp marks start of new frame.
+       sub     $4,%esp         # Ensure 3 slots are allocated, two above.
 
        call    *CLOSURE_FUN_OFFSET(%eax)
        
@@ -335,11 +333,12 @@ GNAME(fpu_restore):
  * the undefined-function trampoline
  */
        .text
-       .align  align_4byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(undefined_tramp)
        TYPE(GNAME(undefined_tramp))
         .byte   0, 0, 0, SIMPLE_FUN_HEADER_WIDETAG
 GNAME(undefined_tramp):
+       pop     4(%ebp)         # Save return PC for backtrace.
        TRAP
        .byte   trap_Error
         .byte   2
@@ -352,7 +351,7 @@ GNAME(undefined_tramp):
  * the closure trampoline
  */
        .text
-       .align  align_4byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(closure_tramp)
        TYPE(GNAME(closure_tramp))
         .byte   0, 0, 0, SIMPLE_FUN_HEADER_WIDETAG
@@ -368,7 +367,7 @@ GNAME(closure_tramp):
        SIZE(GNAME(closure_tramp))
 
        .text
-       .align  align_4byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(funcallable_instance_tramp)
        TYPE(GNAME(funcallable_instance_tramp))
 GNAME(funcallable_instance_tramp):
@@ -383,7 +382,7 @@ GNAME(funcallable_instance_tramp):
  */
        .text
        .globl  GNAME(fun_end_breakpoint_guts)
-       .align  align_4byte
+       .align  align_16byte
 GNAME(fun_end_breakpoint_guts):
        /* Multiple Value return */
        jc      multiple_value_return
@@ -410,7 +409,7 @@ GNAME(fun_end_breakpoint_end):
 \f
        .globl  GNAME(do_pending_interrupt)
        TYPE(GNAME(do_pending_interrupt))
-       .align  align_4byte,0x90
+       .align  align_16byte,0x90
 GNAME(do_pending_interrupt):
        TRAP
        .byte   trap_PendingInterrupt
@@ -451,7 +450,7 @@ GNAME(do_pending_interrupt):
 #define DEFINE_ALLOC_TO_EAX(name,size)                          \
         .globl  GNAME(name);                                    \
         TYPE(GNAME(name));                                      \
-        .align  align_4byte,0x90;                               \
+        .align  align_16byte,0x90;                              \
 GNAME(name):                                                    \
         pushl   %ecx;              /* Save ECX and EDX       */ \
         pushl   %edx;                                           \
@@ -464,7 +463,7 @@ GNAME(name):                                                    \
 #define DEFINE_ALLOC_TO_ECX(name,size)                          \
         .globl  GNAME(name);                                    \
         TYPE(GNAME(name));                                      \
-        .align  align_4byte,0x90;                               \
+        .align  align_16byte,0x90;                              \
 GNAME(name):                                                    \
         pushl   %eax;              /* Save EAX and EDX       */ \
         pushl   %edx;                                           \
@@ -478,7 +477,7 @@ GNAME(name):                                                    \
 #define DEFINE_ALLOC_TO_EDX(name,size)                          \
         .globl  GNAME(name);                                    \
         TYPE(GNAME(name));                                      \
-        .align  align_4byte,0x90;                               \
+        .align  align_16byte,0x90;                              \
 GNAME(name):                                                    \
         pushl   %eax;               /* Save EAX and ECX      */ \
         pushl   %ecx;                                           \
@@ -492,7 +491,7 @@ GNAME(name):                                                    \
 #define DEFINE_ALLOC_TO_REG(name,reg,size)                      \
         .globl  GNAME(name);                                    \
         TYPE(GNAME(name));                                      \
-        .align  align_4byte,0x90;                               \
+        .align  align_16byte,0x90;                              \
 GNAME(name):                                                    \
         pushl   %eax;              /* Save EAX, ECX, and EDX */ \
         pushl   %ecx;                                           \
@@ -547,7 +546,7 @@ DEFINE_ALLOC_TO_REG(alloc_16_to_edi,%edi,$16)
 
 /* This routine handles an overflow with eax=crfp+size. So the
    size=eax-crfp. */
-        .align  align_4byte
+        .align  align_16byte
         .globl  GNAME(alloc_overflow_eax)
        TYPE(GNAME(alloc_overflow_eax))
 GNAME(alloc_overflow_eax):
@@ -559,7 +558,7 @@ GNAME(alloc_overflow_eax):
         ret
         SIZE(GNAME(alloc_overflow_eax))
 
-        .align  align_4byte
+        .align  align_16byte
         .globl  GNAME(alloc_overflow_ecx)
        TYPE(GNAME(alloc_overflow_ecx))
 GNAME(alloc_overflow_ecx):
@@ -572,7 +571,7 @@ GNAME(alloc_overflow_ecx):
         ret
         SIZE(GNAME(alloc_overflow_ecx))
 
-        .align  align_4byte
+        .align  align_16byte
         .globl  GNAME(alloc_overflow_edx)
         TYPE(GNAME(alloc_overflow_edx))
 GNAME(alloc_overflow_edx):
@@ -587,7 +586,7 @@ GNAME(alloc_overflow_edx):
 
 /* This routine handles an overflow with ebx=crfp+size. So the
    size=ebx-crfp. */
-        .align  align_4byte
+        .align  align_16byte
         .globl  GNAME(alloc_overflow_ebx)
         TYPE(GNAME(alloc_overflow_ebx))
 GNAME(alloc_overflow_ebx):
@@ -604,7 +603,7 @@ GNAME(alloc_overflow_ebx):
 
 /* This routine handles an overflow with esi=crfp+size. So the
    size=esi-crfp. */
-        .align  align_4byte
+        .align  align_16byte
         .globl  GNAME(alloc_overflow_esi)
         TYPE(GNAME(alloc_overflow_esi))
 GNAME(alloc_overflow_esi):
@@ -619,7 +618,7 @@ GNAME(alloc_overflow_esi):
         ret
         SIZE(GNAME(alloc_overflow_esi))
 
-        .align  align_4byte
+        .align  align_16byte
         .globl  GNAME(alloc_overflow_edi)
         TYPE(GNAME(alloc_overflow_edi))
 GNAME(alloc_overflow_edi):
@@ -642,7 +641,7 @@ GNAME(alloc_overflow_edi):
         * and EIP from the exception context and use it to fake
         * up a stack frame which will skip over the system SEH
         * code. */
-       .align  align_4byte
+       .align  align_16byte
        .globl  GNAME(exception_handler_wrapper)
        TYPE(GNAME(exception_handler_wrapper))
 GNAME(exception_handler_wrapper):
@@ -673,7 +672,7 @@ GNAME(exception_handler_wrapper):
 #endif
 
 #ifdef LISP_FEATURE_DARWIN
-        .align align_4byte
+        .align align_16byte
         .globl GNAME(call_into_lisp_tramp)
         TYPE(GNAME(call_into_lisp_tramp))
 GNAME(call_into_lisp_tramp):
@@ -722,7 +721,7 @@ GNAME(call_into_lisp_tramp):
         SIZE(call_into_lisp_tramp)
 #endif
         
-       .align  align_4byte,0x90
+       .align  align_16byte,0x90
        .globl  GNAME(post_signal_tramp)
        TYPE(GNAME(post_signal_tramp))
 GNAME(post_signal_tramp):
@@ -747,7 +746,7 @@ GNAME(post_signal_tramp):
 \f
        .globl GNAME(fast_bzero_pointer)
        .data
-        .align  align_4byte
+        .align  align_16byte
 GNAME(fast_bzero_pointer):
         /* Variable containing a pointer to the bzero function to use.
          * Initially points to a basic function.  Change this variable
@@ -755,7 +754,7 @@ GNAME(fast_bzero_pointer):
         .long GNAME(fast_bzero_base)
 \f
        .text
-       .align  align_8byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(fast_bzero)
        TYPE(GNAME(fast_bzero))
 GNAME(fast_bzero):        
@@ -765,7 +764,7 @@ GNAME(fast_bzero):
         
 \f      
        .text
-       .align  align_8byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(fast_bzero_detect)
        TYPE(GNAME(fast_bzero_detect))
 GNAME(fast_bzero_detect):
@@ -803,7 +802,7 @@ Lrestore:
         
 \f
        .text
-       .align  align_8byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(fast_bzero_sse)
        TYPE(GNAME(fast_bzero_sse))
         
@@ -849,7 +848,7 @@ Lend_sse:
                 
 \f
        .text
-       .align  align_8byte,0x90
+       .align  align_16byte,0x90
        .globl GNAME(fast_bzero_base)
        TYPE(GNAME(fast_bzero_base))