1.0.3.11: Fix deportation gc safety bug

[sbcl.git] / src / runtime / x86-64-arch.h

diff --git a/src/runtime/x86-64-arch.h b/src/runtime/x86-64-arch.h
index 83e08fb..2085503 100644 (file)
--- a/src/runtime/x86-64-arch.h
+++ b/src/runtime/x86-64-arch.h
@@ -16,21 +16,21 @@
  * here? (The answer wasn't obvious to me when merging the
  * architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
 
-extern never_returns lose(char *fmt, ...);
+#include "interr.h"
 
-static inline void 
+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);
+    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");
+        asm ("xor %0,%0\n\
+              lock cmpxchg %1,%2"
+             : "=a" (rax)
+             : "r" (value), "m" (*word)
+             : "memory", "cc");
     } while(rax!=0);
 #else
     *word=value;
@@ -43,4 +43,15 @@ 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 */