#include "globals.h"
#include "runtime.h"
#include "os.h"
-#include "interrupt.h"
#ifdef LISP_FEATURE_GENCGC
#include "gencgc-alloc-region.h"
-#else
-struct alloc_region { };
#endif
#include "genesis/symbol.h"
#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))
-#define STATE_DEAD (make_fixnum(3))
+#define STATE_RUNNING MAKE_FIXNUM(1)
+#define STATE_STOPPED MAKE_FIXNUM(2)
+#define STATE_DEAD MAKE_FIXNUM(3)
#ifdef LISP_FEATURE_SB_THREAD
-
-/* Only access thread state with blockables blocked. */
-static inline lispobj
-thread_state(struct thread *thread)
-{
- lispobj state;
- pthread_mutex_lock(thread->state_lock);
- state = thread->state;
- pthread_mutex_unlock(thread->state_lock);
- return state;
-}
-
-static inline void
-set_thread_state(struct thread *thread, lispobj state)
-{
- pthread_mutex_lock(thread->state_lock);
- thread->state = state;
- pthread_cond_broadcast(thread->state_cond);
- pthread_mutex_unlock(thread->state_lock);
-}
-
-static inline void
-wait_for_thread_state_change(struct thread *thread, lispobj state)
-{
- 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);
-}
-
+lispobj thread_state(struct thread *thread);
+void set_thread_state(struct thread *thread, lispobj state);
+void wait_for_thread_state_change(struct thread *thread, lispobj state);
+extern pthread_key_t lisp_thread;
#endif
extern int kill_safely(os_thread_t os_thread, int signal);
-extern void kill_a_lisp_thread(int signal);
#define THREAD_SLOT_OFFSET_WORDS(c) \
(offsetof(struct thread,c)/(sizeof (struct thread *)))
extern struct thread *all_threads;
extern int dynamic_values_bytes;
-extern pthread_key_t lisp_thread;
#if defined(LISP_FEATURE_DARWIN)
#define CONTROL_STACK_ALIGNMENT_BYTES 8192 /* darwin wants page-aligned stacks */
#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
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
(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
#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;
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) ;
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