X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.h;h=30363db9df20a1def6ecbd8c304d3526b52da293;hb=91e1d65670542ceb7c177423f25b53d250c9d9cb;hp=7fe1aa053f8f9d6e0d01c2cae0c6333fd8159215;hpb=a499f2c9099d1dc2cb4227a2505eb4cc6f310e24;p=sbcl.git

diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h
index 7fe1aa0..30363db 100644
--- a/src/runtime/x86-arch.h
+++ b/src/runtime/x86-arch.h
@@ -9,6 +9,8 @@
 #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
@@ -19,18 +21,27 @@
 #include "interr.h"
 
 static inline void
-get_spinlock(volatile lispobj *word,long value)
+get_spinlock(volatile lispobj *word, unsigned long value)
 {
 #ifdef LISP_FEATURE_SB_THREAD
     u32 eax=0;
     if(*word==value)
         lose("recursive get_spinlock: 0x%x,%ld\n",word,value);
     do {
+#if defined(LISP_FEATURE_DARWIN)
+        asm ("xor %0,%0;\n\
+              lock/cmpxchg %1,%2"
+             : "=a" (eax)
+             : "r" (value), "m" (*word)
+             : "memory", "cc");
+#else
         asm ("xor %0,%0\n\
               lock cmpxchg %1,%2"
              : "=a" (eax)
              : "r" (value), "m" (*word)
              : "memory", "cc");
+#endif
+
     } while(eax!=0);
 #else
     *word=value;
@@ -49,10 +60,17 @@ static inline lispobj
 swap_lispobjs(volatile lispobj *dest, lispobj value)
 {
     lispobj old_value;
+#if defined(LISP_FEATURE_DARWIN)
+    asm ("lock/xchg %0,(%1)"
+         : "=r" (old_value)
+         : "r" (dest), "0" (value)
+         : "memory");
+#else
     asm ("lock xchg %0,(%1)"
          : "=r" (old_value)
          : "r" (dest), "0" (value)
          : "memory");
+#endif
     return old_value;
 }