Update 386 cmpxchg support

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index 33bfdeecae3351a4b339481eb253b342434ece76..c0533c9d3281af0f613e7490ce18e67594bf75e4 100644 (file)
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -78,7 +78,10 @@
                if (!__builtin_constant_p(_new) ||                      \
                    ((_new) != NULL))                                   \
                        wmb();                                          \
-               uatomic_cmpxchg(p, _________pold, _________pnew);       \
+               (likely(URCU_CAS_AVAIL()) ?                             \
+                       (uatomic_cmpxchg(p, _________pold, _________pnew)) : \
+                       (compat_uatomic_cmpxchg(p, _________pold,       \
+                                               _________pnew)))        \
        })
 
 /**

diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic_arch_x86.h
index fccea8e2d350321ebe9cbf4517a68866e4b5fa19..dfb58763a37259b88a8962f9bd607767d5c59a3a 100644 (file)
--- a/urcu/uatomic_arch_x86.h
+++ b/urcu/uatomic_arch_x86.h
@@ -402,7 +402,13 @@ void _uatomic_dec(void *addr, int len)
 #define compat_uatomic_cmpxchg(ptr, old, _new) uatomic_cmpxchg(ptr, old, _new)
 #else
 extern int __urcu_cas_avail;
-#define URCU_CAS_AVAIL()       __urcu_cas_avail
+extern int __urcu_cas_init(void);
+#define URCU_CAS_AVAIL()                                               \
+               ((likely(__urcu_cas_avail > 0)) ?                       \
+                       (1) :                                           \
+                       ((unlikely(__urcu_cas_avail < 0) ?              \
+                               (__urcu_cas_init()) :                   \
+                               (0))))
 
 extern unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old,
                              unsigned long _new, int len);