X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fsystem.lisp;h=ebaaca5988a4e1af178aef84f0394d818d70d403;hb=debae3c18d31b5222be4d5de8dcb2601336e24a4;hp=3366e1077c1c9a1a15ec5886b6ab7d7b03a9ff34;hpb=1419c1d2d50f039be46a8667351b7738ac4965e4;p=sbcl.git

diff --git a/src/compiler/ppc/system.lisp b/src/compiler/ppc/system.lisp
index 3366e10..ebaaca5 100644
--- a/src/compiler/ppc/system.lisp
+++ b/src/compiler/ppc/system.lisp
@@ -1,11 +1,15 @@
-;;;
-;;; Written by Rob MacLachlan
-;;;
-;;; Mips conversion by William Lott and Christopher Hoover.
-;;;
-(in-package "SB!VM")
+;;;; PPC VM definitions of various system hacking operations
 
+;;;; 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")
 
 ;;;; Type frobbing VOPs
 
@@ -16,7 +20,7 @@
   (:results (result :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 1
-    (inst andi. result object sb!vm:lowtag-mask)))
+    (inst andi. result object lowtag-mask)))
 
 (define-vop (widetag-of)
   (:translate widetag-of)
@@ -38,12 +42,12 @@
     (inst beq done)
     ;; Okay, it is an immediate.  If fixnum, we want zero.  Otherwise,
     ;; we want the low 8 bits.
-    (inst andi. result object #b11)
+    (inst andi. result object fixnum-tag-mask)
     (inst beq done)
     ;; It wasn't a fixnum, so get the low 8 bits.
     (inst andi. result object widetag-mask)
     (inst b done)
-    
+
     FUNCTION-POINTER
     (load-type result object (- fun-pointer-lowtag))
     (inst b done)
@@ -61,13 +65,13 @@
   (:results (result :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (load-type result function (- sb!vm:fun-pointer-lowtag))))
+    (load-type result function (- fun-pointer-lowtag))))
 
 (define-vop (set-fun-subtype)
   (: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)
@@ -82,8 +86,8 @@
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (loadw res x 0 sb!vm:other-pointer-lowtag)
-    (inst srwi res res sb!vm:n-widetag-bits)))
+    (loadw res x 0 other-pointer-lowtag)
+    (inst srwi res res n-widetag-bits)))
 
 (define-vop (get-closure-length)
   (:translate get-closure-length)
@@ -92,56 +96,40 @@
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (loadw res x 0 sb!vm:fun-pointer-lowtag)
-    (inst srwi res res sb!vm:n-widetag-bits)))
+    (loadw res x 0 fun-pointer-lowtag)
+    (inst srwi res res n-widetag-bits)))
 
 (define-vop (set-header-data)
   (: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)
   (:generator 6
-    (loadw t1 x 0 sb!vm:other-pointer-lowtag)
-    (inst andi. t1 t1 sb!vm:widetag-mask)
+    (loadw t1 x 0 other-pointer-lowtag)
+    (inst andi. t1 t1 widetag-mask)
     (sc-case data
       (any-reg
-       (inst slwi t2 data (- sb!vm:n-widetag-bits 2))
+       (inst slwi t2 data (- n-widetag-bits n-fixnum-tag-bits))
        (inst or t1 t1 t2))
       (immediate
-       (inst ori t1 t1 (ash (tn-value data) sb!vm:n-widetag-bits)))
+       (inst ori t1 t1 (ash (tn-value data) n-widetag-bits)))
       (zero))
-    (storew t1 x 0 sb!vm:other-pointer-lowtag)
+    (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.
-    (inst slwi res ptr 3)
-    (inst srwi 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 slwi temp val sb!vm:n-widetag-bits)
-       (inst ori res temp (tn-value type)))
-      (t
-       (inst srawi temp type 2)
-       (inst slwi res val (- sb!vm:n-widetag-bits 2))
-       (inst or res res temp)))))
+    ;; FIXME: It would be better if this would mask the lowtag,
+    ;; and shift the result into a positive fixnum like on x86.
+    (inst rlwinm res ptr n-fixnum-tag-bits 1 n-positive-fixnum-bits)))
 
 
 ;;;; Allocation
@@ -181,24 +169,24 @@
   (:results (sap :scs (sap-reg)))
   (:result-types system-area-pointer)
   (:generator 10
-    (loadw ndescr code 0 sb!vm:other-pointer-lowtag)
-    (inst srwi ndescr ndescr sb!vm:n-widetag-bits)
-    (inst slwi ndescr ndescr sb!vm:word-shift)
-    (inst subi ndescr ndescr sb!vm:other-pointer-lowtag)
+    (loadw ndescr code 0 other-pointer-lowtag)
+    (inst srwi ndescr ndescr n-widetag-bits)
+    (inst slwi ndescr ndescr word-shift)
+    (inst subi ndescr ndescr other-pointer-lowtag)
     (inst add sap code ndescr)))
 
 (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)
   (:generator 10
-    (loadw ndescr code 0 sb!vm:other-pointer-lowtag)
-    (inst srwi ndescr ndescr sb!vm:n-widetag-bits)
-    (inst slwi ndescr ndescr sb!vm:word-shift)
+    (loadw ndescr code 0 other-pointer-lowtag)
+    (inst srwi ndescr ndescr n-widetag-bits)
+    (inst slwi ndescr ndescr word-shift)
     (inst add ndescr ndescr offset)
-    (inst addi ndescr ndescr (- sb!vm:fun-pointer-lowtag sb!vm:other-pointer-lowtag))
+    (inst addi ndescr ndescr (- fun-pointer-lowtag other-pointer-lowtag))
     (inst add func code ndescr)))
 
 
@@ -206,35 +194,39 @@
 ;;;; 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 unimp pending-interrupt-trap)))
 
-(defknown current-thread-offset-sap ((unsigned-byte 32))  
+#!+sb-safepoint
+(define-vop (insert-safepoint)
+  (:policy :fast-safe)
+  (:translate sb!kernel::gc-safepoint)
+  (:generator 0
+    (emit-safepoint)))
+
+#!+sb-thread
+(defknown current-thread-offset-sap ((unsigned-byte 64))
   system-area-pointer (flushable))
 
+#!+sb-thread
 (define-vop (current-thread-offset-sap)
   (:results (sap :scs (sap-reg)))
   (:result-types system-area-pointer)
   (:translate current-thread-offset-sap)
-  (:args (n :scs (unsigned-reg) ))
-  (:temporary (:sc unsigned-reg :target sap) temp1)
-  (:temporary (:sc unsigned-reg) temp2)
+  (:args (n :scs (unsigned-reg) :target sap))
   (:arg-types unsigned-num)
   (:policy :fast-safe)
-  (:generator 3
-    (inst slwi n temp1 2)
-    (inst lr temp2 (make-fixup (extern-alien-name "all_threads") :foreign))
-    (inst lwzx sap temp1 temp2)))
+  (:generator 2
+    (inst slwi n n word-shift)
+    (inst lwzx sap thread-base-tn n)))
 
 (define-vop (halt)
   (:generator 1
     (inst unimp halt-trap)))
-
-
 
 ;;;; Dynamic vop count collection support
 
@@ -244,8 +236,49 @@
   (:temporary (:scs (non-descriptor-reg)) count)
   (:generator 1
     (let ((offset
-	   (- (* (+ index vector-data-offset) n-word-bytes) other-pointer-lowtag)))
-      (assert (typep offset '(signed-byte 16)))
+           (- (* (+ index vector-data-offset) n-word-bytes) other-pointer-lowtag)))
+      (aver (typep offset '(signed-byte 16)))
       (inst lwz count count-vector offset)
       (inst addi count count 1)
       (inst stw count count-vector offset))))
+
+;;;; Memory barrier support
+
+#!+memory-barrier-vops
+(define-vop (%compiler-barrier)
+  (:policy :fast-safe)
+  (:translate %compiler-barrier)
+  (:generator 3))
+
+#!+memory-barrier-vops
+(define-vop (%memory-barrier)
+  (:policy :fast-safe)
+  (:translate %memory-barrier)
+  (:generator 3
+     (inst sync)))
+
+#!+memory-barrier-vops
+(define-vop (%read-barrier)
+  (:policy :fast-safe)
+  (:translate %read-barrier)
+  (:generator 3
+     (inst sync)))
+
+#!+memory-barrier-vops
+(define-vop (%write-barrier)
+  (:policy :fast-safe)
+  (:translate %write-barrier)
+  (:generator 3
+    (inst sync)))
+
+#!+memory-barrier-vops
+(define-vop (%data-dependency-barrier)
+  (:policy :fast-safe)
+  (:translate %data-dependency-barrier)
+  (:generator 3))
+
+;;;; Dummy definition for a spin-loop hint VOP
+(define-vop (spin-loop-hint)
+  (:translate spin-loop-hint)
+  (:policy :fast-safe)
+  (:generator 0))