X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fdynbind.c;h=1d62ee0ecec0501420f2278deed4ed3becae3830;hb=344a1f088581303c92da333ddddc9aeb9c212ba9;hp=8a3a548882e21e690de3d26eb1603d1be5bdf0a5;hpb=6cbe4d8ba6d7bc469d03a72514c789b1f3944878;p=sbcl.git

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 8a3a548..1d62ee0 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,67 +13,94 @@
  * files for more information.
  */
 
-#include "runtime.h"
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "sbcl.h"
+#include "runtime.h"
 #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(__i386__)
-#define GetBSP() ((struct binding *)SymbolValue(BINDING_STACK_POINTER))
-#define SetBSP(value) SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value))
-#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 = (struct binding *)get_binding_stack_pointer(thread);
+    set_binding_stack_pointer(thread,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;
+            FSHOW_SIGNAL((stderr, "entering dynbind tls alloc\n"));
+            set_pseudo_atomic_atomic(thread);
+            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);
+            FSHOW_SIGNAL((stderr, "exiting dynbind tls alloc\n"));
+            clear_pseudo_atomic_atomic(thread);
+            if (get_pseudo_atomic_interrupted(thread))
+                do_pending_interrupt();
+        }
+    }
+#endif
+    binding->value = SymbolTlValue(symbol, thread);
+    binding->symbol = symbol;
+    SetTlSymbolValue(symbol, value, thread);
 }
 
 void
-unbind(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 = ((struct binding *)get_binding_stack_pointer(thread)) - 1;
 
-	SetSymbolValue(symbol, binding->value);
+    symbol = binding->symbol;
 
-	binding->symbol = 0;
+    SetTlSymbolValue(symbol, binding->value,thread);
 
-	SetBSP(binding);
+    binding->symbol = 0;
+    binding->value = 0;
+
+    set_binding_stack_pointer(thread,binding);
 }
 
 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();
+    struct binding *binding = (struct binding *)get_binding_stack_pointer(thread);
     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);
+    set_binding_stack_pointer(thread,binding);
 }