X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fuatomic_arch_x86.h;h=07b3244fd190b648babad23fe2c87e95ada57b9b;hp=e358be3673552dd9919ca6579e2c83071410157a;hb=b39e1761c4ccb070fcda1b86dc4ff0c66a853299;hpb=8760d94e0ef6d52260765a9246aaac073613055e

diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic_arch_x86.h
index e358be3..07b3244 100644
--- a/urcu/uatomic_arch_x86.h
+++ b/urcu/uatomic_arch_x86.h
@@ -23,22 +23,13 @@
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 
+#define UATOMIC_HAS_ATOMIC_BYTE
+#define UATOMIC_HAS_ATOMIC_SHORT
+
 #ifdef __cplusplus
 extern "C" {
 #endif 
 
-#ifndef __SIZEOF_LONG__
-#if defined(__x86_64__) || defined(__amd64__)
-#define __SIZEOF_LONG__ 8
-#else
-#define __SIZEOF_LONG__ 4
-#endif
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-
 /*
  * Derived from AO_compare_and_swap() and AO_test_and_set_full().
  */
@@ -48,7 +39,7 @@ struct __uatomic_dummy {
 };
 #define __hp(x)	((struct __uatomic_dummy *)(x))
 
-#define _uatomic_set(addr, v)	STORE_SHARED(*(addr), (v))
+#define _uatomic_set(addr, v)	CAA_STORE_SHARED(*(addr), (v))
 
 /* cmpxchg */
 
@@ -90,7 +81,7 @@ unsigned long __uatomic_cmpxchg(void *addr, unsigned long old,
 			: "memory");
 		return result;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result = old;
@@ -152,7 +143,7 @@ unsigned long __uatomic_exchange(void *addr, unsigned long val, int len)
 			: "memory");
 		return result;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result;
@@ -215,7 +206,7 @@ unsigned long __uatomic_add_return(void *addr, unsigned long val,
 			: "memory");
 		return result + (unsigned int)val;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result = val;
@@ -273,7 +264,7 @@ void __uatomic_add(void *addr, unsigned long val, int len)
 			: "memory");
 		return;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -328,7 +319,7 @@ void __uatomic_inc(void *addr, int len)
 			: "memory");
 		return;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -381,7 +372,7 @@ void __uatomic_dec(void *addr, int len)
 			: "memory");
 		return;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -401,7 +392,7 @@ void __uatomic_dec(void *addr, int len)
 
 #define _uatomic_dec(addr)	(__uatomic_dec((addr), sizeof(*(addr))))
 
-#if ((BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
+#if ((CAA_CAA_BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
 extern int __rcu_cas_avail;
 extern int __rcu_cas_init(void);