X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fmove.lisp;h=79e4bdb724950c48d73ee7a6c099094664b5fc6f;hb=986ce2596822cc0871b609346aaf592348aca596;hp=3367260c5bf08d80e616b0a6853bfd809b1e910f;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/compiler/alpha/move.lisp b/src/compiler/alpha/move.lisp
index 3367260..79e4bdb 100644
--- a/src/compiler/alpha/move.lisp
+++ b/src/compiler/alpha/move.lisp
@@ -23,7 +23,7 @@
       (symbol
        (load-symbol y val))
       (character
-       (inst li (logior (ash (char-code val) type-bits) base-char-type)
+       (inst li (logior (ash (char-code val) n-widetag-bits) base-char-widetag)
 	     y)))))
 
 (define-move-function (load-number 1) (vop x y)
@@ -41,7 +41,7 @@
 
 (define-move-function (load-constant 5) (vop x y)
   ((constant) (descriptor-reg any-reg))
-  (loadw y code-tn (tn-offset x) other-pointer-type))
+  (loadw y code-tn (tn-offset x) other-pointer-lowtag))
 
 (define-move-function (load-stack 5) (vop x y)
   ((control-stack) (any-reg descriptor-reg))
@@ -179,12 +179,12 @@
     (inst sra x 2 y)
     (inst beq temp done)
 
-    (loadw header x 0 other-pointer-type)
-    (inst srl header (1+ type-bits) header)
-    (loadw y x bignum-digits-offset other-pointer-type)
+    (loadw header x 0 other-pointer-lowtag)
+    (inst srl header (1+ n-widetag-bits) header)
+    (loadw y x bignum-digits-offset other-pointer-lowtag)
     (inst beq header one)
 
-    (loadw header x (1+ bignum-digits-offset) other-pointer-type)
+    (loadw header x (1+ bignum-digits-offset) other-pointer-lowtag)
     (inst sll header 32 header)
     (inst mskll y 4 y)
     (inst bis header y y)
@@ -232,15 +232,15 @@
     (inst cmoveq temp 1 header)
     (inst not temp temp)
     (inst cmoveq temp 1 header)
-    (inst sll header type-bits header)
-    (inst bis header bignum-type header)
+    (inst sll header n-widetag-bits header)
+    (inst bis header bignum-widetag header)
       
     (pseudo-atomic (:extra (pad-data-block (+ bignum-digits-offset 3)))
-      (inst bis alloc-tn other-pointer-type y)
-      (storew header y 0 other-pointer-type)
-      (storew x y bignum-digits-offset other-pointer-type)
+      (inst bis alloc-tn other-pointer-lowtag y)
+      (storew header y 0 other-pointer-lowtag)
+      (storew x y bignum-digits-offset other-pointer-lowtag)
       (inst srl x 32 temp)
-      (storew temp y (1+ bignum-digits-offset) other-pointer-type))
+      (storew temp y (1+ bignum-digits-offset) other-pointer-lowtag))
     DONE))
       
 ;;;
@@ -266,15 +266,15 @@
     (inst cmovge x 2 temp)
     (inst srl x 31 temp1)
     (inst cmoveq temp1 1 temp)
-    (inst sll temp type-bits temp)
-    (inst bis temp bignum-type temp)
+    (inst sll temp n-widetag-bits temp)
+    (inst bis temp bignum-widetag temp)
 
     (pseudo-atomic (:extra (pad-data-block (+ bignum-digits-offset 3)))
-      (inst bis alloc-tn other-pointer-type y)
-      (storew temp y 0 other-pointer-type)
-      (storew x y bignum-digits-offset other-pointer-type)
+      (inst bis alloc-tn other-pointer-lowtag y)
+      (storew temp y 0 other-pointer-lowtag)
+      (storew x y bignum-digits-offset other-pointer-lowtag)
       (inst srl x 32 temp)
-      (storew temp y (1+ bignum-digits-offset) other-pointer-type))
+      (storew temp y (1+ bignum-digits-offset) other-pointer-lowtag))
     DONE))
 
 ;;;