X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fdynbind.c;h=da2218961a05b98e0482bded1288f69372ec6f5d;hb=5e92e9ed61903658015c2a75c79a32ad41dbd29d;hp=5f26c2a72e7b888be6ec52efcfe55320d7ddaa81;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 5f26c2a..da22189 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,16 +13,17 @@
  * files for more information.
  */
 
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "globals.h"
 #include "dynbind.h"
 #include "thread.h"
 #include "genesis/symbol.h"
 #include "genesis/binding.h"
 #include "genesis/thread.h"
+#include "genesis/static-symbols.h"
 
-#if defined(__i386__)
+#if defined(BINDING_STACK_POINTER)
 #define GetBSP() ((struct binding *)SymbolValue(BINDING_STACK_POINTER,thread))
 #define SetBSP(value) SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value),thread)
 #else
@@ -35,14 +36,27 @@ void bind_variable(lispobj symbol, lispobj value, void *th)
     lispobj old_tl_value;
     struct binding *binding;
     struct thread *thread=(struct thread *)th;
-    struct symbol *sym=(struct symbol *)native_pointer(symbol);
     binding = GetBSP();
     SetBSP(binding+1);
 #ifdef LISP_FEATURE_SB_THREAD
-    if(!sym->tls_index) {
-	sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
-	SetSymbolValue(FREE_TLS_INDEX,
-		       make_fixnum(fixnum_value(sym->tls_index)+1),0);
+    {
+        struct symbol *sym=(struct symbol *)native_pointer(symbol);
+        if(!sym->tls_index) {
+            lispobj *tls_index_lock=
+                &((struct symbol *)native_pointer(TLS_INDEX_LOCK))->value;
+            SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0),th);
+            SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(1),th);
+            get_spinlock(tls_index_lock,(long)th);
+            if(!sym->tls_index) {
+                sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
+                SetSymbolValue(FREE_TLS_INDEX,
+                               make_fixnum(fixnum_value(sym->tls_index)+1),0);
+            }
+            release_spinlock(tls_index_lock);
+            SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(0),th);
+            if (fixnum_value(SymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th)))
+                do_pending_interrupt();
+        }
     }
 #endif
     old_tl_value=SymbolTlValue(symbol,thread);
@@ -57,9 +71,9 @@ unbind(void *th)
     struct thread *thread=(struct thread *)th;
     struct binding *binding;
     lispobj symbol;
-	
+
     binding = GetBSP() - 1;
-		
+
     symbol = binding->symbol;
 
     SetTlSymbolValue(symbol, binding->value,thread);
@@ -78,13 +92,13 @@ unbind_to_here(lispobj *bsp,void *th)
     lispobj symbol;
 
     while (target < binding) {
-	binding--;
+        binding--;
 
-	symbol = binding->symbol;
-	if (symbol) {
-	    SetTlSymbolValue(symbol, binding->value,thread);
-	    binding->symbol = 0;
-	}
+        symbol = binding->symbol;
+        if (symbol) {
+            SetTlSymbolValue(symbol, binding->value,thread);
+            binding->symbol = 0;
+        }
     }
     SetBSP(binding);
 }