X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=a4989d550fd34974f4750bbf522baf59681de5c5;hb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;hp=f0a666012a3a2936206a489e507490f644f30b7a;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index f0a6660..a4989d5 100644
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -19,18 +19,18 @@
   (cdr :ref-trans cdr :set-trans sb!c::%rplacd :init :arg))
 
 (define-primitive-object (instance :lowtag instance-pointer-lowtag
-				   :header instance-header-type
+				   :header instance-header-widetag
 				   :alloc-trans %make-instance)
   (slots :rest-p t))
 
 (define-primitive-object (bignum :lowtag other-pointer-lowtag
-				 :header bignum-type
+				 :header bignum-widetag
 				 :alloc-trans sb!bignum::%allocate-bignum)
   (digits :rest-p t :c-type #!-alpha "long" #!+alpha "u32"))
 
 (define-primitive-object (ratio :type ratio
 				:lowtag other-pointer-lowtag
-				:header ratio-type
+				:header ratio-widetag
 				:alloc-trans %make-ratio)
   (numerator :type integer
 	     :ref-known (flushable movable)
@@ -42,23 +42,23 @@
 	       :init :arg))
 
 (define-primitive-object (single-float :lowtag other-pointer-lowtag
-				       :header single-float-type)
+				       :header single-float-widetag)
   (value :c-type "float"))
 
 (define-primitive-object (double-float :lowtag other-pointer-lowtag
-				       :header double-float-type)
+				       :header double-float-widetag)
   (filler)
   (value :c-type "double" :length 2))
 
 #!+long-float
 (define-primitive-object (long-float :lowtag other-pointer-lowtag
-				     :header long-float-type)
+				     :header long-float-widetag)
   #!+sparc (filler)
   (value :c-type "long double" :length #!+x86 3 #!+sparc 4))
 
 (define-primitive-object (complex :type complex
 				  :lowtag other-pointer-lowtag
-				  :header complex-type
+				  :header complex-widetag
 				  :alloc-trans %make-complex)
   (real :type real
 	:ref-known (flushable movable)
@@ -131,7 +131,7 @@
 
 (define-primitive-object (fdefn :type fdefn
 				:lowtag other-pointer-lowtag
-				:header fdefn-type)
+				:header fdefn-widetag)
   (name :ref-trans fdefn-name)
   (fun :type (or function null) :ref-trans fdefn-fun)
   (raw-addr :c-type #!-alpha "char *" #!+alpha "u32"))
@@ -140,7 +140,7 @@
 ;;; which are also subtypes of Common Lisp's FUNCTION type)
 (define-primitive-object (simple-fun :type function
 				     :lowtag fun-pointer-lowtag
-				     :header simple-fun-header-type)
+				     :header simple-fun-header-widetag)
   #!-x86 (self :ref-trans %simple-fun-self
 	       :set-trans (setf %simple-fun-self))
   #!+x86 (self
@@ -182,13 +182,13 @@
   (return-point :c-type "unsigned char" :rest-p t))
 
 (define-primitive-object (closure :lowtag fun-pointer-lowtag
-				  :header closure-header-type)
+				  :header closure-header-widetag)
   (fun :init :arg :ref-trans %closure-fun)
   (info :rest-p t))
 
 (define-primitive-object (funcallable-instance
 			  :lowtag fun-pointer-lowtag
-			  :header funcallable-instance-header-type
+			  :header funcallable-instance-header-widetag
 			  :alloc-trans %make-funcallable-instance)
   #!-x86
   (fun
@@ -219,7 +219,7 @@
   (info :rest-p t))
 
 (define-primitive-object (value-cell :lowtag other-pointer-lowtag
-				     :header value-cell-header-type
+				     :header value-cell-header-widetag
 				     :alloc-trans make-value-cell)
   (value :set-trans value-cell-set
 	 :set-known (unsafe)
@@ -229,19 +229,19 @@
 
 #!+alpha
 (define-primitive-object (sap :lowtag other-pointer-lowtag
-			      :header sap-type)
+			      :header sap-widetag)
   (padding)
   (pointer :c-type "char *" :length 2))
 
 #!-alpha
 (define-primitive-object (sap :lowtag other-pointer-lowtag
-			      :header sap-type)
+			      :header sap-widetag)
   (pointer :c-type "char *"))
 
 
 (define-primitive-object (weak-pointer :type weak-pointer
 				       :lowtag other-pointer-lowtag
-				       :header weak-pointer-type
+				       :header weak-pointer-widetag
 				       :alloc-trans make-weak-pointer)
   (value :ref-trans sb!c::%weak-pointer-value :ref-known (flushable)
 	 :init :arg)
@@ -282,7 +282,7 @@
   (flushable movable))
 
 (define-primitive-object (symbol :lowtag other-pointer-lowtag
-				 :header symbol-header-type
+				 :header symbol-header-widetag
 				 #!-x86 :alloc-trans #!-x86 make-symbol)
   (value :set-trans %set-symbol-value
 	 :init :unbound)
@@ -297,13 +297,13 @@
 
 (define-primitive-object (complex-single-float
 			  :lowtag other-pointer-lowtag
-			  :header complex-single-float-type)
+			  :header complex-single-float-widetag)
   (real :c-type "float")
   (imag :c-type "float"))
 
 (define-primitive-object (complex-double-float
 			  :lowtag other-pointer-lowtag
-			  :header complex-double-float-type)
+			  :header complex-double-float-widetag)
   (filler)
   (real :c-type "double" :length 2)
   (imag :c-type "double" :length 2))
@@ -311,7 +311,7 @@
 #!+long-float
 (define-primitive-object (complex-long-float
 			  :lowtag other-pointer-lowtag
-			  :header complex-long-float-type)
+			  :header complex-long-float-widetag)
   #!+sparc (filler)
   (real :c-type "long double" :length #!+x86 3 #!+sparc 4)
   (imag :c-type "long double" :length #!+x86 3 #!+sparc 4))