X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fsystem.lisp;h=5ee4202978baa9dff86db08bd2fa535248c98c81;hb=f9ef8b045b60ae064c7bd40af599b46707ea4d8a;hp=6b8e0830eda451f8d0fdf9d3f39dc68f4ec3d4cd;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git

diff --git a/src/compiler/alpha/system.lisp b/src/compiler/alpha/system.lisp
index 6b8e083..5ee4202 100644
--- a/src/compiler/alpha/system.lisp
+++ b/src/compiler/alpha/system.lisp
@@ -13,8 +13,8 @@
 
 ;;;; 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)
@@ -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)))
@@ -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
 
@@ -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))))