X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fthread.h;h=3de541546cd27488289bfa445510aff18dcaebf5;hb=f17e3d27d7ff599f9443d011d17017a2a858c81a;hp=306d133fa45018b8a43b0d51c5ca03297051c78a;hpb=dca9c046b59d56ecddf36169f6994119ef8aeace;p=sbcl.git

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index 306d133..3de5415 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))
@@ -54,6 +54,7 @@ wait_for_thread_state_change(struct thread *thread, lispobj state)
     pthread_mutex_unlock(thread->state_lock);
 }
 
+extern pthread_key_t lisp_thread;
 #endif
 
 extern int kill_safely(os_thread_t os_thread, int signal);
@@ -169,12 +170,36 @@ StaticSymbolFunction(lispobj sym)
     return ((struct fdefn *)native_pointer(SymbolValue(sym, 0)))->fun;
 }
 
-static inline
-os_context_t *get_interrupt_context_for_thread(struct thread *th)
-{
-    return th->interrupt_contexts
-        [fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,th)-1)];
-}
+/* 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;