X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fthread.lisp;h=512910536297338effaaa4121a36da7b0f1ef4e6;hb=dbfe7e6c8b06e1b0b1ba35d9894fae13e6305602;hp=c5c71049a0ab58ddef761f13d25e5dc85ec98e38;hpb=be76f6319dcb41477209676e6f26e0030e4659ba;p=sbcl.git

diff --git a/src/code/thread.lisp b/src/code/thread.lisp
index c5c7104..5129105 100644
--- a/src/code/thread.lisp
+++ b/src/code/thread.lisp
@@ -1,31 +1,46 @@
-(in-package :sb!thread)
+(in-package "SB!THREAD")
 
-#+sb-xc-host
-(defun make-mutex (&key name value) nil)
+(defvar *session-lock*)
 
-#+sb-xc-host
-(defmacro with-recursive-lock ((mutex) &body body)
-  `(progn ,@body))
-
-#-sb-xc-host
-(defmacro with-recursive-lock ((mutex) &body body)
-  (let ((cfp (gensym "CFP")))
-    `(let ((,cfp (ash (sb!sys:sap-int (sb!vm::current-fp) ) -2)))
+(sb!xc:defmacro with-recursive-lock ((mutex) &body body)
+  #!+sb-thread
+  (with-unique-names (cfp)
+    `(let ((,cfp (sb!kernel:current-fp)))
       (unless (and (mutex-value ,mutex)
-		   (SB!DI::control-stack-pointer-valid-p
-		    (sb!sys:int-sap (ash (mutex-value ,mutex) 2))))
-	(get-mutex ,mutex ,cfp))
+		   (sb!vm:control-stack-pointer-valid-p
+		    (sb!sys:int-sap
+		     (sb!kernel:get-lisp-obj-address (mutex-value ,mutex)))))
+	;; this punning with MAKE-LISP-OBJ depends for its safety on
+	;; the frame pointer being a lispobj-aligned integer.  While
+	;; it is, then MAKE-LISP-OBJ will always return a FIXNUM, so
+	;; we're safe to do that.  Should this ever change, this
+	;; MAKE-LISP-OBJ could return something that looks like a
+	;; pointer, but pointing into neverneverland, which will
+	;; confuse GC completely.  -- CSR, 2003-06-03
+	(get-mutex ,mutex (sb!kernel:make-lisp-obj (sb!sys:sap-int ,cfp))))
       (unwind-protect
 	   (progn ,@body)
-	(when (eql (mutex-value ,mutex) ,cfp) (release-mutex ,mutex))))))
+	(when (sb!sys:sap= (sb!sys:int-sap
+			    (sb!kernel:get-lisp-obj-address
+			     (mutex-value ,mutex)))
+			   ,cfp)
+	  (release-mutex ,mutex)))))
+  #!-sb-thread
+  `(progn ,@body))
 
+#!+sb-thread
 (defun get-foreground ()
-  (when (not (eql (mutex-value *session-lock*)  (CURRENT-THREAD-ID)))
+  (when (not (eql (mutex-value *session-lock*) (current-thread-id)))
     (get-mutex *session-lock*))
   (sb!sys:enable-interrupt :sigint #'sb!unix::sigint-handler)
   t)
+#!-sb-thread
+(defun get-foreground () t)
 
+#!+sb-thread
 (defun release-foreground ()
   (sb!sys:enable-interrupt :sigint :ignore)
   (release-mutex *session-lock*)
   t)
+#!-sb-thread
+(defun release-foreground () t)