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

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 12da1cb..8d8da8c 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,44 +13,52 @@
  * files for more information.
  */
 
+#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"
-
-#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
+#include "genesis/static-symbols.h"
 
 void bind_variable(lispobj symbol, lispobj value, void *th)
 {
-    lispobj old_tl_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);
-#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;
+            FSHOW_SIGNAL((stderr, "entering dynbind tls alloc\n"));
+            set_pseudo_atomic_atomic(thread);
+            get_spinlock(tls_index_lock,(uword_t)th);
+            if(!sym->tls_index) {
+                sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
+                SetSymbolValue(FREE_TLS_INDEX, sym->tls_index+N_WORD_BYTES, 0);
+                if((sym->tls_index)>=(TLS_SIZE << WORD_SHIFT)) {
+                    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
-    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,16 +67,39 @@ unbind(void *th)
     struct thread *thread=(struct thread *)th;
     struct binding *binding;
     lispobj symbol;
-	
-    binding = GetBSP() - 1;
-		
+
+    binding = ((struct binding *)get_binding_stack_pointer(thread)) - 1;
+
+    symbol = binding->symbol;
+
+    SetTlSymbolValue(symbol, binding->value,thread);
+
+    binding->symbol = 0;
+    binding->value = 0;
+
+    set_binding_stack_pointer(thread,binding);
+}
+
+void
+unbind_variable(lispobj name, void *th)
+{
+    struct thread *thread=(struct thread *)th;
+    struct binding *binding;
+    lispobj symbol;
+
+    binding = ((struct binding *)get_binding_stack_pointer(thread)) - 1;
+
     symbol = binding->symbol;
 
+    if (symbol != name)
+      lose("unbind_variable, 0x%p != 0x%p", symbol, name);
+
     SetTlSymbolValue(symbol, binding->value,thread);
 
     binding->symbol = 0;
+    binding->value = 0;
 
-    SetBSP(binding);
+    set_binding_stack_pointer(thread,binding);
 }
 
 void
@@ -76,17 +107,20 @@ 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--;
+        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;
+            binding->value = 0;
+        }
     }
-    SetBSP(binding);
+    set_binding_stack_pointer(thread,binding);
 }