0.pre7.60:

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

diff --git a/src/compiler/alpha/debug.lisp b/src/compiler/alpha/debug.lisp
index 7c81a51..204cb77 100644 (file)
--- a/src/compiler/alpha/debug.lisp
+++ b/src/compiler/alpha/debug.lisp
@@ -49,7 +49,7 @@
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
   (:generator 4
-    (inst ldl result (* offset word-bytes) object)))
+    (inst ldl result (* offset n-word-bytes) object)))
 
 (define-vop (write-control-stack)
   (:translate %set-stack-ref)
@@ -76,7 +76,7 @@
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
   (:generator 1
-    (inst stl value (* offset word-bytes) sap)
+    (inst stl value (* offset n-word-bytes) sap)
     (move value result)))
 
 
@@ -90,11 +90,11 @@
     (let ((bogus (gen-label))
          (done (gen-label)))
       (loadw temp thing 0 lowtag)
-      (inst srl temp sb!vm:type-bits temp)
+      (inst srl temp sb!vm:n-widetag-bits temp)
       (inst beq temp bogus)
-      (inst sll temp (1- (integer-length sb!vm:word-bytes)) temp)
-      (unless (= lowtag sb!vm:other-pointer-type)
-       (inst subq temp (- sb!vm:other-pointer-type lowtag) temp))
+      (inst sll temp (1- (integer-length sb!vm:n-word-bytes)) temp)
+      (unless (= lowtag sb!vm:other-pointer-lowtag)
+       (inst subq temp (- sb!vm:other-pointer-lowtag lowtag) temp))
       (inst subq thing temp code)
       (emit-label done)
       (assemble (*elsewhere*)
@@ -104,11 +104,11 @@
 
 (define-vop (code-from-lra code-from-mumble)
   (:translate lra-code-header)
-  (:variant sb!vm:other-pointer-type))
+  (:variant sb!vm:other-pointer-lowtag))
 
 (define-vop (code-from-function code-from-mumble)
-  (:translate function-code-header)
-  (:variant sb!vm:function-pointer-type))
+  (:translate fun-code-header)
+  (:variant sb!vm:fun-pointer-lowtag))
 
 (define-vop (make-lisp-obj)
   (:policy :fast-safe)
@@ -128,15 +128,15 @@
   (:generator 1
     (move thing result)))
 
-(define-vop (function-word-offset)
+(define-vop (fun-word-offset)
   (:policy :fast-safe)
-  (:translate function-word-offset)
+  (:translate fun-word-offset)
   (:args (fun :scs (descriptor-reg)))
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 5
-    (loadw res fun 0 function-pointer-type)
-    (inst srl res sb!vm:type-bits res)))
+    (loadw res fun 0 fun-pointer-lowtag)
+    (inst srl res sb!vm:n-widetag-bits res)))
 
 (defknown make-number-stack-pointer ((unsigned-byte 32)) system-area-pointer
   (movable foldable flushable))