X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Falloc.lisp;h=4286c2e11440f108a3dcd9733cd5ffed40022138;hb=bc46c8bcdd6ac8918df8ea9e9db49808e4924fcf;hp=10e5150502602e641e92f51f36f71ca959387d21;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git

diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp
index 10e5150..4286c2e 100644
--- a/src/compiler/x86/alloc.lisp
+++ b/src/compiler/x86/alloc.lisp
@@ -30,14 +30,14 @@
 	   (move result (tn-ref-tn things)))
 	  (t
 	   (macrolet
-	       ((store-car (tn list &optional (slot sb!vm:cons-car-slot))
+	       ((store-car (tn list &optional (slot cons-car-slot))
 		  `(let ((reg
 			  (sc-case ,tn
 			    ((any-reg descriptor-reg) ,tn)
 			    ((control-stack)
 			     (move temp ,tn)
 			     temp))))
-		     (storew reg ,list ,slot sb!vm:list-pointer-lowtag))))
+		     (storew reg ,list ,slot list-pointer-lowtag))))
 	     (let ((cons-cells (if star (1- num) num)))
 	       (pseudo-atomic
 		(allocation res (* (pad-data-block cons-size) cons-cells) node)
@@ -98,13 +98,13 @@
      ;;   -- WHN 19990916
      ;;
      ;; FIXME: should have a check for overflow of static space
-     (load-symbol-value temp sb!vm:*static-space-free-pointer*)
+     (load-symbol-value temp *static-space-free-pointer*)
      (inst lea result (make-ea :byte :base temp :disp other-pointer-lowtag))
      (inst add temp boxed)
      (inst add temp unboxed)
-     (store-symbol-value temp sb!vm:*static-space-free-pointer*)
-     (inst shl boxed (- type-bits word-shift))
-     (inst or boxed code-header-type)
+     (store-symbol-value temp *static-space-free-pointer*)
+     (inst shl boxed (- n-widetag-bits word-shift))
+     (inst or boxed code-header-widetag)
      (storew boxed result 0 other-pointer-lowtag)
      (storew unboxed result code-code-size-slot other-pointer-lowtag)
      (inst mov temp nil-value)
@@ -131,8 +131,8 @@
     (pseudo-atomic
      (allocation result result node)
      (inst lea result (make-ea :byte :base result :disp other-pointer-lowtag))
-     (inst shl boxed (- type-bits word-shift))
-     (inst or boxed code-header-type)
+     (inst shl boxed (- n-widetag-bits word-shift))
+     (inst or boxed code-header-widetag)
      (storew boxed result 0 other-pointer-lowtag)
      (storew unboxed result code-code-size-slot other-pointer-lowtag)
      (storew nil-value result code-entry-points-slot other-pointer-lowtag))
@@ -145,7 +145,7 @@
   (:results (result :scs (descriptor-reg) :from :argument))
   (:node-var node)
   (:generator 37
-    (with-fixed-allocation (result fdefn-type fdefn-size node)
+    (with-fixed-allocation (result fdefn-widetag fdefn-size node)
       (storew name result fdefn-name-slot other-pointer-lowtag)
       (storew nil-value result fdefn-fun-slot other-pointer-lowtag)
       (storew (make-fixup (extern-alien-name "undefined_tramp") :foreign)
@@ -163,7 +163,7 @@
       (allocation result (pad-data-block size) node)
       (inst lea result
 	    (make-ea :byte :base result :disp fun-pointer-lowtag))
-      (storew (logior (ash (1- size) type-bits) closure-header-type)
+      (storew (logior (ash (1- size) n-widetag-bits) closure-header-widetag)
 	      result 0 fun-pointer-lowtag))
     (loadw temp function closure-fun-slot fun-pointer-lowtag)
     (storew temp result closure-fun-slot fun-pointer-lowtag))))
@@ -175,7 +175,7 @@
   (:node-var node)
   (:generator 10
     (with-fixed-allocation
-	(result value-cell-header-type value-cell-size node))
+	(result value-cell-header-widetag value-cell-size node))
     (storew value result value-cell-value-slot other-pointer-lowtag)))
 
 ;;;; automatic allocators for primitive objects
@@ -184,7 +184,7 @@
   (:args)
   (:results (result :scs (any-reg)))
   (:generator 1
-    (inst mov result unbound-marker-type)))
+    (inst mov result unbound-marker-widetag)))
 
 (define-vop (fixed-alloc)
   (:args)
@@ -197,7 +197,10 @@
      (allocation result (pad-data-block words) node)
      (inst lea result (make-ea :byte :base result :disp lowtag))
      (when type
-       (storew (logior (ash (1- words) type-bits) type) result 0 lowtag)))))
+       (storew (logior (ash (1- words) n-widetag-bits) type)
+	       result
+	       0
+	       lowtag)))))
 
 (define-vop (var-alloc)
   (:args (extra :scs (any-reg)))
@@ -210,12 +213,11 @@
   (:node-var node)
   (:generator 50
     (inst lea bytes
-	  (make-ea :dword :base extra :disp (* (1+ words) word-bytes)))
+	  (make-ea :dword :base extra :disp (* (1+ words) n-word-bytes)))
     (inst mov header bytes)
-    (inst shl header (- type-bits 2))	; w+1 to length field
-
+    (inst shl header (- n-widetag-bits 2)) ; w+1 to length field
     (inst lea header			; (w-1 << 8) | type
-	  (make-ea :dword :base header :disp (+ (ash -2 type-bits) type)))
+	  (make-ea :dword :base header :disp (+ (ash -2 n-widetag-bits) type)))
     (inst and bytes (lognot lowtag-mask))
     (pseudo-atomic
      (allocation result bytes node)
@@ -230,9 +232,12 @@
   (:results (result :scs (descriptor-reg) :from :argument))
   (:node-var node)
   (:generator 37
-    (with-fixed-allocation (result symbol-header-type symbol-size node)
+    (with-fixed-allocation (result symbol-header-widetag symbol-size node)
       (storew name result symbol-name-slot other-pointer-lowtag)
-      (storew unbound-marker-type result symbol-value-slot other-pointer-lowtag)
+      (storew unbound-marker-widetag
+	      result
+	      symbol-value-slot
+	      other-pointer-lowtag)
       ;; Set up a random hash value for the symbol. Perhaps the object
       ;; address could be used for even faster and smaller code!
       ;; FIXME: We don't mind the symbol hash not being repeatable, so