Fix deadlocks in GC on Windows.

[sbcl.git] / src / compiler / mips / system.lisp

diff --git a/src/compiler/mips/system.lisp b/src/compiler/mips/system.lisp
index 8bc6987..9cd4b39 100644 (file)
--- a/src/compiler/mips/system.lisp
+++ b/src/compiler/mips/system.lisp
@@ -1,32 +1,15 @@
-(in-package "SB!VM")
+;;;; MIPS VM definitions of various system hacking operations
 
-\f
-;;;; Random pointer comparison VOPs
-
-(define-vop (pointer-compare)
-  (:args (x :scs (sap-reg))
-        (y :scs (sap-reg)))
-  (:arg-types system-area-pointer system-area-pointer)
-  (:temporary (:scs (non-descriptor-reg)) temp)
-  (:conditional)
-  (:info target not-p)
-  (:policy :fast-safe)
-  (:note "inline comparison")
-  (:variant-vars condition)
-  (:generator 3
-    (three-way-comparison x y condition :unsigned not-p target temp)))
-
-#+nil
-(macrolet ((frob (name cond)
-            `(progn
-               (def-primitive-translator ,name (x y) `(,',name ,x ,y))
-               (defknown ,name (t t) boolean (movable foldable flushable))
-               (define-vop (,name pointer-compare)
-                 (:translate ,name)
-                 (:variant ,cond)))))
-  (frob pointer< :lt)
-  (frob pointer> :gt))
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
 
+(in-package "SB!VM")
 
 \f
 ;;;; Type frobbing VOPs
@@ -56,7 +39,7 @@
     (inst beq ndescr function-ptr)
 
     ;; Pick off fixnums.
-    (inst and result object 3)
+    (inst and result object fixnum-tag-mask)
     (inst beq result done)
 
     ;; Pick off structure and list pointers.
@@ -80,7 +63,7 @@
     OTHER-PTR
     (load-type result object (- other-pointer-lowtag))
     (inst nop)
-      
+
     DONE))
 
 (define-vop (fun-subtype)
@@ -97,7 +80,7 @@
   (:translate (setf fun-subtype))
   (:policy :fast-safe)
   (:args (type :scs (unsigned-reg) :target result)
-        (function :scs (descriptor-reg)))
+         (function :scs (descriptor-reg)))
   (:arg-types positive-fixnum *)
   (:results (result :scs (unsigned-reg)))
   (:result-types positive-fixnum)
@@ -130,7 +113,7 @@
   (:translate set-header-data)
   (:policy :fast-safe)
   (:args (x :scs (descriptor-reg) :target res)
-        (data :scs (any-reg immediate zero)))
+         (data :scs (any-reg immediate zero)))
   (:arg-types * positive-fixnum)
   (:results (res :scs (descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) t1 t2)
@@ -139,7 +122,7 @@
     (inst and t1 widetag-mask)
     (sc-case data
       (any-reg
-       (inst sll t2 data (- n-widetag-bits 2))
+       (inst sll t2 data (- n-widetag-bits n-fixnum-tag-bits))
        (inst or t1 t2))
       (immediate
        (inst or t1 (ash (tn-value data) n-widetag-bits)))
@@ -147,32 +130,17 @@
     (storew t1 x 0 other-pointer-lowtag)
     (move res x)))
 
-(define-vop (make-fixnum)
+(define-vop (pointer-hash)
+  (:translate pointer-hash)
   (:args (ptr :scs (any-reg descriptor-reg)))
   (:results (res :scs (any-reg descriptor-reg)))
+  (:policy :fast-safe)
   (:generator 1
-    ;;
-    ;; Some code (the hash table code) depends on this returning a
-    ;; positive number so make sure it does.
+    ;; FIXME: It would be better if this would mask the lowtag,
+    ;; and shift the result into a positive fixnum like on x86.
     (inst sll res ptr 3)
     (inst srl res res 1)))
 
-(define-vop (make-other-immediate-type)
-  (:args (val :scs (any-reg descriptor-reg))
-        (type :scs (any-reg descriptor-reg immediate)
-              :target temp))
-  (:results (res :scs (any-reg descriptor-reg)))
-  (:temporary (:scs (non-descriptor-reg)) temp)
-  (:generator 2
-    (sc-case type
-      ((immediate)
-       (inst sll temp val n-widetag-bits)
-       (inst or res temp (tn-value type)))
-      (t
-       (inst sra temp type 2)
-       (inst sll res val (- n-widetag-bits 2))
-       (inst or res res temp)))))
-
 \f
 ;;;; Allocation
 
@@ -219,7 +187,7 @@
 
 (define-vop (compute-fun)
   (:args (code :scs (descriptor-reg))
-        (offset :scs (signed-reg unsigned-reg)))
+         (offset :scs (signed-reg unsigned-reg)))
   (:arg-types * positive-fixnum)
   (:results (func :scs (descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) ndescr)
@@ -235,17 +203,17 @@
 ;;;; Other random VOPs.
 
 
-(defknown sb!unix::do-pending-interrupt () (values))
-(define-vop (sb!unix::do-pending-interrupt)
+(defknown sb!unix::receive-pending-interrupt () (values))
+(define-vop (sb!unix::receive-pending-interrupt)
   (:policy :fast-safe)
-  (:translate sb!unix::do-pending-interrupt)
+  (:translate sb!unix::receive-pending-interrupt)
   (:generator 1
-    (inst break pending-interrupt-trap)))
+    (inst break 0 pending-interrupt-trap)))
 
 
 (define-vop (halt)
   (:generator 1
-    (inst break halt-trap)))
+    (inst break 0 halt-trap)))
 
 \f
 ;;;; Dynamic vop count collection support
@@ -256,8 +224,14 @@
   (:temporary (:scs (non-descriptor-reg)) count)
   (:generator 1
     (let ((offset
-          (- (* (+ index vector-data-offset) n-word-bytes) other-pointer-lowtag)))
+           (- (* (+ index vector-data-offset) n-word-bytes) other-pointer-lowtag)))
       (inst lw count count-vector offset)
       (inst nop)
       (inst addu count 1)
       (inst sw count count-vector offset))))
+
+;;;; Dummy definition for a spin-loop hint VOP
+(define-vop (spin-loop-hint)
+  (:translate spin-loop-hint)
+  (:policy :fast-safe)
+  (:generator 0))