X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fsystem.lisp;h=a57b8b23b3546ab4cd8f6d3cc8aa7d5326f25345;hb=b63c4fb9b98fa8188e17ba926e150ba417a74635;hp=e87277a3aff61ccc221bfc8cd88c3c0fe440cb67;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/compiler/alpha/system.lisp b/src/compiler/alpha/system.lisp
index e87277a..a57b8b2 100644
--- a/src/compiler/alpha/system.lisp
+++ b/src/compiler/alpha/system.lisp
@@ -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.
@@ -57,8 +57,8 @@
       
     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,8 +66,8 @@
   (: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)))
@@ -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)))))
 
 
@@ -199,7 +199,7 @@
     (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)))
   (:arg-types * positive-fixnum)
@@ -215,10 +215,10 @@
 
 ;;;; 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)))
 
 ;;;; dynamic vop count collection support