X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.h;h=3105cf6a15f68c663e91daa3432778d8351cdb0a;hb=5563d2712045491695f68c018dbdd1233faca4e5;hp=e2b3e253784c675cd77d94ee4e9c50d26b0e7d5b;hpb=64d188522b43bd5a86238f3d453d2b3c323bc0ae;p=sbcl.git

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index e2b3e25..3105cf6 100644
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -5,19 +5,26 @@
 #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
+
 #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) */
+
+extern never_returns lose(char *fmt, ...);
 
-#ifdef LISP_FEATURE_SB_THREAD
 static inline void 
-get_spinlock(lispobj *word,int value)
+get_spinlock(volatile lispobj *word,long value)
 {
+#ifdef LISP_FEATURE_SB_THREAD
     u32 eax=0;
+    if(*word==value) 
+	lose("recursive get_spinlock: 0x%x,%ld\n",word,value);
     do {
 	asm ("xor %0,%0\n\
               lock cmpxchg %1,%2" 
@@ -25,26 +32,15 @@ get_spinlock(lispobj *word,int value)
 	     : "r" (value), "m" (*word)
 	     : "memory", "cc");
     } while(eax!=0);
+#else
+    *word=value;
+#endif
 }
 
 static inline void
-release_spinlock(lispobj *word)
+release_spinlock(volatile lispobj *word)
 {
     *word=0;
 }
 
-#else
-
-static inline void 
-get_spinlock(lispobj *word, int value)
-{
-    *word = value;
-}
-
-static inline void
-release_spinlock(lispobj *word) {
-    *word = 0;
-}
-
-#endif /* LISP_FEATURE_SB_THREAD */
 #endif /* _X86_ARCH_H */