X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.h;h=e62cb2ba1dce34ae97eb175d11d9c31234a33572;hb=aecefb5d1dfdab6b004796c8b0b48fd2ab6643df;hp=187248327617e3e12e0847143d3e1901d04ff73d;hpb=7a0ba26f6a662f592b168353c135204f65fda2d2;p=sbcl.git

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index 1872483..e62cb2b 100644
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -8,7 +8,6 @@
 #include "globals.h"
 #include "runtime.h"
 #include "os.h"
-#include "interrupt.h"
 #ifdef LISP_FEATURE_GENCGC
 #include "gencgc-alloc-region.h"
 #else
@@ -18,6 +17,7 @@ struct alloc_region { };
 #include "genesis/static-symbols.h"
 #include "genesis/thread.h"
 #include "genesis/fdefn.h"
+#include "interrupt.h"
 
 #define STATE_RUNNING (make_fixnum(1))
 #define STATE_SUSPENDED (make_fixnum(2))
@@ -30,30 +30,40 @@ static inline lispobj
 thread_state(struct thread *thread)
 {
     lispobj state;
+    sigset_t old;
+    block_blockable_signals(0, &old);
     pthread_mutex_lock(thread->state_lock);
     state = thread->state;
     pthread_mutex_unlock(thread->state_lock);
+    thread_sigmask(SIG_SETMASK,&old,0);
     return state;
 }
 
 static inline void
 set_thread_state(struct thread *thread, lispobj state)
 {
+    sigset_t old;
+    block_blockable_signals(0, &old);
     pthread_mutex_lock(thread->state_lock);
     thread->state = state;
     pthread_cond_broadcast(thread->state_cond);
     pthread_mutex_unlock(thread->state_lock);
+    thread_sigmask(SIG_SETMASK,&old,0);
 }
 
 static inline void
 wait_for_thread_state_change(struct thread *thread, lispobj state)
 {
+    sigset_t old;
+    block_blockable_signals(0, &old);
     pthread_mutex_lock(thread->state_lock);
     while (thread->state == state)
         pthread_cond_wait(thread->state_cond, thread->state_lock);
     pthread_mutex_unlock(thread->state_lock);
+    thread_sigmask(SIG_SETMASK,&old,0);
 }
 
+extern pthread_key_t lisp_thread;
 #endif
 
 extern int kill_safely(os_thread_t os_thread, int signal);
@@ -94,7 +104,7 @@ SymbolValueAddress(u64 tagged_symbol_pointer, void *thread)
 #ifdef LISP_FEATURE_SB_THREAD
     if(thread && sym->tls_index) {
         lispobj *r = &(((union per_thread_data *)thread)
-                       ->dynamic_values[fixnum_value(sym->tls_index)]);
+                       ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]);
         if((*r)!=NO_TLS_VALUE_MARKER_WIDETAG) return r;
     }
 #endif
@@ -110,7 +120,7 @@ SymbolValue(u64 tagged_symbol_pointer, void *thread)
     if(thread && sym->tls_index) {
         lispobj r=
             ((union per_thread_data *)thread)
-            ->dynamic_values[fixnum_value(sym->tls_index)];
+            ->dynamic_values[(sym->tls_index) >> WORD_SHIFT];
         if(r!=NO_TLS_VALUE_MARKER_WIDETAG) return r;
     }
 #endif
@@ -124,7 +134,7 @@ SymbolTlValue(u64 tagged_symbol_pointer, void *thread)
         (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
     return ((union per_thread_data *)thread)
-        ->dynamic_values[fixnum_value(sym->tls_index)];
+        ->dynamic_values[(sym->tls_index) >> WORD_SHIFT];
 #else
     return sym->value;
 #endif
@@ -138,7 +148,7 @@ SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread)
 #ifdef LISP_FEATURE_SB_THREAD
     if(thread && sym->tls_index) {
         lispobj *pr= &(((union per_thread_data *)thread)
-                       ->dynamic_values[fixnum_value(sym->tls_index)]);
+                       ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]);
         if(*pr!=NO_TLS_VALUE_MARKER_WIDETAG) {
             *pr=val;
             return;
@@ -155,7 +165,7 @@ SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread)
     struct symbol *sym= (struct symbol *)
         (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
     ((union per_thread_data *)thread)
-        ->dynamic_values[fixnum_value(sym->tls_index)]
+        ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]
         =val;
 #else
     SetSymbolValue(tagged_symbol_pointer,val,thread) ;
@@ -169,6 +179,37 @@ StaticSymbolFunction(lispobj sym)
     return ((struct fdefn *)native_pointer(SymbolValue(sym, 0)))->fun;
 }
 
+/* These are for use during GC, on the current thread, or on prenatal
+ * threads only. */
+#if defined(LISP_FEATURE_SB_THREAD)
+#define get_binding_stack_pointer(thread)       \
+    ((thread)->binding_stack_pointer)
+#define set_binding_stack_pointer(thread,value) \
+    ((thread)->binding_stack_pointer = (lispobj *)(value))
+#define access_control_stack_pointer(thread) \
+    ((thread)->control_stack_pointer)
+#  if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
+#define access_control_frame_pointer(thread) \
+    ((thread)->control_frame_pointer)
+#  endif
+#elif defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+#define get_binding_stack_pointer(thread)       \
+    SymbolValue(BINDING_STACK_POINTER, thread)
+#define set_binding_stack_pointer(thread,value) \
+    SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value), thread)
+#define access_control_stack_pointer(thread)    \
+    (current_control_stack_pointer)
+#else
+#define get_binding_stack_pointer(thread)       \
+    (current_binding_stack_pointer)
+#define set_binding_stack_pointer(thread,value) \
+    (current_binding_stack_pointer = (lispobj *)(value))
+#define access_control_stack_pointer(thread) \
+    (current_control_stack_pointer)
+#define access_control_frame_pointer(thread) \
+    (current_control_frame_pointer)
+#endif
+
 #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_GCC_TLS)
 extern __thread struct thread *current_thread;
 #endif