1.0.5.35: stack alignment on x86/Darwin, once more

[sbcl.git] / src / compiler / x86 / c-call.lisp

diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp
index c52ce27..f6de0de 100644 (file)
--- a/src/compiler/x86/c-call.lisp
+++ b/src/compiler/x86/c-call.lisp
@@ -219,6 +219,9 @@
   (:save-p t)
   (:ignore args ecx edx)
   (:generator 0
+    ;; FIXME & OAOOM: This is brittle and error-prone to maintain two
+    ;; instances of the same logic, on in arch-assem.S, and one in
+    ;; c-call.lisp. If you modify this, modify that one too...
     (cond ((policy node (> space speed))
            (move eax function)
            (inst call (make-fixup "call_into_c" :foreign)))
@@ -228,10 +231,12 @@
            (dotimes (i 8)
              (inst fstp fr0-tn))
 
-           #!+win32 (inst cld)
+           ;; Clear out DF: Darwin, Windows, and Solaris at least require
+           ;; this, and it should not hurt others either.
+           (inst cld)
 
            (inst call function)
-           ;; To give the debugger a clue. XX not really internal-error?
+           ;; To give the debugger a clue. FIXME: not really internal-error?
            (note-this-location vop :internal-error)
 
            ;; Restore the NPX for lisp; ensure no regs are empty
@@ -241,8 +246,8 @@
            (if (and results
                     (location= (tn-ref-tn results) fr0-tn))
                ;; The return result is in fr0.
-               (inst fxch fr7-tn) ; move the result back to fr0
-               (inst fldz)) ; insure no regs are empty
+               (inst fxch fr7-tn)       ; move the result back to fr0
+               (inst fldz))             ; insure no regs are empty
            ))))
 
 ;;; While SBCL uses the FPU in 53-bit mode, most C libraries assume that
@@ -279,17 +284,9 @@
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
         (inst sub esp-tn delta)))
-    ;; C stack should probably be 16 byte aligned on Darwin
-    #!+darwin (inst and esp-tn -16)
+    (align-stack-pointer esp-tn)
     (move result esp-tn)))
 
-(define-vop (dealloc-number-stack-space)
-  (:info amount)
-  (:generator 0
-    (unless (zerop amount)
-      (let ((delta (logandc2 (+ amount 3) 3)))
-        (inst add esp-tn delta)))))
-
 (define-vop (alloc-alien-stack-space)
   (:info amount)
   #!+sb-thread (:temporary (:sc unsigned-reg) temp)
@@ -300,24 +297,16 @@
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
         (inst mov temp
-              (make-ea :dword
-                       :disp (+ nil-value
-                                (static-symbol-offset '*alien-stack*)
-                                (ash symbol-tls-index-slot word-shift)
-                                (- other-pointer-lowtag))))
+              (make-ea-for-symbol-tls-index *alien-stack*))
         (inst fs-segment-prefix)
-        (inst sub (make-ea :dword :scale 1 :index temp) delta)))
+        (inst sub (make-ea :dword :base temp) delta)))
     (load-tl-symbol-value result *alien-stack*))
   #!-sb-thread
   (:generator 0
     (aver (not (location= result esp-tn)))
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
-        (inst sub (make-ea :dword
-                           :disp (+ nil-value
-                                    (static-symbol-offset '*alien-stack*)
-                                    (ash symbol-value-slot word-shift)
-                                    (- other-pointer-lowtag)))
+        (inst sub (make-ea-for-symbol-value *alien-stack*)
               delta)))
     (load-symbol-value result *alien-stack*)))
 
@@ -329,22 +318,14 @@
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
         (inst mov temp
-              (make-ea :dword
-                           :disp (+ nil-value
-                                    (static-symbol-offset '*alien-stack*)
-                                (ash symbol-tls-index-slot word-shift)
-                                (- other-pointer-lowtag))))
+              (make-ea-for-symbol-tls-index *alien-stack*))
         (inst fs-segment-prefix)
-        (inst add (make-ea :dword :scale 1 :index temp) delta))))
+        (inst add (make-ea :dword :base temp) delta))))
   #!-sb-thread
   (:generator 0
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
-        (inst add (make-ea :dword
-                           :disp (+ nil-value
-                                    (static-symbol-offset '*alien-stack*)
-                                    (ash symbol-value-slot word-shift)
-                                    (- other-pointer-lowtag)))
+        (inst add (make-ea-for-symbol-value *alien-stack*)
               delta)))))
 
 ;;; these are not strictly part of the c-call convention, but are
@@ -400,9 +381,7 @@ pointer to the arguments."
               ;; to ensure it'll work even if the GC moves ENTER-ALIEN-CALLBACK.
               ;; Skip any SB-THREAD TLS magic, since we don't expecte anyone
               ;; to rebind the variable. -- JES, 2006-01-01
-              (inst mov eax (+ nil-value (static-symbol-offset
-                                          'sb!alien::*enter-alien-callback*)))
-              (loadw eax eax symbol-value-slot other-pointer-lowtag)
+              (load-symbol-value eax sb!alien::*enter-alien-callback*)
               (inst push eax) ; function
               (inst mov  eax (foreign-symbol-address "funcall3"))
               (inst call eax)