X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fthread.lisp;h=50be15f2bee91cf962df3a12491a7eac6deefdf6;hb=35b5e97163c45e89659dbd75c91d653b49c758d3;hp=fcbdd9412b5891f4482d6017bc0129dafc5c5d4a;hpb=670010e3f3dcd62efaf23f61abdc73950edb88c6;p=sbcl.git

diff --git a/src/code/thread.lisp b/src/code/thread.lisp
index fcbdd94..50be15f 100644
--- a/src/code/thread.lisp
+++ b/src/code/thread.lisp
@@ -1,16 +1,30 @@
-(in-package :sb!thread)
+(in-package "SB!THREAD")
+
+(defvar *session-lock*)
 
 (sb!xc:defmacro with-recursive-lock ((mutex) &body body)
   #!+sb-thread
   (with-unique-names (cfp)
-    `(let ((,cfp (ash (sb!sys:sap-int (sb!vm::current-fp) ) -2)))
+    `(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))
 
@@ -18,14 +32,14 @@
 (defun get-foreground ()
   (when (not (eql (mutex-value *session-lock*) (current-thread-id)))
     (get-mutex *session-lock*))
-  (sb!sys:enable-interrupt :sigint #'sb!unix::sigint-handler)
+  (sb!sys:enable-interrupt sb!unix:sigint #'sb!unix::sigint-handler)
   t)
 #!-sb-thread
 (defun get-foreground () t)
 
 #!+sb-thread
 (defun release-foreground ()
-  (sb!sys:enable-interrupt :sigint :ignore)
+  (sb!sys:enable-interrupt sb!unix:sigint :ignore)
   (release-mutex *session-lock*)
   t)
 #!-sb-thread