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

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 2d9f47e..da22189 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,44 +13,70 @@
  * 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__)
-#define GetBSP() ((struct binding *)SymbolValue(BINDING_STACK_POINTER))
-#define SetBSP(value) SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value))
+#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
 #define GetBSP() ((struct binding *)current_binding_stack_pointer)
 #define SetBSP(value) (current_binding_stack_pointer=(lispobj *)(value))
 #endif
 
-void bind_variable(lispobj symbol, lispobj value)
+void bind_variable(lispobj symbol, lispobj value, void *th)
 {
-    lispobj old_value;
+    lispobj old_tl_value;
     struct binding *binding;
-
-    old_value = SymbolValue(symbol);
+    struct thread *thread=(struct thread *)th;
     binding = GetBSP();
     SetBSP(binding+1);
-
-    binding->value = old_value;
+#ifdef LISP_FEATURE_SB_THREAD
+    {
+        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);
+    binding->value = old_tl_value;
     binding->symbol = symbol;
-    SetSymbolValue(symbol, value);
+    SetTlSymbolValue(symbol, value,thread);
 }
 
 void
-unbind(void)
+unbind(void *th)
 {
+    struct thread *thread=(struct thread *)th;
     struct binding *binding;
     lispobj symbol;
-	
+
     binding = GetBSP() - 1;
-		
+
     symbol = binding->symbol;
 
-    SetSymbolValue(symbol, binding->value);
+    SetTlSymbolValue(symbol, binding->value,thread);
 
     binding->symbol = 0;
 
@@ -58,22 +84,21 @@ unbind(void)
 }
 
 void
-unbind_to_here(lispobj *bsp)
+unbind_to_here(lispobj *bsp,void *th)
 {
+    struct thread *thread=(struct thread *)th;
     struct binding *target = (struct binding *)bsp;
     struct binding *binding = GetBSP();
     lispobj symbol;
 
     while (target < binding) {
-	binding--;
-
-	symbol = binding->symbol;
-
-	if (symbol) {
-	    SetSymbolValue(symbol, binding->value);
-	    binding->symbol = 0;
-	}
+        binding--;
 
+        symbol = binding->symbol;
+        if (symbol) {
+            SetTlSymbolValue(symbol, binding->value,thread);
+            binding->symbol = 0;
+        }
     }
     SetBSP(binding);
 }