X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=09c331f23d00a40067351f4b098d7115eb8c65c5;hb=7244742c3a9478d13d813aaae8135973eb4b89aa;hp=0a4daec9bbd962b4187cd45a7983bf721d3287dc;hpb=dc5d8cef786c974258601109f79ab18f874b1270;p=sbcl.git

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index 0a4daec..09c331f 100644
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -295,8 +295,7 @@
   #!+win32 next-seh-frame
   #!+win32 seh-frame-handler
   tag
-  (previous-catch :c-type #!-alpha "struct catch_block *" #!+alpha "u32")
-  size)
+  (previous-catch :c-type #!-alpha "struct catch_block *" #!+alpha "u32"))
 
 ;;; (For an explanation of this, see the comments at the definition of
 ;;; KLUDGE-NONDETERMINISTIC-CATCH-BLOCK-SIZE.)
@@ -375,13 +374,18 @@
   ;; tls[0] = NO_TLS_VALUE_MARKER_WIDETAG because a the tls index slot
   ;; of a symbol is initialized to zero
   (no-tls-value-marker)
-  (os-thread :c-type "volatile os_thread_t")
+  (os-thread :c-type "os_thread_t")
   ;; This is the original address at which the memory was allocated,
   ;; which may have different alignment then what we prefer to use.
-  ;; Kept here so that when the thread dies we can releast the whole
+  ;; Kept here so that when the thread dies we can release the whole
   ;; memory we reserved.
   (os-address :c-type "void *" :length #!+alpha 2 #!-alpha 1)
+  #!+sb-thread
   (os-attr :c-type "pthread_attr_t *" :length #!+alpha 2 #!-alpha 1)
+  #!+sb-thread
+  (state-lock :c-type "pthread_mutex_t *" :length #!+alpha 2 #!-alpha 1)
+  #!+sb-thread
+  (state-cond :c-type "pthread_cond_t *" :length #!+alpha 2 #!-alpha 1)
   (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)
@@ -393,10 +397,16 @@
   (prev :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
   (next :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
   ;; starting, running, suspended, dead
-  (state :c-type "volatile lispobj")
+  (state :c-type "lispobj")
   (tls-cookie)                          ;  on x86, the LDT index
   #!+(or x86 x86-64) (pseudo-atomic-bits)
   (interrupt-data :c-type "struct interrupt_data *"
                   :length #!+alpha 2 #!-alpha 1)
   (stepping)
+  ;; KLUDGE: On alpha, until STEPPING we have been lucky and the 32
+  ;; bit slots came in pairs. However the C compiler will align
+  ;; interrupt_contexts on a double word boundary. This logic should
+  ;; be handled by DEFINE-PRIMITIVE-OBJECT.
+  #!+alpha
+  (padding)
   (interrupt-contexts :c-type "os_context_t *" :rest-p t))