X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.h;h=b4ce701d1c140c8552f8bd3953c19dba29b2cd3b;hb=5e92e9ed61903658015c2a75c79a32ad41dbd29d;hp=19d6cf6aa446ba74d8b0aab5b355f756cc88af5d;hpb=2378b4fe567a8fea78b1e4915b9497d8c18ca92f;p=sbcl.git

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index 19d6cf6..b4ce701 100644
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -5,6 +5,10 @@
 #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
@@ -12,21 +16,29 @@
  * here? (The answer wasn't obvious to me when merging the
  * architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
 
-static inline void 
-get_spinlock(lispobj *word,int value)
+#include "interr.h"
+
+static inline void
+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" 
-	     : "=a" (eax)
-	     : "r" (value), "m" (*word)
-	     : "memory", "cc");
+        asm ("xor %0,%0\n\
+              lock cmpxchg %1,%2"
+             : "=a" (eax)
+             : "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;
 }