X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-arch.h;h=10df5d85c779584592a69193255c5d77bb060026;hb=c2ac5ba3964165ee2d21ccd4c6bf8bdc48e1a165;hp=4e3a18d4e94c5bbb1dd8bba887dc7d6b789cd78d;hpb=cd056980425e3fa67b8b77de3936ccb46508c3b0;p=sbcl.git

diff --git a/src/runtime/x86-64-arch.h b/src/runtime/x86-64-arch.h
index 4e3a18d..10df5d8 100644
--- a/src/runtime/x86-64-arch.h
+++ b/src/runtime/x86-64-arch.h
@@ -5,6 +5,12 @@
 #ifndef _X86_64_ARCH_H
 #define _X86_64_ARCH_H
 
+#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
@@ -12,17 +18,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,long value)
+#include "interr.h"
+
+static inline void
+get_spinlock(volatile lispobj *word,long value)
 {
 #ifdef LISP_FEATURE_SB_THREAD
     u64 rax=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" (rax)
-	     : "r" (value), "m" (*word)
-	     : "memory", "cc");
+#if defined(LISP_FEATURE_DARWIN)
+        asm ("xor %0,%0\n\
+              lock/cmpxchg %1,%2"
+             : "=a" (rax)
+             : "r" (value), "m" (*word)
+             : "memory", "cc");
+#else
+        asm ("xor %0,%0\n\
+              lock cmpxchg %1,%2"
+             : "=a" (rax)
+             : "r" (value), "m" (*word)
+             : "memory", "cc");
+#endif
     } while(rax!=0);
 #else
     *word=value;
@@ -30,9 +48,20 @@ get_spinlock(lispobj *word,long value)
 }
 
 static inline void
-release_spinlock(lispobj *word)
+release_spinlock(volatile lispobj *word)
 {
     *word=0;
 }
 
+static inline lispobj
+swap_lispobjs(volatile lispobj *dest, lispobj value)
+{
+    lispobj old_value;
+    asm ("lock xchg %0,(%1)"
+         : "=r" (old_value)
+         : "r" (dest), "0" (value)
+         : "memory");
+    return old_value;
+}
+
 #endif /* _X86_64_ARCH_H */