X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=590d146c297a1b8d710b15889f2ffcb3db27f9b0;hb=1e9966d5f24709d227e20911b4e1ddd27c87a00e;hp=bf9217d7750cb3cd68a82c3ac936c85a6a7b8648;hpb=5edd74f6911093805a009a152b32216b3dba59f7;p=sbcl.git

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index bf9217d..590d146 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"))
@@ -310,7 +314,7 @@
 ;;;; symbols
 
 #!+x86
-(defknown symbol-hash (symbol) (integer 0 #.*target-most-positive-fixnum*)
+(defknown symbol-hash (symbol) (integer 0 #.sb!xc:most-positive-fixnum)
   (flushable movable))
 
 (define-primitive-object (symbol :lowtag other-pointer-lowtag
@@ -326,8 +330,7 @@
   ;; 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 :set-trans %set-symbol-value
-	 :init :unbound)		;also the CAR of NIL-as-end-of-list
+  (value :init :unbound)		;also the CAR of NIL-as-end-of-list
   (hash)				;the CDR of NIL-as-end-of-list
 
   (plist :ref-trans symbol-plist
@@ -336,7 +339,8 @@
   (name :ref-trans symbol-name :init :arg)
   (package :ref-trans symbol-package
 	   :set-trans %set-symbol-package
-	   :init :null))
+	   :init :null)
+  #!+sb-thread (tls-index))
 
 (define-primitive-object (complex-single-float
 			  :lowtag other-pointer-lowtag
@@ -359,3 +363,30 @@
   (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
+;;; can take care of maintaining Lisp and C versions.
+;;; Hence the even-fixnum lowtag just so we don't get odd(sic) numbers 
+;;; added to the slot offsets
+(define-primitive-object (thread :lowtag even-fixnum-lowtag)
+  ;; 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 
+  (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 *" :length #!+alpha 2 #!-alpha 1)
+  (next :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
+  (state)				; running, stopping, stopped
+  #!+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))