0.6.12.13:

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

diff --git a/src/compiler/x86/move.lisp b/src/compiler/x86/move.lisp
index 5c6cab4..0286e9a 100644 (file)
--- a/src/compiler/x86/move.lisp
+++ b/src/compiler/x86/move.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!VM")
 
-(file-comment
- "$Header$")
-
 (define-move-function (load-immediate 1) (vop x y)
   ((immediate)
    (any-reg descriptor-reg))
@@ -82,7 +79,7 @@
                 (inst xor y y)
               (inst mov y (fixnumize val))))
            (symbol
-            (inst mov y (+ *nil-value* (static-symbol-offset val))))
+            (inst mov y (+ nil-value (static-symbol-offset val))))
            (character
             (inst mov y (logior (ash (char-code val) type-bits)
                                 base-char-type)))))
@@ -135,7 +132,7 @@
                   (integer
                    (storew (fixnumize val) fp (tn-offset y)))
                   (symbol
-                   (storew (+ *nil-value* (static-symbol-offset val))
+                   (storew (+ nil-value (static-symbol-offset val))
                            fp (tn-offset y)))
                   (character
                    (storew (logior (ash (char-code val) type-bits)
@@ -146,7 +143,7 @@
                 (integer
                  (storew (fixnumize val) fp (- (1+ (tn-offset y)))))
                 (symbol
-                 (storew (+ *nil-value* (static-symbol-offset val))
+                 (storew (+ nil-value (static-symbol-offset val))
                          fp (- (1+ (tn-offset y)))))
                 (character
                  (storew (logior (ash (char-code val) type-bits)
@@ -283,7 +280,7 @@
   (:note "signed word to integer coercion")
   (:node-var node)
   (:generator 20
-     (assert (not (location= x y)))
+     (aver (not (location= x y)))
      (let ((bignum (gen-label))
           (done (gen-label)))
        (inst mov y x)
@@ -344,9 +341,9 @@
   (:node-var node)
   (:note "unsigned word to integer coercion")
   (:generator 20
-    (assert (not (location= x y)))
-    (assert (not (location= x alloc)))
-    (assert (not (location= y alloc)))
+    (aver (not (location= x y)))
+    (aver (not (location= x alloc)))
+    (aver (not (location= y alloc)))
     (let ((bignum (gen-label))
          (done (gen-label))
          (one-word-bignum (gen-label))