X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fdynbind.c;h=f2e51ef514afbcbcf3a9cd3e8b96b42c6da35b9e;hb=7137cb0872e17772f26c432384da5eefa3e645d7;hp=12da1cb42a59529b7050cefb1948737033ad94df;hpb=cf4cb9554515c59eddbde38d1cf236339c37f55f;p=sbcl.git

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 12da1cb..f2e51ef 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -18,9 +18,11 @@
 #include "globals.h"
 #include "dynbind.h"
 #include "thread.h"
+#include "pseudo-atomic.h"
 #include "genesis/symbol.h"
 #include "genesis/binding.h"
 #include "genesis/thread.h"
+#include "genesis/static-symbols.h"
 
 #if defined(BINDING_STACK_POINTER)
 #define GetBSP() ((struct binding *)SymbolValue(BINDING_STACK_POINTER,thread))
@@ -32,25 +34,34 @@
 
 void bind_variable(lispobj symbol, lispobj value, void *th)
 {
-    lispobj old_tl_value;
     struct binding *binding;
     struct thread *thread=(struct thread *)th;
-#ifdef LISP_FEATURE_SB_THREAD
-    struct symbol *sym=(struct symbol *)native_pointer(symbol);
-#endif
     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;
+            clear_pseudo_atomic_interrupted(th);
+            set_pseudo_atomic_atomic(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);
+            clear_pseudo_atomic_atomic(th);
+            if (get_pseudo_atomic_interrupted(th))
+                do_pending_interrupt();
+        }
     }
 #endif
-    old_tl_value=SymbolTlValue(symbol,thread);
-    binding->value = old_tl_value;
+    binding->value = SymbolTlValue(symbol, thread);
     binding->symbol = symbol;
-    SetTlSymbolValue(symbol, value,thread);
+    SetTlSymbolValue(symbol, value, thread);
 }
 
 void
@@ -59,9 +70,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);
@@ -80,13 +91,15 @@ 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) {
+            if (symbol != UNBOUND_MARKER_WIDETAG) {
+                SetTlSymbolValue(symbol, binding->value,thread);
+            }
+            binding->symbol = 0;
+        }
     }
     SetBSP(binding);
 }