Simplify (and robustify) regular PACKing

[sbcl.git] / src / runtime / x86-arch.h

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index 2dfac47..ad87f45 100644 (file)
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -12,13 +12,26 @@
 #include "interr.h"                     /* for declaration of lose() */
 
 #define ARCH_HAS_STACK_POINTER
+#define ALIEN_STACK_GROWS_DOWNWARD
 
 /* FIXME: Do we also want
  *   #define ARCH_HAS_FLOAT_REGISTERS
  * here? (The answer wasn't obvious to me when merging the
  * architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
 
-#include "interr.h"
+#define COMPILER_BARRIER \
+    do { __asm__ __volatile__ ( "" : : : "memory"); } while (0)
+
+#ifdef LISP_FEATURE_WIN32
+extern int os_number_of_processors;
+#define yield_on_uniprocessor()                 \
+    do { if (os_number_of_processors<=1) SwitchToThread(); } while(0)
+#else
+/* Stubs are better than ifdef EVERYWHERE. */
+#define yield_on_uniprocessor()                 \
+    do {} while(0)
+#endif
+
 
 static inline void
 get_spinlock(volatile lispobj *word, unsigned long value)
@@ -35,20 +48,30 @@ get_spinlock(volatile lispobj *word, unsigned long value)
              : "r" (value), "m" (*word)
              : "memory", "cc");
 #else
+        if (eax!=0) {
+            asm volatile("rep; nop");
+        }
         asm volatile ("xor %0,%0\n\
               lock cmpxchg %1,%2"
              : "=a" (eax)
              : "r" (value), "m" (*word)
              : "memory", "cc");
 #endif
-
+        yield_on_uniprocessor();
     } while(eax!=0);
 #else
     *word=value;
 #endif
 }
 
-#include <stdio.h>
+static inline void
+release_spinlock(volatile lispobj *word)
+{
+    /* See comment in RELEASE-SPINLOCK in target-thread.lisp. */
+    COMPILER_BARRIER;
+    *word=0;
+    COMPILER_BARRIER;
+}
 
 static inline lispobj
 swap_lispobjs(volatile lispobj *dest, lispobj value)
@@ -68,14 +91,6 @@ swap_lispobjs(volatile lispobj *dest, lispobj value)
     return old_value;
 }
 
-static inline void
-release_spinlock(volatile lispobj *word)
-{
-    /* A memory barrier is needed, use swap_lispobjs. See comment in
-     * RELEASE-SPINLOCK in target-thread.lisp. */
-    swap_lispobjs(word,0);
-}
-
 extern void fast_bzero_detect(void *, size_t);
 extern void (*fast_bzero_pointer)(void *, size_t);