Fix attach_thread to allocate a TLS index for *gc-inhibit* if needed

[sbcl.git] / src / runtime / pseudo-atomic.h

diff --git a/src/runtime/pseudo-atomic.h b/src/runtime/pseudo-atomic.h
index 8556e0c..0c2ea7f 100644 (file)
--- a/src/runtime/pseudo-atomic.h
+++ b/src/runtime/pseudo-atomic.h
@@ -22,8 +22,6 @@
     SetSymbolValue(ALLOCATION_POINTER, value, 0)
 #define get_alloc_pointer()                     \
     SymbolValue(ALLOCATION_POINTER, 0)
-#define get_binding_stack_pointer(thread)       \
-    SymbolValue(BINDING_STACK_POINTER, thread)
 
 #if defined(LISP_FEATURE_X86)
 #define LISPOBJ_ASM_SUFFIX "l"
@@ -102,14 +100,12 @@ clear_pseudo_atomic_interrupted(struct thread *thread)
 #define set_alloc_pointer(value) \
     (dynamic_space_free_pointer = \
      ((lispobj *) \
-      ((value) | (((unsigned long)dynamic_space_free_pointer) & LOWTAG_MASK))))
+      ((value) | (((uword_t)dynamic_space_free_pointer) & LOWTAG_MASK))))
 
 #define get_alloc_pointer()                                     \
-    ((unsigned long) dynamic_space_free_pointer & ~LOWTAG_MASK)
+    ((uword_t) dynamic_space_free_pointer & ~LOWTAG_MASK)
 
 #ifdef LISP_FEATURE_SB_THREAD
-#define get_binding_stack_pointer(thread)       \
-    ((thread)->binding_stack_pointer)
 #define get_pseudo_atomic_atomic(thread) \
     ((thread)->pseudo_atomic_bits & flag_PseudoAtomic)
 #define set_pseudo_atomic_atomic(thread) \
@@ -123,24 +119,22 @@ clear_pseudo_atomic_interrupted(struct thread *thread)
 #define clear_pseudo_atomic_interrupted(thread) \
     ((thread)->pseudo_atomic_bits &= ~flag_PseudoAtomicInterrupted)
 #else
-#define get_binding_stack_pointer(thread)       \
-    (current_binding_stack_pointer)
 #define get_pseudo_atomic_atomic(thread)                                \
-    ((unsigned long)dynamic_space_free_pointer & flag_PseudoAtomic)
+    ((uword_t)dynamic_space_free_pointer & flag_PseudoAtomic)
 #define set_pseudo_atomic_atomic(thread)                                \
     (dynamic_space_free_pointer                                         \
-     = (lispobj*) ((unsigned long)dynamic_space_free_pointer | flag_PseudoAtomic))
+     = (lispobj*) ((uword_t)dynamic_space_free_pointer | flag_PseudoAtomic))
 #define clear_pseudo_atomic_atomic(thread)                              \
     (dynamic_space_free_pointer                                         \
-     = (lispobj*) ((unsigned long) dynamic_space_free_pointer & ~flag_PseudoAtomic))
+     = (lispobj*) ((uword_t) dynamic_space_free_pointer & ~flag_PseudoAtomic))
 #define get_pseudo_atomic_interrupted(thread)                           \
-    ((unsigned long) dynamic_space_free_pointer & flag_PseudoAtomicInterrupted)
+    ((uword_t) dynamic_space_free_pointer & flag_PseudoAtomicInterrupted)
 #define clear_pseudo_atomic_interrupted(thread)                         \
     (dynamic_space_free_pointer                                         \
-     = (lispobj*) ((unsigned long) dynamic_space_free_pointer & ~flag_PseudoAtomicInterrupted))
+     = (lispobj*) ((uword_t) dynamic_space_free_pointer & ~flag_PseudoAtomicInterrupted))
 #define set_pseudo_atomic_interrupted(thread)                           \
     (dynamic_space_free_pointer                                         \
-     = (lispobj*) ((unsigned long) dynamic_space_free_pointer | flag_PseudoAtomicInterrupted))
+     = (lispobj*) ((uword_t) dynamic_space_free_pointer | flag_PseudoAtomicInterrupted))
 #endif
 
 #endif