X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.h;h=f8174c20f10c8d2c07d773a281e2fad5d26dce6d;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=eea03a4f19f26b66e2fab74132e86c638db92d39;hpb=a7c2f2622f1ceeeb3459cb6bbcf261bda1ff2327;p=sbcl.git

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index eea03a4..f8174c2 100644
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -4,8 +4,9 @@
  * 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 incuded before this file
+#error genesis/config.h (or sbcl.h) must be included before this file
 #endif
 
 #define ARCH_HAS_STACK_POINTER
@@ -13,26 +14,27 @@
 /* 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) */
-
-#ifdef LISP_FEATURE_SB_THREAD
+ * architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
 
-extern never_returns lose(char *fmt, ...);
+#include "interr.h"
 
-static inline void 
-get_spinlock(volatile lispobj *word,int value)
+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,%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");
+        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
@@ -41,18 +43,17 @@ release_spinlock(volatile lispobj *word)
     *word=0;
 }
 
-#else
+#include <stdio.h>
 
-static inline void 
-get_spinlock(lispobj *word, int value)
+static inline lispobj
+swap_lispobjs(volatile lispobj *dest, lispobj value)
 {
-    *word = value;
-}
-
-static inline void
-release_spinlock(lispobj *word) {
-    *word = 0;
+    lispobj old_value;
+    asm ("lock xchg %0,(%1)"
+         : "=r" (old_value)
+         : "r" (dest), "0" (value)
+         : "memory");
+    return old_value;
 }
 
-#endif /* LISP_FEATURE_SB_THREAD */
 #endif /* _X86_ARCH_H */