X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fuatomic_generic.h;h=f65b398988143a126a664635ad3bbcf8ce1fefeb;hp=6e2c23e3841b9bbf4f0ba3b6d20e0ea3be0ad8cc;hb=3d02c34dba0edc4a3554a3862a2ae96d77b3b4e8;hpb=8760d94e0ef6d52260765a9246aaac073613055e

diff --git a/urcu/uatomic_generic.h b/urcu/uatomic_generic.h
index 6e2c23e..f65b398 100644
--- a/urcu/uatomic_generic.h
+++ b/urcu/uatomic_generic.h
@@ -28,10 +28,6 @@
 extern "C" {
 #endif
 
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-
 #ifndef uatomic_set
 #define uatomic_set(addr, v)	STORE_SHARED(*(addr), (v))
 #endif
@@ -65,6 +61,14 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 			      unsigned long _new, int len)
 {
 	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+		return __sync_val_compare_and_swap_1(addr, old, _new);
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+		return __sync_val_compare_and_swap_2(addr, old, _new);
+#endif
 	case 4:
 		return __sync_val_compare_and_swap_4(addr, old, _new);
 #if (BITS_PER_LONG == 64)
@@ -91,6 +95,14 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 				 int len)
 {
 	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+		return __sync_add_and_fetch_1(addr, val);
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+		return __sync_add_and_fetch_2(addr, val);
+#endif
 	case 4:
 		return __sync_add_and_fetch_4(addr, val);
 #if (BITS_PER_LONG == 64)
@@ -116,15 +128,39 @@ static inline __attribute__((always_inline))
 unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 {
 	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+	{
+		unsigned char old;
+
+		do {
+			old = uatomic_read((unsigned char *)addr);
+		} while (!__sync_bool_compare_and_swap_1(addr, old, val));
+
+		return old;
+	}
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+	{
+		unsigned short old;
+
+		do {
+			old = uatomic_read((unsigned short *)addr);
+		} while (!__sync_bool_compare_and_swap_2(addr, old, val));
+
+		return old;
+	}
+#endif
 	case 4:
 	{
 		unsigned int old;
 
 		do {
 			old = uatomic_read((unsigned int *)addr);
-		while (!__sync_bool_compare_and_swap_4(addr, old, val));
+		} while (!__sync_bool_compare_and_swap_4(addr, old, val));
 
-		} return old;
+		return old;
 	}
 #if (BITS_PER_LONG == 64)
 	case 8:
@@ -157,6 +193,34 @@ static inline __attribute__((always_inline))
 unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
 {
 	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+	{
+		unsigned char old, oldt;
+
+		oldt = uatomic_read((unsigned char *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, old + val, 1);
+		} while (oldt != old);
+
+		return old + val;
+	}
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+	{
+		unsigned short old, oldt;
+
+		oldt = uatomic_read((unsigned short *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, old + val, 2);
+		} while (oldt != old);
+
+		return old + val;
+	}
+#endif
 	case 4:
 	{
 		unsigned int old, oldt;
@@ -201,6 +265,34 @@ static inline __attribute__((always_inline))
 unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 {
 	switch (len) {
+#ifdef UATOMIC_HAS_ATOMIC_BYTE
+	case 1:
+	{
+		unsigned char old, oldt;
+
+		oldt = uatomic_read((unsigned char *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, val, 1);
+		} while (oldt != old);
+
+		return old;
+	}
+#endif
+#ifdef UATOMIC_HAS_ATOMIC_SHORT
+	case 2:
+	{
+		unsigned short old, oldt;
+
+		oldt = uatomic_read((unsigned short *)addr);
+		do {
+			old = oldt;
+			oldt = _uatomic_cmpxchg(addr, old, val, 2);
+		} while (oldt != old);
+
+		return old;
+	}
+#endif
 	case 4:
 	{
 		unsigned int old, oldt;