0.9.3.2:

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

diff --git a/src/compiler/ppc/system.lisp b/src/compiler/ppc/system.lisp
index 8d74e7c..d640ab9 100644 (file)
--- a/src/compiler/ppc/system.lisp
+++ b/src/compiler/ppc/system.lisp
@@ -47,7 +47,7 @@
     ;; 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)
@@ -71,7 +71,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)
@@ -103,7 +103,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)
@@ -128,13 +128,12 @@
     ;;
     ;; 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)))
+    (inst rlwinm res ptr n-fixnum-tag-bits 1 n-positive-fixnum-bits)))
 
 (define-vop (make-other-immediate-type)
   (:args (val :scs (any-reg descriptor-reg))
-        (type :scs (any-reg descriptor-reg immediate)
-              :target temp))
+         (type :scs (any-reg descriptor-reg immediate)
+               :target temp))
   (:results (res :scs (any-reg descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:generator 2
@@ -193,7 +192,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)
@@ -210,18 +209,16 @@
 ;;;; 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)))
 
 (define-vop (halt)
   (:generator 1
     (inst unimp halt-trap)))
-
-
 \f
 ;;;; Dynamic vop count collection support
 
@@ -231,8 +228,8 @@
   (: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))))