0.9.2.42:

[sbcl.git] / src / runtime / dynbind.c

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 7b410c3..8c2d26a 100644 (file)
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,16 +13,17 @@
  * 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(LISP_FEATURE_X86)
+#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
@@ -35,14 +36,16 @@ 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);
+        sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
+        SetSymbolValue(FREE_TLS_INDEX,
+                       make_fixnum(fixnum_value(sym->tls_index)+1),0);
     }
 #endif
     old_tl_value=SymbolTlValue(symbol,thread);
@@ -57,9 +60,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);
@@ -78,13 +81,13 @@ 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) {
+            SetTlSymbolValue(symbol, binding->value,thread);
+            binding->symbol = 0;
+        }
     }
     SetBSP(binding);
 }