0.7.5.7:

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

diff --git a/src/compiler/alpha/values.lisp b/src/compiler/alpha/values.lisp
index 6e5043e..1c77585 100644 (file)
--- a/src/compiler/alpha/values.lisp
+++ b/src/compiler/alpha/values.lisp
@@ -39,7 +39,7 @@
              start-temp)
   (:generator 20
     (move csp-tn start-temp)
-    (inst lda csp-tn (* nvals word-bytes) csp-tn)
+    (inst lda csp-tn (* nvals n-word-bytes) csp-tn)
     (do ((val vals (tn-ref-across val))
         (i 0 (1+ i)))
        ((null val))
@@ -73,14 +73,14 @@
     LOOP
     (inst cmpeq list null-tn temp)
     (inst bne temp done)
-    (loadw temp list cons-car-slot list-pointer-type)
-    (loadw list list cons-cdr-slot list-pointer-type)
-    (inst lda csp-tn word-bytes csp-tn)
+    (loadw temp list cons-car-slot list-pointer-lowtag)
+    (loadw list list cons-cdr-slot list-pointer-lowtag)
+    (inst lda csp-tn n-word-bytes csp-tn)
     (storew temp csp-tn -1)
     (inst and list lowtag-mask ndescr)
-    (inst xor ndescr list-pointer-type ndescr)
+    (inst xor ndescr list-pointer-lowtag ndescr)
     (inst beq ndescr loop)
-    (error-call vop bogus-argument-to-values-list-error list)
+    (error-call vop bogus-arg-to-values-list-error list)
     
     DONE
     (inst subq csp-tn start count)))
@@ -103,7 +103,7 @@
       (zero
        (move context src))
       (immediate
-       (inst lda src (* (tn-value skip) word-bytes) context))
+       (inst lda src (* (tn-value skip) n-word-bytes) context))
       (any-reg
        (inst addq context skip src)))
     (move num count)