add uatomic_generic.h, use it for common definitions

[urcu.git] / urcu / uatomic_arch_x86.h

diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic_arch_x86.h
index 8e0f0a80e67eba76e9a30d4d709e8cc10a42c70a..e358be3673552dd9919ca6579e2c83071410157a 100644 (file)
--- a/urcu/uatomic_arch_x86.h
+++ b/urcu/uatomic_arch_x86.h
@@ -23,6 +23,10 @@
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #ifndef __SIZEOF_LONG__
 #if defined(__x86_64__) || defined(__amd64__)
 #define __SIZEOF_LONG__ 8
@@ -45,7 +49,6 @@ struct __uatomic_dummy {
 #define __hp(x)        ((struct __uatomic_dummy *)(x))
 
 #define _uatomic_set(addr, v)  STORE_SHARED(*(addr), (v))
-#define _uatomic_read(addr)    LOAD_SHARED(*(addr))
 
 /* cmpxchg */
 
@@ -172,7 +175,7 @@ unsigned long __uatomic_exchange(void *addr, unsigned long val, int len)
        ((__typeof__(*(addr))) __uatomic_exchange((addr), (unsigned long)(v), \
                                                sizeof(*(addr))))
 
-/* uatomic_add_return, uatomic_sub_return */
+/* uatomic_add_return */
 
 static inline __attribute__((always_inline))
 unsigned long __uatomic_add_return(void *addr, unsigned long val,
@@ -237,9 +240,7 @@ unsigned long __uatomic_add_return(void *addr, unsigned long val,
                                                  (unsigned long)(v),   \
                                                  sizeof(*(addr))))
 
-#define _uatomic_sub_return(addr, v)   _uatomic_add_return((addr), -(v))
-
-/* uatomic_add, uatomic_sub */
+/* uatomic_add */
 
 static inline __attribute__((always_inline))
 void __uatomic_add(void *addr, unsigned long val, int len)
@@ -293,8 +294,6 @@ void __uatomic_add(void *addr, unsigned long val, int len)
 #define _uatomic_add(addr, v)                                             \
        (__uatomic_add((addr), (unsigned long)(v), sizeof(*(addr))))
 
-#define _uatomic_sub(addr, v)  _uatomic_add((addr), -(v))
-
 
 /* uatomic_inc */
 
@@ -402,15 +401,15 @@ void __uatomic_dec(void *addr, int len)
 
 #define _uatomic_dec(addr)     (__uatomic_dec((addr), sizeof(*(addr))))
 
-#if ((BITS_PER_LONG != 64) && defined(CONFIG_URCU_COMPAT_ARCH))
-extern int __urcu_cas_avail;
-extern int __urcu_cas_init(void);
+#if ((BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
+extern int __rcu_cas_avail;
+extern int __rcu_cas_init(void);
 
 #define UATOMIC_COMPAT(insn)                                                   \
-       ((likely(__urcu_cas_avail > 0))                                         \
+       ((likely(__rcu_cas_avail > 0))                                          \
        ? (_uatomic_##insn)                                                     \
-               : ((unlikely(__urcu_cas_avail < 0)                              \
-                       ? ((__urcu_cas_init() > 0)                              \
+               : ((unlikely(__rcu_cas_avail < 0)                               \
+                       ? ((__rcu_cas_init() > 0)                               \
                                ? (_uatomic_##insn)                             \
                                : (compat_uatomic_##insn))                      \
                        : (compat_uatomic_##insn))))
@@ -445,37 +444,36 @@ extern unsigned long _compat_uatomic_xchg(void *addr,
                                                (unsigned long)(v),            \
                                                sizeof(*(addr))))
 
-#define compat_uatomic_sub_return(addr, v)                                    \
-               compat_uatomic_add_return((addr), -(v))
 #define compat_uatomic_add(addr, v)                                           \
                ((void)compat_uatomic_add_return((addr), (v)))
-#define compat_uatomic_sub(addr, v)                                           \
-               ((void)compat_uatomic_sub_return((addr), (v)))
 #define compat_uatomic_inc(addr)                                              \
                (compat_uatomic_add((addr), 1))
 #define compat_uatomic_dec(addr)                                              \
-               (compat_uatomic_sub((addr), 1))
+               (compat_uatomic_add((addr), -1))
 
 #else
 #define UATOMIC_COMPAT(insn)   (_uatomic_##insn)
 #endif
 
 /* Read is atomic even in compat mode */
-#define uatomic_read(addr)     _uatomic_read(addr)
-
 #define uatomic_set(addr, v)                   \
                UATOMIC_COMPAT(set(addr, v))
+
 #define uatomic_cmpxchg(addr, old, _new)       \
                UATOMIC_COMPAT(cmpxchg(addr, old, _new))
 #define uatomic_xchg(addr, v)                  \
                UATOMIC_COMPAT(xchg(addr, v))
 #define uatomic_add_return(addr, v)            \
                UATOMIC_COMPAT(add_return(addr, v))
-#define uatomic_sub_return(addr, v)            \
-               UATOMIC_COMPAT(sub_return(addr, v))
+
 #define uatomic_add(addr, v)   UATOMIC_COMPAT(add(addr, v))
-#define uatomic_sub(addr, v)   UATOMIC_COMPAT(sub(addr, v))
 #define uatomic_inc(addr)      UATOMIC_COMPAT(inc(addr))
 #define uatomic_dec(addr)      UATOMIC_COMPAT(dec(addr))
 
+#ifdef __cplusplus 
+}
+#endif
+
+#include <urcu/uatomic_generic.h>
+
 #endif /* _URCU_ARCH_UATOMIC_X86_H */