X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fpseudo-atomic.h;h=40898c7105c1e5aa3e3af1d4f5859a3185dca7f2;hb=4c400df29038a283e6b4df2d835d5b9c5201d0dd;hp=9636e5b3a4e2bedb765285479776138963aa3318;hpb=de0a47a2f2b165f34177669bd9499135847b4897;p=sbcl.git

diff --git a/src/runtime/pseudo-atomic.h b/src/runtime/pseudo-atomic.h
index 9636e5b..40898c7 100644
--- a/src/runtime/pseudo-atomic.h
+++ b/src/runtime/pseudo-atomic.h
@@ -34,18 +34,19 @@
 static inline int
 get_pseudo_atomic_atomic(struct thread *thread)
 {
-    return fixnum_value(SymbolValue(PSEUDO_ATOMIC_BITS, thread) &
-                        make_fixnum(1));
+    return SymbolValue(PSEUDO_ATOMIC_BITS, thread) & (~1);
 }
 
 static inline void
 set_pseudo_atomic_atomic(struct thread *thread)
 {
     lispobj *p = SymbolValueAddress(PSEUDO_ATOMIC_BITS, thread);
+    if (*p)
+        lose("set_pseudo_atomic_atomic: pseudo atomic bits is %d.", *p);
     __asm__ __volatile__
         ("or" LISPOBJ_ASM_SUFFIX " %0,%1"
          :
-         : "g" (make_fixnum(1)), "m" (*p)
+         : "g" (~1), "m" (*p)
          : "memory");
 }
 
@@ -56,36 +57,39 @@ clear_pseudo_atomic_atomic(struct thread *thread)
     __asm__ __volatile__
         ("and" LISPOBJ_ASM_SUFFIX " %0,%1"
          :
-         : "g" (~make_fixnum(1)), "m" (*p)
+         : "g" (1), "m" (*p)
          : "memory");
 }
 
 static inline int
 get_pseudo_atomic_interrupted(struct thread *thread)
 {
-    return fixnum_value(SymbolValue(PSEUDO_ATOMIC_BITS, thread) &
-                        make_fixnum(2));
+    return SymbolValue(PSEUDO_ATOMIC_BITS, thread) & 1;
 }
 
 static inline void
 set_pseudo_atomic_interrupted(struct thread *thread)
 {
+    if (!get_pseudo_atomic_atomic(thread))
+        lose("set_pseudo_atomic_interrupted not in pseudo atomic");
     lispobj *p = SymbolValueAddress(PSEUDO_ATOMIC_BITS, thread);
     __asm__ __volatile__
         ("or" LISPOBJ_ASM_SUFFIX " %0,%1"
          :
-         : "g" (make_fixnum(2)), "m" (*p)
+         : "g" (1), "m" (*p)
          : "memory");
 }
 
 static inline void
 clear_pseudo_atomic_interrupted(struct thread *thread)
 {
+    if (get_pseudo_atomic_atomic(thread))
+        lose("clear_pseudo_atomic_interrupted in pseudo atomic");
     lispobj *p = SymbolValueAddress(PSEUDO_ATOMIC_BITS, thread);
     __asm__ __volatile__
         ("and" LISPOBJ_ASM_SUFFIX " %0,%1"
          :
-         : "g" (~make_fixnum(2)), "m" (*p)
+         : "g" (~1), "m" (*p)
          : "memory");
 }