0.8alpha.0.23:

[sbcl.git] / src / compiler / generic / objdef.lisp

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index 8f67849..5228849 100644 (file)
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -310,22 +310,33 @@
 ;;;; 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
                                 :widetag symbol-header-widetag
                                 #!-x86 :alloc-trans #!-x86 make-symbol)
-  (value :set-trans %set-symbol-value
-        :init :unbound)
-  #!+x86 (hash)
+
+  ;; Beware when changing this definition.  NIL-the-symbol is defined
+  ;; using this layout, and NIL-the-end-of-list-marker is the cons 
+  ;; ( NIL . NIL ), living in the first two slots of NIL-the-symbol
+  ;; (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
+  ;; first data slot, and if you subtract 7 you get a symbol header.
+
+  (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
         :set-trans %set-symbol-plist
         :init :null)
   (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
@@ -348,3 +359,29 @@
   (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)
+  #!+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))