2003-03-22 Jakub Jelinek <jakub@redhat.com>
authorroland <roland>
Sat, 22 Mar 2003 23:00:14 +0000 (23:00 +0000)
committerroland <roland>
Sat, 22 Mar 2003 23:00:14 +0000 (23:00 +0000)
* include/atomic.h (atomic_compare_and_exchange_val_acq): Add comment.
Don't define if __arch_compare_and_exchange_val_32_acq is not defined.
(atomic_compare_and_exchange_bool_acq): Add comment.  Don't use
__oldval variable in the macro, since it might be macro argument.
(atomic_decrement_if_positive): Initialize __memp, remove setting
of non-existent variable.
(atomic_bit_test_set): Cast 1 to __typeof (*mem) before shifting.
* sysdeps/ia64/bits/atomic.h (atomic_exchange_and_add): Implement
using atomic_compare_and_exchange_val_acq.
(atomic_decrement_if_positive, atomic_bit_test_set): Define.
* sysdeps/s390/bits/atomic.h (__arch_compare_and_exchange_val_8_acq):
Renamed from...
(__arch_compare_and_exchange_bool_8_acq): ... this.
(__arch_compare_and_exchange_val_16_acq): Renamed from...
(__arch_compare_and_exchange_bool_16_acq): ... this.
(__arch_compare_and_exchange_val_32_acq): Return old value.  Renamed
from...
(__arch_compare_and_exchange_bool_32_acq): ... this.
(__arch_compare_and_exchange_val_64_acq): Return old value.  Renamed
from...
(__arch_compare_and_exchange_bool_64_acq): ... this.
(__arch_compare_and_exchange_val_32_acq): Use __typeof for local
variables types instead of assuming int.
Change prefix of local variables to __arch.
* sysdeps/generic/bits/atomic.h (arch_compare_and_exchange_acq):
Remove.
(atomic_compare_and_exchange_val_acq,
atomic_compare_and_exchange_bool_acq): Define.

bits/atomic.h
sysdeps/generic/bits/atomic.h
sysdeps/ia64/bits/atomic.h
sysdeps/s390/bits/atomic.h

index 7595b40..6245130 100644 (file)
    up with real definitions.  */
 
 /* The only basic operation needed is compare and exchange.  */
-#define arch_compare_and_exchange_acq(mem, newval, oldval) \
-  ({ *(mem) == (oldval) ? 1 : (*(mem) = (newval), 0); })
+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __gmemp = (mem);                                 \
+     __typeof (*mem) __gret = *__gmemp;                                      \
+     __typeof (*mem) __gnewval = (newval);                           \
+                                                                     \
+     if (__gret == (oldval))                                         \
+       *__gmemp = __gnewval;                                         \
+     __gret; })
+
+#define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __gmemp = (mem);                                 \
+     __typeof (*mem) __gnewval = (newval);                           \
+                                                                     \
+     *__gmemp == (oldval) ? (*__gmemp = __gnewval, 0) : 1; })
 
 #endif /* bits/atomic.h */
index 7595b40..6245130 100644 (file)
    up with real definitions.  */
 
 /* The only basic operation needed is compare and exchange.  */
-#define arch_compare_and_exchange_acq(mem, newval, oldval) \
-  ({ *(mem) == (oldval) ? 1 : (*(mem) = (newval), 0); })
+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __gmemp = (mem);                                 \
+     __typeof (*mem) __gret = *__gmemp;                                      \
+     __typeof (*mem) __gnewval = (newval);                           \
+                                                                     \
+     if (__gret == (oldval))                                         \
+       *__gmemp = __gnewval;                                         \
+     __gret; })
+
+#define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __gmemp = (mem);                                 \
+     __typeof (*mem) __gnewval = (newval);                           \
+                                                                     \
+     *__gmemp == (oldval) ? (*__gmemp = __gnewval, 0) : 1; })
 
 #endif /* bits/atomic.h */
index 27789c0..68d79fa 100644 (file)
@@ -78,30 +78,49 @@ typedef uintmax_t uatomic_max_t;
   __sync_lock_test_and_set_si (mem, value)
 
 #define atomic_exchange_and_add(mem, value) \
-  ({                                                                         \
-    __typeof (*mem) __oldval, __val;                                         \
-    __typeof (mem) __memp = (mem);                                           \
-    __typeof (*mem) __value = (value);                                       \
+  ({ __typeof (*mem) __oldval, __val;                                        \
+     __typeof (mem) __memp = (mem);                                          \
+     __typeof (*mem) __value = (value);                                              \
                                                                              \
-    __val = *__memp;                                                         \
-    if (sizeof (*mem) == 4)                                                  \
-      do                                                                     \
-       {                                                                     \
-         __oldval = __val;                                                   \
-         __val = __arch_compare_and_exchange_32_val_acq (__memp,             \
-                                                         __oldval + __value, \
-                                                         __oldval);          \
-       }                                                                     \
-      while (__builtin_expect (__val != __oldval, 0));                       \
-    else if (sizeof (*mem) == 8)                                             \
-      do                                                                     \
-       {                                                                     \
-         __oldval = __val;                                                   \
-         __val = __arch_compare_and_exchange_64_val_acq (__memp,             \
-                                                         __oldval + __value, \
-                                                         __oldval);          \
-       }                                                                     \
-      while (__builtin_expect (__val != __oldval, 0));                       \
-    else                                                                     \
-      abort ();                                                                      \
-    __oldval + __value; })
+     __val = (*__memp);                                                              \
+     do                                                                              \
+       {                                                                     \
+        __oldval = __val;                                                    \
+        __val = atomic_compare_and_exchange_val_acq (__memp,                 \
+                                                     __oldval + __value,     \
+                                                     __oldval);              \
+       }                                                                     \
+     while (__builtin_expect (__val != __oldval, 0));                        \
+     __oldval; })
+
+#define atomic_decrement_if_positive(mem) \
+  ({ __typeof (*mem) __oldval, __val;                                        \
+     __typeof (mem) __memp = (mem);                                          \
+                                                                             \
+     __val = (*__memp);                                                              \
+     do                                                                              \
+       {                                                                     \
+        __oldval = __val;                                                    \
+        if (__builtin_expect (__val <= 0, 0))                                \
+          break;                                                             \
+        __val = atomic_compare_and_exchange_val_acq (__memp,   __oldval - 1, \
+                                                     __oldval);              \
+       }                                                                     \
+     while (__builtin_expect (__val != __oldval, 0));                        \
+     __oldval; })
+
+#define atomic_bit_test_set(mem, bit) \
+  ({ __typeof (*mem) __oldval, __val;                                        \
+     __typeof (mem) __memp = (mem);                                          \
+     __typeof (*mem) __mask = ((__typeof (*mem)) 1 << (bit));                \
+                                                                             \
+     __val = (*__memp);                                                              \
+     do                                                                              \
+       {                                                                     \
+        __oldval = __val;                                                    \
+        __val = atomic_compare_and_exchange_val_acq (__memp,                 \
+                                                     __oldval | __mask,      \
+                                                     __oldval);              \
+       }                                                                     \
+     while (__builtin_expect (__val != __oldval, 0));                        \
+     __oldval & __mask; })
index 74321b6..8504458 100644 (file)
@@ -45,34 +45,32 @@ typedef intmax_t atomic_max_t;
 typedef uintmax_t uatomic_max_t;
 
 
-#define __arch_compare_and_exchange_bool_8_acq(mem, newval, oldval) \
+#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
   (abort (), 0)
 
-#define __arch_compare_and_exchange_bool_16_acq(mem, newval, oldval) \
+#define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \
   (abort (), 0)
 
-#define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \
-  ({ unsigned int *__mem = (unsigned int *) (mem);                           \
-     unsigned int __old = (unsigned int) (oldval);                           \
-     unsigned int __cmp = __old;                                             \
+#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __archmem = (mem);                                       \
+     __typeof (*mem) __archold = (oldval);                                   \
      __asm __volatile ("cs %0,%2,%1"                                         \
-                      : "+d" (__old), "=Q" (*__mem)                          \
-                      : "d" (newval), "m" (*__mem) : "cc" );                 \
-     __cmp != __old; })
+                      : "+d" (__archold), "=Q" (*__archmem)                  \
+                      : "d" (newval), "m" (*__archmem) : "cc" );             \
+     __archold; })
 
 #ifdef __s390x__
-# define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \
-  ({ unsigned long int *__mem = (unsigned long int *) (mem);                 \
-     unsigned long int __old = (unsigned long int) (oldval);                 \
-     unsigned long int __cmp = __old;                                        \
+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __archmem = (mem);                                       \
+     __typeof (*mem) __archold = (oldval);                                   \
      __asm __volatile ("csg %0,%2,%1"                                        \
-                      : "+d" (__old), "=Q" (*__mem)                          \
-                      : "d" (newval), "m" (*__mem) : "cc" );                 \
-     __cmp != __old; })
+                      : "+d" (__archold), "=Q" (*__archmem)                  \
+                      : "d" (newval), "m" (*__archmem) : "cc" );             \
+     __archold; })
 #else
 /* For 31 bit we do not really need 64-bit compare-and-exchange. We can
    implement them by use of the csd instruction. The straightforward
    implementation causes warnings so we skip the definition for now.  */
-# define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \
+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
   (abort (), 0)
 #endif