X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Falloc.lisp;h=34a099ca8273ff49d718fe862dbc6522d149f9e6;hb=5251267b300cb967cbf547e838037a616064bd58;hp=8e01287b80b8c632836fb862300c916d66335e5b;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp
index 8e01287..34a099c 100644
--- a/src/compiler/x86/alloc.lisp
+++ b/src/compiler/x86/alloc.lisp
@@ -10,9 +10,6 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
-(file-comment
- "$Header$")
 
 ;;;; LIST and LIST*
 
@@ -27,8 +24,8 @@
   (:node-var node)
   (:generator 0
     (cond ((zerop num)
-	   ;; (move result *nil-value*)
-	   (inst mov result *nil-value*))
+	   ;; (move result nil-value)
+	   (inst mov result nil-value))
 	  ((and star (= num 1))
 	   (move result (tn-ref-tn things)))
 	  (t
@@ -58,9 +55,9 @@
 		       (setf things (tn-ref-across things))
 		       (store-car (tn-ref-tn things) ptr cons-cdr-slot))
 		      (t
-		       (storew *nil-value* ptr cons-cdr-slot
+		       (storew nil-value ptr cons-cdr-slot
 			       list-pointer-type)))
-		(assert (null (tn-ref-across things)))))
+		(aver (null (tn-ref-across things)))))
 	     (move result res))))))
 
 (define-vop (list list-or-list*)
@@ -101,16 +98,16 @@
      ;;   -- WHN 19990916
      ;;
      ;; FIXME: should have a check for overflow of static space
-     (load-symbol-value temp sb!impl::*static-space-free-pointer*)
+     (load-symbol-value temp sb!vm:*static-space-free-pointer*)
      (inst lea result (make-ea :byte :base temp :disp other-pointer-type))
      (inst add temp boxed)
      (inst add temp unboxed)
-     (store-symbol-value temp sb!impl::*static-space-free-pointer*)
+     (store-symbol-value temp sb!vm:*static-space-free-pointer*)
      (inst shl boxed (- type-bits word-shift))
      (inst or boxed code-header-type)
      (storew boxed result 0 other-pointer-type)
      (storew unboxed result code-code-size-slot other-pointer-type)
-     (inst mov temp *nil-value*)
+     (inst mov temp nil-value)
      (storew temp result code-entry-points-slot other-pointer-type))
     (storew temp result code-debug-info-slot other-pointer-type)))
 
@@ -138,8 +135,8 @@
      (inst or boxed code-header-type)
      (storew boxed result 0 other-pointer-type)
      (storew unboxed result code-code-size-slot other-pointer-type)
-     (storew *nil-value* result code-entry-points-slot other-pointer-type))
-    (storew *nil-value* result code-debug-info-slot other-pointer-type)))
+     (storew nil-value result code-entry-points-slot other-pointer-type))
+    (storew nil-value result code-debug-info-slot other-pointer-type)))
 
 (define-vop (make-fdefn)
   (:policy :fast-safe)
@@ -150,7 +147,7 @@
   (:generator 37
     (with-fixed-allocation (result fdefn-type fdefn-size node)
       (storew name result fdefn-name-slot other-pointer-type)
-      (storew *nil-value* result fdefn-function-slot other-pointer-type)
+      (storew nil-value result fdefn-function-slot other-pointer-type)
       (storew (make-fixup (extern-alien-name "undefined_tramp") :foreign)
 	      result fdefn-raw-addr-slot other-pointer-type))))
 
@@ -251,5 +248,5 @@
       (inst shr temp 1)
       (inst and temp #xfffffffc)
       (storew temp result symbol-hash-slot other-pointer-type)
-      (storew *nil-value* result symbol-plist-slot other-pointer-type)
-      (storew *nil-value* result symbol-package-slot other-pointer-type))))
+      (storew nil-value result symbol-plist-slot other-pointer-type)
+      (storew nil-value result symbol-package-slot other-pointer-type))))