0.8alpha.0.9:

[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 4c098f9..6f09cb7 100644 (file)
--- a/src/compiler/x86/c-call.lisp
+++ b/src/compiler/x86/c-call.lisp
@@ -12,7 +12,7 @@
 
 (in-package "SB!VM")
 
-;; The MOVE-ARGUMENT vop is going to store args on the stack for
+;; The MOVE-ARG vop is going to store args on the stack for
 ;; call-out. These tn's will be used for that. move-arg is normally
 ;; used for things going down the stack but C wants to have args
 ;; indexed in the positive direction.
@@ -106,8 +106,8 @@
 
 #+nil ;;pfw obsolete now?
 (define-alien-type-method (values :result-tn) (type state)
-  (mapcar #'(lambda (type)
-             (invoke-alien-type-method :result-tn type state))
+  (mapcar (lambda (type)
+           (invoke-alien-type-method :result-tn type state))
          (alien-values-type-values type)))
 
 ;;; pfw - from alpha
@@ -209,27 +209,57 @@
 
 (define-vop (alloc-alien-stack-space)
   (:info amount)
+  #!+sb-thread (:temporary (:sc unsigned-reg) temp)
   (:results (result :scs (sap-reg any-reg)))
+  #!+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)))
-             delta)))
+       (inst mov temp
+             (make-ea :dword
+                      :disp (+ nil-value
+                               (static-symbol-offset '*alien-stack*)
+                               (ash symbol-tls-index-slot word-shift)
+                               (- other-pointer-lowtag))))
+       (inst fs-segment-prefix)
+       (inst sub (make-ea :dword :scale 1 :index 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)))
+              delta)))
     (load-symbol-value result *alien-stack*)))
 
 (define-vop (dealloc-alien-stack-space)
   (:info amount)
+  #!+sb-thread (:temporary (:sc unsigned-reg) temp)
+  #!+sb-thread
   (:generator 0
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
-       (inst add (make-ea :dword
+       (inst mov temp
+             (make-ea :dword
                           :disp (+ nil-value
                                    (static-symbol-offset '*alien-stack*)
-                                   (ash symbol-value-slot word-shift)
-                                   (- other-pointer-lowtag)))
-             delta)))))
+                               (ash symbol-tls-index-slot word-shift)
+                               (- other-pointer-lowtag))))
+       (inst fs-segment-prefix)
+       (inst add (make-ea :dword :scale 1 :index 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)))
+              delta)))))