X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Falloc.lisp;h=99d3297756b3ce2e49cbac7a3f04789154d30016;hb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;hp=af42bcbc4556449f9e06333af215c8bcf5c81e37;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/compiler/alpha/alloc.lisp b/src/compiler/alpha/alloc.lisp
index af42bcb..99d3297 100644
--- a/src/compiler/alpha/alloc.lisp
+++ b/src/compiler/alpha/alloc.lisp
@@ -39,11 +39,11 @@
 			    (control-stack
 			     (load-stack-tn temp ,tn)
 			     temp))))
-		     (storew reg ,list ,slot list-pointer-type))))
+		     (storew reg ,list ,slot list-pointer-lowtag))))
 	     (let ((cons-cells (if star (1- num) num)))
 	       (pseudo-atomic (:extra (* (pad-data-block cons-size)
 					 cons-cells))
-		 (inst bis alloc-tn list-pointer-type res)
+		 (inst bis alloc-tn list-pointer-lowtag res)
 		 (move res ptr)
 		 (dotimes (i (1- cons-cells))
 		   (store-car (tn-ref-tn things) ptr)
@@ -51,14 +51,14 @@
 		   (inst lda ptr (pad-data-block cons-size) ptr)
 		   (storew ptr ptr
 			   (- cons-cdr-slot cons-size)
-			   list-pointer-type))
+			   list-pointer-lowtag))
 		 (store-car (tn-ref-tn things) ptr)
 		 (cond (star
 			(setf things (tn-ref-across things))
 			(store-car (tn-ref-tn things) ptr cons-cdr-slot))
 		       (t
 			(storew null-tn ptr
-				cons-cdr-slot list-pointer-type)))
+				cons-cdr-slot list-pointer-lowtag)))
 		 (assert (null (tn-ref-across things)))
 		 (move res result))))))))
 
@@ -85,18 +85,18 @@
     (inst srl unboxed-arg word-shift unboxed)
     (inst lda unboxed lowtag-mask unboxed)
     (inst and unboxed ndescr unboxed)
-    (inst sll boxed (- type-bits word-shift) ndescr)
-    (inst bis ndescr code-header-type ndescr)
+    (inst sll boxed (- n-widetag-bits word-shift) ndescr)
+    (inst bis ndescr code-header-widetag ndescr)
     
     (pseudo-atomic ()
-      (inst bis alloc-tn other-pointer-type result)
-      (storew ndescr result 0 other-pointer-type)
-      (storew unboxed result code-code-size-slot other-pointer-type)
-      (storew null-tn result code-entry-points-slot other-pointer-type)
+      (inst bis alloc-tn other-pointer-lowtag result)
+      (storew ndescr result 0 other-pointer-lowtag)
+      (storew unboxed result code-code-size-slot other-pointer-lowtag)
+      (storew null-tn result code-entry-points-slot other-pointer-lowtag)
       (inst addq alloc-tn boxed alloc-tn)
       (inst addq alloc-tn unboxed alloc-tn))
 
-    (storew null-tn result code-debug-info-slot other-pointer-type)))
+    (storew null-tn result code-debug-info-slot other-pointer-lowtag)))
 
 (define-vop (make-fdefn)
   (:policy :fast-safe)
@@ -105,11 +105,11 @@
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:results (result :scs (descriptor-reg) :from :argument))
   (:generator 37
-    (with-fixed-allocation (result temp fdefn-type fdefn-size)
-      (storew name result fdefn-name-slot other-pointer-type)
-      (storew null-tn result fdefn-function-slot other-pointer-type)
+    (with-fixed-allocation (result temp fdefn-widetag fdefn-size)
+      (storew name result fdefn-name-slot other-pointer-lowtag)
+      (storew null-tn result fdefn-fun-slot other-pointer-lowtag)
       (inst li (make-fixup "undefined_tramp" :foreign) temp)
-      (storew temp result fdefn-raw-addr-slot other-pointer-type))))
+      (storew temp result fdefn-raw-addr-slot other-pointer-lowtag))))
 
 (define-vop (make-closure)
   (:args (function :to :save :scs (descriptor-reg)))
@@ -118,11 +118,13 @@
   (:results (result :scs (descriptor-reg)))
   (:generator 10
     (let ((size (+ length closure-info-offset)))
-      (inst li (logior (ash (1- size) type-bits) closure-header-type) temp)
+      (inst li
+	    (logior (ash (1- size) n-widetag-bits) closure-header-widetag)
+	    temp)
       (pseudo-atomic (:extra (pad-data-block size))
-	(inst bis alloc-tn function-pointer-type result)
-	(storew temp result 0 function-pointer-type))
-      (storew function result closure-function-slot function-pointer-type))))
+	(inst bis alloc-tn fun-pointer-lowtag result)
+	(storew temp result 0 fun-pointer-lowtag))
+      (storew function result closure-fun-slot fun-pointer-lowtag))))
 
 ;;; The compiler likes to be able to directly make value cells.
 ;;; 
@@ -132,8 +134,8 @@
   (:results (result :scs (descriptor-reg)))
   (:generator 10
     (with-fixed-allocation
-	(result temp value-cell-header-type value-cell-size))
-    (storew value result value-cell-value-slot other-pointer-type)))
+	(result temp value-cell-header-widetag value-cell-size))
+    (storew value result value-cell-value-slot other-pointer-lowtag)))
 
 
 ;;;; automatic allocators for primitive objects
@@ -142,7 +144,7 @@
   (:args)
   (:results (result :scs (any-reg)))
   (:generator 1
-    (inst li unbound-marker-type result)))
+    (inst li unbound-marker-widetag result)))
 
 (define-vop (fixed-alloc)
   (:args)
@@ -154,7 +156,7 @@
     (pseudo-atomic (:extra (pad-data-block words))
       (inst bis alloc-tn lowtag result)
       (when type
-	(inst li (logior (ash (1- words) type-bits) type) temp)
+	(inst li (logior (ash (1- words) n-widetag-bits) type) temp)
 	(storew temp result 0 lowtag)))))
 
 (define-vop (var-alloc)
@@ -167,10 +169,10 @@
   (:temporary (:scs (non-descriptor-reg)) bytes)
   (:generator 6
     (inst lda bytes (* (1+ words) word-bytes) extra)
-    (inst sll bytes (- type-bits 2) header)
-    (inst lda header (+ (ash -2 type-bits) type) header)
-    (inst srl bytes lowtag-bits bytes)
-    (inst sll bytes lowtag-bits bytes)
+    (inst sll bytes (- n-widetag-bits 2) header)
+    (inst lda header (+ (ash -2 n-widetag-bits) type) header)
+    (inst srl bytes n-lowtag-bits bytes)
+    (inst sll bytes n-lowtag-bits bytes)
     (pseudo-atomic ()
       (inst bis alloc-tn lowtag result)
       (storew header result 0 lowtag)