UPGRADED-ARRAY-ELEMENT-TYPE: more thoroughly signal errors on unknown types.

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

diff --git a/src/compiler/alpha/debug.lisp b/src/compiler/alpha/debug.lisp
index 8e9df70..800bfa1 100644 (file)
--- a/src/compiler/alpha/debug.lisp
+++ b/src/compiler/alpha/debug.lisp
@@ -31,7 +31,7 @@
   (:translate stack-ref)
   (:policy :fast-safe)
   (:args (object :scs (sap-reg) :target sap)
-        (offset :scs (any-reg)))
+         (offset :scs (any-reg)))
   (:arg-types system-area-pointer positive-fixnum)
   (:temporary (:scs (sap-reg) :from :eval) sap)
   (:results (result :scs (descriptor-reg)))
@@ -49,14 +49,14 @@
   (: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)
   (:policy :fast-safe)
   (:args (object :scs (sap-reg) :target sap)
-        (offset :scs (any-reg))
-        (value :scs (descriptor-reg) :target result))
+         (offset :scs (any-reg))
+         (value :scs (descriptor-reg) :target result))
   (:arg-types system-area-pointer positive-fixnum *)
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
@@ -70,13 +70,13 @@
   (:translate %set-stack-ref)
   (:policy :fast-safe)
   (:args (sap :scs (sap-reg))
-        (value :scs (descriptor-reg) :target result))
+         (value :scs (descriptor-reg) :target result))
   (:info offset)
   (:arg-types system-area-pointer (:constant (signed-byte 14)) *)
   (: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)))
 
 
@@ -88,31 +88,31 @@
   (:variant-vars lowtag)
   (:generator 5
     (let ((bogus (gen-label))
-         (done (gen-label)))
+          (done (gen-label)))
       (loadw temp thing 0 lowtag)
-      (inst srl temp sb!vm:type-bits temp)
+      (inst srl temp 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 n-word-bytes)) temp)
+      (unless (= lowtag other-pointer-lowtag)
+        (inst subq temp (- other-pointer-lowtag lowtag) temp))
       (inst subq thing temp code)
       (emit-label done)
       (assemble (*elsewhere*)
-       (emit-label bogus)
-       (move null-tn code)
-       (inst br zero-tn done)))))
+        (emit-label bogus)
+        (move null-tn code)
+        (inst br zero-tn done)))))
 
 (define-vop (code-from-lra code-from-mumble)
   (:translate lra-code-header)
-  (:variant sb!vm:other-pointer-type))
+  (:variant other-pointer-lowtag))
 
 (define-vop (code-from-function code-from-mumble)
   (:translate fun-code-header)
-  (:variant sb!vm:fun-pointer-type))
+  (:variant fun-pointer-lowtag))
 
-(define-vop (make-lisp-obj)
+(define-vop (%make-lisp-obj)
   (:policy :fast-safe)
-  (:translate make-lisp-obj)
+  (:translate %make-lisp-obj)
   (:args (value :scs (unsigned-reg) :target result))
   (:arg-types unsigned-num)
   (:results (result :scs (descriptor-reg)))
@@ -135,8 +135,8 @@
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 5
-    (loadw res fun 0 fun-pointer-type)
-    (inst srl res sb!vm:type-bits res)))
+    (loadw res fun 0 fun-pointer-lowtag)
+    (inst srl res n-widetag-bits res)))
 
 (defknown make-number-stack-pointer ((unsigned-byte 32)) system-area-pointer
   (movable foldable flushable))