X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fchar.lisp;h=c4788f1ddcec23e71abf05f3c9e7b7ddb52c6729;hb=53f4147704fbe48c03dd73d7b6a9f92c0a066ed8;hp=5318c40d5f4acc2b149214144bbb91569a79eb83;hpb=b7a8f5313a83dea33ce60551a4fb987b415c2cc6;p=sbcl.git

diff --git a/src/compiler/alpha/char.lisp b/src/compiler/alpha/char.lisp
index 5318c40..c4788f1 100644
--- a/src/compiler/alpha/char.lisp
+++ b/src/compiler/alpha/char.lisp
@@ -18,7 +18,7 @@
   (:args (x :scs (any-reg descriptor-reg)))
   (:results (y :scs (base-char-reg)))
   (:generator 1
-    (inst srl x sb!vm:n-widetag-bits y)))
+    (inst srl x n-widetag-bits y)))
 ;;;
 (define-move-vop move-to-base-char :move
   (any-reg descriptor-reg) (base-char-reg))
@@ -28,8 +28,8 @@
   (:args (x :scs (base-char-reg)))
   (:results (y :scs (any-reg descriptor-reg)))
   (:generator 1
-    (inst sll x sb!vm:n-widetag-bits y)
-    (inst bis y sb!vm:base-char-widetag y)))
+    (inst sll x n-widetag-bits y)
+    (inst bis y base-char-widetag y)))
 ;;;
 (define-move-vop move-from-base-char :move
   (base-char-reg) (any-reg descriptor-reg))
@@ -83,7 +83,7 @@
   (:results (res :scs (any-reg)))
   (:result-types positive-fixnum)
   (:generator 1
-    (inst sll ch 2 res)))
+    (inst sll ch n-fixnum-tag-bits res)))
 
 (define-vop (code-char)
   (:translate code-char)
@@ -93,7 +93,7 @@
   (:results (res :scs (base-char-reg)))
   (:result-types base-char)
   (:generator 1
-    (inst srl code 2 res)))
+    (inst srl code n-fixnum-tag-bits res)))
 
 ;;;; comparison of BASE-CHARs