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

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index 19d6cf6..439f508 100644
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -4,18 +4,32 @@
  * 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
 
 #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
+
+extern never_returns lose(char *fmt, ...);
 
 static inline void 
-get_spinlock(lispobj *word,int value)
+get_spinlock(volatile lispobj *word,long value)
 {
     u32 eax=0;
+    if(*word==value) 
+	lose("recursive get_spinlock: 0x%x,%d\n",word,value);
     do {
 	asm ("xor %0,%0\n\
               lock cmpxchg %1,%2" 
@@ -26,9 +40,23 @@ get_spinlock(lispobj *word,int value)
 }
 
 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 */