0.8.4.3

[sbcl.git] / src / runtime / thread.h

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index cf0a26e..9fb3ab3 100644 (file)
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -4,6 +4,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
+#include <stddef.h>
 #include "runtime.h"
 #include "sbcl.h"
 #include "os.h"
@@ -39,7 +40,7 @@ extern struct thread *find_thread_by_pid(pid_t pid);
 
 static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
     struct symbol *sym= (struct symbol *)
-       (tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+       (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
     if(thread && sym->tls_index) {
        lispobj r=
@@ -52,7 +53,7 @@ static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
 }
 static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
     struct symbol *sym= (struct symbol *)
-       (tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+       (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)];
@@ -63,7 +64,7 @@ static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
 
 static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
     struct symbol *sym=        (struct symbol *)
-       (tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+       (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
     if(thread && sym->tls_index) {
        lispobj *pr= &(((union per_thread_data *)thread)
@@ -79,7 +80,7 @@ static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *t
 static inline void SetTlSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
 #ifdef LISP_FEATURE_SB_THREAD
     struct symbol *sym=        (struct symbol *)
-       (tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+       (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
     ((union per_thread_data *)thread)
        ->dynamic_values[fixnum_value(sym->tls_index)]
        =val;
@@ -88,6 +89,30 @@ static inline void SetTlSymbolValue(u32 tagged_symbol_pointer,lispobj val, void
 #endif
 }
 
+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)];
+}
+
+/* This is clearly per-arch and possibly even per-OS code, but we can't 
+ * put it somewhere sensible like x86-linux-os.c because it needs too
+ * much stuff like struct thread and all_threads to be defined, which
+ * usually aren't by that time.  So, it's here instead.  Sorry */
+
+inline static struct thread *arch_os_get_current_thread() {
+#if defined(LISP_FEATURE_SB_THREAD) && defined (LISP_FEATURE_X86)
+    register struct thread *me=0;
+    if(all_threads)
+       __asm__ __volatile__ ("movl %%fs:%c1,%0" : "=r" (me)
+                : "i" (offsetof (struct thread,this)));
+    return me;
+#else
+    return all_threads;
+#endif
+}
+
+
 int arch_os_thread_init(struct thread *thread);
 extern struct thread *arch_os_get_current_thread();