X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fpred.lisp;h=6babdd8a86a9a2db7155fc3635ad7d18123ce339;hb=8f4ef01b8c9930d7dd0a56a96845a6d84ca5774d;hp=975a9a2f8ddb1475ab589e1adc37b0f00079c97c;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/x86/pred.lisp b/src/compiler/x86/pred.lisp
index 975a9a2..6babdd8 100644
--- 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$")
 
 ;;;; 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)))