X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=0659a28110cb48e3934faa3d230f5f67b7ea82fd;hb=771b864c8f32af7734bc0550aeaf1539fc4df194;hp=85a0b4be93e09e66e533dca5c040f160ab58fcd5;hpb=1419c1d2d50f039be46a8667351b7738ac4965e4;p=sbcl.git

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index 85a0b4b..0659a28 100644
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -96,6 +96,8 @@
 
 (define-primitive-object (array :lowtag other-pointer-lowtag
 				:widetag t)
+  ;; FILL-POINTER of an ARRAY is in the same place as LENGTH of a
+  ;; VECTOR -- see SHRINK-VECTOR.
   (fill-pointer :type index
 		:ref-trans %array-fill-pointer
 		:ref-known (flushable foldable)
@@ -131,6 +133,8 @@
 (define-primitive-object (vector :type vector
 				 :lowtag other-pointer-lowtag
 				 :widetag t)
+  ;; FILL-POINTER of an ARRAY is in the same place as LENGTH of a
+  ;; VECTOR -- see SHRINK-VECTOR.
   (length :ref-trans sb!c::vector-length
 	  :type index)
   (data :rest-p t :c-type #!-alpha "unsigned long" #!+alpha "u32"))
@@ -309,13 +313,9 @@
 
 ;;;; symbols
 
-#!+x86
-(defknown symbol-hash (symbol) (integer 0 #.sb!xc:most-positive-fixnum)
-  (flushable movable))
-
 (define-primitive-object (symbol :lowtag other-pointer-lowtag
 				 :widetag symbol-header-widetag
-				 #!-x86 :alloc-trans #!-x86 make-symbol)
+				 :alloc-trans make-symbol)
 
   ;; Beware when changing this definition.  NIL-the-symbol is defined
   ;; using this layout, and NIL-the-end-of-list-marker is the cons 
@@ -323,12 +323,14 @@
   ;; (conses have no header).  Careful selection of lowtags ensures
   ;; that the same pointer can be used for both purposes:
   ;; OTHER-POINTER-LOWTAG is 7, LIST-POINTER-LOWTAG is 3, so if you
-  ;; subtract 3 from (sb-kernel:get-lisp-obj-address 'NIL) you get the
+  ;; subtract 3 from (SB-KERNEL:GET-LISP-OBJ-ADDRESS 'NIL) you get the
   ;; first data slot, and if you subtract 7 you get a symbol header.
 
-  (value #!-sb-thread :set-trans #!-sb-thread %set-symbol-value
-	 :init :unbound)		;also the CAR of NIL-as-end-of-list
-  (hash)				;the CDR of NIL-as-end-of-list
+  ;; also the CAR of NIL-as-end-of-list
+  (value :init :unbound :ref-known (flushable) :ref-trans symbol-global-value)
+  ;; also the CDR of NIL-as-end-of-list.  Its reffer needs special
+  ;; care for this reason, as hash values must be fixnums.
+  (hash :set-trans %set-symbol-hash)
 
   (plist :ref-trans symbol-plist
 	 :set-trans %set-symbol-plist
@@ -337,7 +339,7 @@
   (package :ref-trans symbol-package
 	   :set-trans %set-symbol-package
 	   :init :null)
-  #!+sb-thread (tls-index))
+  #!+sb-thread (tls-index :ref-known (flushable) :ref-trans symbol-tls-index))
 
 (define-primitive-object (complex-single-float
 			  :lowtag other-pointer-lowtag
@@ -352,14 +354,6 @@
   (real :c-type "double" :length 2)
   (imag :c-type "double" :length 2))
 
-#!+long-float
-(define-primitive-object (complex-long-float
-			  :lowtag other-pointer-lowtag
-			  :widetag 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))
-
 ;;; this isn't actually a lisp object at all, it's a c structure that lives
 ;;; in c-land.  However, we need sight of so many parts of it from Lisp that
 ;;; it makes sense to define it here anyway, so that the GENESIS machinery
@@ -370,19 +364,20 @@
   ;; unbound_marker is borrowed very briefly at thread startup to 
   ;; pass the address of initial-function into new_thread_trampoline 
   (unbound-marker :init :unbound) ; tls[0] = UNBOUND_MARKER_WIDETAG 
-  (binding-stack-start :c-type "lispobj *")
-  (binding-stack-pointer :c-type "lispobj *")
-  (control-stack-start :c-type "lispobj *")
-  (control-stack-end :c-type "lispobj *")
-  (alien-stack-start :c-type "lispobj *")
-  (alien-stack-pointer :c-type "lispobj *")
-  #!+gencgc
-  (alloc-region :c-type "struct alloc_region" :length 5)
   (pid :c-type "pid_t")
+  (binding-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
+  (binding-stack-pointer :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
+  (control-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
+  (control-stack-end :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
+  (alien-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
+  (alien-stack-pointer :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
+  #!+gencgc (alloc-region :c-type "struct alloc_region" :length 5)
   (tls-cookie)				;  on x86, the LDT index 
-  (this :c-type "struct thread *")
-  (next :c-type "struct thread *")
-  (pseudo-atomic-atomic)
-  (pseudo-atomic-interrupted)
-  (interrupt-data :c-type "struct interrupt_data *")
+  (this :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
+  (next :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
+  (state)				; running, stopping, stopped, dead
+  #!+x86 (pseudo-atomic-atomic)
+  #!+x86 (pseudo-atomic-interrupted)
+  (interrupt-data :c-type "struct interrupt_data *" 
+		  :length #!+alpha 2 #!-alpha 1)
   (interrupt-contexts :c-type "os_context_t *" :rest-p t))