X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fdynbind.c;h=1c84e5bbfe000c65b203715842b7ab8dd4022aa6;hb=29a168e2bf7a6d509dea282cc5c781aba734d87c;hp=450c63ca03a8e2841ef0a2ec3a4454d863b01fdb;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 450c63c..1c84e5b 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,69 +13,98 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "globals.h"
 #include "dynbind.h"
-
-#if defined(ibmrt) || defined(__i386__)
-#define GetBSP() ((struct binding *)SymbolValue(BINDING_STACK_POINTER))
-#define SetBSP(value) SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value))
+#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))
+#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;
-	struct binding *binding;
-
-	old_value = SymbolValue(symbol);
-	binding = GetBSP();
-	SetBSP(binding+1);
-
-	binding->value = old_value;
-	binding->symbol = symbol;
-	SetSymbolValue(symbol, value);
+    struct binding *binding;
+    struct thread *thread=(struct thread *)th;
+    binding = GetBSP();
+    SetBSP(binding+1);
+#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;
+            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);
+                if(fixnum_value(sym->tls_index)>=TLS_SIZE) {
+                    lose("Thread local storage exhausted.");
+                }
+            }
+            release_spinlock(tls_index_lock);
+            clear_pseudo_atomic_atomic(th);
+            if (get_pseudo_atomic_interrupted(th))
+                do_pending_interrupt();
+        }
+    }
+#endif
+    binding->value = SymbolTlValue(symbol, thread);
+    binding->symbol = symbol;
+    SetTlSymbolValue(symbol, value, thread);
 }
 
-void unbind(void)
+void
+unbind(void *th)
 {
-	struct binding *binding;
-	lispobj symbol;
-	
-	binding = GetBSP() - 1;
-		
-	symbol = binding->symbol;
+    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;
+    binding->symbol = 0;
+    binding->value = 0;
 
-	SetBSP(binding);
+    SetBSP(binding);
 }
 
-void unbind_to_here(lispobj *bsp)
+void
+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) {
+            if (symbol != UNBOUND_MARKER_WIDETAG) {
+                SetTlSymbolValue(symbol, binding->value,thread);
+            }
+            binding->symbol = 0;
+            binding->value = 0;
+        }
     }
     SetBSP(binding);
 }