X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.h;h=582bfc7e016b668ee47b33285b5eecea099e36b9;hb=c8617f57d0413beb2890e94dabe227cef9c5ddad;hp=c5498ff0b53ed15841c73b36f8cc8b34662dd91c;hpb=eb5265ab22a2b1cae18bbdf43c871dba9b5927ea;p=sbcl.git

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index c5498ff..582bfc7 100644
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -4,59 +4,93 @@
  * namespace that we control. */
 #ifndef _X86_ARCH_H
 #define _X86_ARCH_H
-#ifndef SBCL_GENESIS_CONFIG
-#error genesis/config.h (or sbcl.h) must be included before this file
-#endif
 
 #ifndef SBCL_GENESIS_CONFIG
 #error genesis/config.h (or sbcl.h) must be included before this file
 #endif
 
+#include "interr.h"                     /* for declaration of lose() */
+
 #define ARCH_HAS_STACK_POINTER
 
 /* 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) */
+ * architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
 
-#ifdef LISP_FEATURE_SB_THREAD
+#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
 
-extern never_returns lose(char *fmt, ...);
 
-static inline void 
-get_spinlock(volatile lispobj *word,int value)
+static inline void
+get_spinlock(volatile lispobj *word, unsigned long value)
 {
+#ifdef LISP_FEATURE_SB_THREAD
     u32 eax=0;
-    if(*word==value) 
-	lose("recursive get_spinlock: 0x%x,%d\n",word,value);
+    if(*word==value)
+        lose("recursive get_spinlock: 0x%x,%ld\n",word,value);
     do {
-	asm ("xor %0,%0\n\
-              lock cmpxchg %1,%2" 
-	     : "=a" (eax)
-	     : "r" (value), "m" (*word)
-	     : "memory", "cc");
+#if defined(LISP_FEATURE_DARWIN)
+        asm volatile ("xor %0,%0;\n\
+              lock/cmpxchg %1,%2"
+             : "=a" (eax)
+             : "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
 }
 
 static inline void
 release_spinlock(volatile lispobj *word)
 {
+    /* See comment in RELEASE-SPINLOCK in target-thread.lisp. */
+    COMPILER_BARRIER;
     *word=0;
+    COMPILER_BARRIER;
 }
 
-#else
-
-static inline void 
-get_spinlock(lispobj *word, int value)
+static inline lispobj
+swap_lispobjs(volatile lispobj *dest, lispobj value)
 {
-    *word = value;
+    lispobj old_value;
+#if defined(LISP_FEATURE_DARWIN)
+    asm volatile ("lock/xchg %0,(%1)"
+         : "=r" (old_value)
+         : "r" (dest), "0" (value)
+         : "memory");
+#else
+    asm volatile ("lock xchg %0,(%1)"
+         : "=r" (old_value)
+         : "r" (dest), "0" (value)
+         : "memory");
+#endif
+    return old_value;
 }
 
-static inline void
-release_spinlock(lispobj *word) {
-    *word = 0;
-}
+extern void fast_bzero_detect(void *, size_t);
+extern void (*fast_bzero_pointer)(void *, size_t);
 
-#endif /* LISP_FEATURE_SB_THREAD */
 #endif /* _X86_ARCH_H */