0.9.2.44:

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

diff --git a/src/compiler/alpha/system.lisp b/src/compiler/alpha/system.lisp
index 6b8e083..70c7c47 100644 (file)
--- a/src/compiler/alpha/system.lisp
+++ b/src/compiler/alpha/system.lisp
@@ -13,8 +13,8 @@
 \f
 ;;;; type frobbing VOPs
 
-(define-vop (get-lowtag)
-  (:translate get-lowtag)
+(define-vop (lowtag-of)
+  (:translate lowtag-of)
   (:policy :fast-safe)
   (:args (object :scs (any-reg descriptor-reg)))
   (:results (result :scs (unsigned-reg)))
@@ -22,8 +22,8 @@
   (:generator 1
     (inst and object lowtag-mask result)))
 
-(define-vop (get-type)
-  (:translate get-type)
+(define-vop (widetag-of)
+  (:translate widetag-of)
   (:policy :fast-safe)
   (:args (object :scs (descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) ndescr)
@@ -41,7 +41,7 @@
     (inst blbs object done)
 
     ;; Pick off fixnums.
-    (inst and object 3 result)
+    (inst and object fixnum-tag-mask result)
     (inst beq result done)
 
     ;; Must be an other immediate.
@@ -54,11 +54,11 @@
 
     OTHER-PTR
     (load-type result object (- other-pointer-lowtag))
-      
+
     DONE))
 
-(define-vop (function-subtype)
-  (:translate function-subtype)
+(define-vop (fun-subtype)
+  (:translate fun-subtype)
   (:policy :fast-safe)
   (:args (function :scs (descriptor-reg)))
   (:results (result :scs (unsigned-reg)))
@@ -66,11 +66,11 @@
   (:generator 6
     (load-type result function (- fun-pointer-lowtag))))
 
-(define-vop (set-function-subtype)
-  (:translate (setf function-subtype))
+(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 *)
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:results (result :scs (unsigned-reg)))
@@ -107,7 +107,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)
@@ -120,11 +120,11 @@
        (inst bis t1 t2 t1))
       (immediate
        (let ((c (ash (tn-value data) n-widetag-bits)))
-        (cond ((<= 0 c (1- (ash 1 8)))
-               (inst bis t1 c t1))
-              (t
-               (inst li c t2)
-               (inst bis t1 t2 t1)))))
+         (cond ((<= 0 c (1- (ash 1 8)))
+                (inst bis t1 c t1))
+               (t
+                (inst li c t2)
+                (inst bis t1 t2 t1)))))
       (zero))
     (storew t1 x 0 other-pointer-lowtag)
     (move x res)))
@@ -141,8 +141,8 @@
 
 (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
@@ -151,8 +151,8 @@
        (inst sll val n-widetag-bits temp)
        (inst bis temp (tn-value type) res))
       (t
-       (inst sra type 2 temp)
-       (inst sll val (- n-widetag-bits 2) res)
+       (inst sra type n-fixnum-tag-bits temp)
+       (inst sll val (- n-widetag-bits n-fixnum-tag-bits) res)
        (inst bis res temp res)))))
 
 \f
@@ -199,9 +199,9 @@
     (inst subq ndescr other-pointer-lowtag ndescr)
     (inst addq code ndescr sap)))
 
-(define-vop (compute-function)
+(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)
@@ -215,10 +215,10 @@
 \f
 ;;;; 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 gentrap pending-interrupt-trap)))
 
@@ -226,6 +226,10 @@
 (define-vop (halt)
   (:generator 1
     (inst gentrap halt-trap)))
+
+(define-vop (istream-memory-barrier)
+  (:generator 1
+    (inst imb)))
 \f
 ;;;; dynamic vop count collection support
 
@@ -235,7 +239,8 @@
   (:temporary (:scs (non-descriptor-reg)) count)
   (:generator 1
     (let ((offset
-          (- (* (+ index vector-data-offset) word-bytes) other-pointer-lowtag)))
+           (- (* (+ index vector-data-offset) n-word-bytes)
+              other-pointer-lowtag)))
       (inst ldl count offset count-vector)
       (inst addq count 1 count)
       (inst stl count offset count-vector))))