0.pre7.137:

[sbcl.git] / src / compiler / x86 / pred.lisp

diff --git a/src/compiler/x86/pred.lisp b/src/compiler/x86/pred.lisp
index 975a9a2..6babdd8 100644 (file)
--- a/src/compiler/x86/pred.lisp
+++ b/src/compiler/x86/pred.lisp
@@ -10,9 +10,6 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
-(file-comment
- "$Header$")
 \f
 ;;;; the branch VOP
 
@@ -50,10 +47,10 @@
               (inst test x x) ; smaller
             (inst cmp x (fixnumize val))))
          (symbol
-          (inst cmp x (+ *nil-value* (static-symbol-offset val))))
+          (inst cmp x (+ nil-value (static-symbol-offset val))))
          (character
-          (inst cmp x (logior (ash (char-code val) type-bits)
-                              base-char-type))))))
+          (inst cmp x (logior (ash (char-code val) n-widetag-bits)
+                              base-char-widetag))))))
      ((sc-is x immediate) ; and y not immediate
       ;; Swap the order to fit the compare instruction.
       (let ((val (tn-value x)))
@@ -63,10 +60,10 @@
               (inst test y y) ; smaller
             (inst cmp y (fixnumize val))))
          (symbol
-          (inst cmp y (+ *nil-value* (static-symbol-offset val))))
+          (inst cmp y (+ nil-value (static-symbol-offset val))))
          (character
-          (inst cmp y (logior (ash (char-code val) type-bits)
-                              base-char-type))))))
+          (inst cmp y (logior (ash (char-code val) n-widetag-bits)
+                              base-char-widetag))))))
       (t
        (inst cmp x y)))