X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fuatomic%2Fgeneric.h;fp=urcu%2Fuatomic%2Fgeneric.h;h=04f4afd715800dd02446183d183c4f896de142c1;hp=bf7cc6aa05172b5072368ae381d60fc1aa31a6d3;hb=e56d99bf2046a163875df80bab5195f38606dfde;hpb=7d5dc80de0522da1b8bc3656646ea39c15481594

diff --git a/urcu/uatomic/generic.h b/urcu/uatomic/generic.h
index bf7cc6a..04f4afd 100644
--- a/urcu/uatomic/generic.h
+++ b/urcu/uatomic/generic.h
@@ -81,9 +81,10 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 }
 
 
-#define uatomic_cmpxchg(addr, old, _new)				    \
-	((__typeof__(*(addr))) _uatomic_cmpxchg((addr), (unsigned long)(old),\
-						(unsigned long)(_new), 	    \
+#define uatomic_cmpxchg(addr, old, _new)				      \
+	((__typeof__(*(addr))) _uatomic_cmpxchg((addr),			      \
+						caa_cast_long_keep_sign(old), \
+						caa_cast_long_keep_sign(_new),\
 						sizeof(*(addr))))
 
 
@@ -119,8 +120,8 @@ void _uatomic_and(void *addr, unsigned long val,
 
 #define uatomic_and(addr, v)			\
 	(_uatomic_and((addr),			\
-		      (unsigned long)(v),	\
-		      sizeof(*(addr))))
+		caa_cast_long_keep_sign(v),	\
+		sizeof(*(addr))))
 #endif
 
 /* uatomic_or */
@@ -156,8 +157,8 @@ void _uatomic_or(void *addr, unsigned long val,
 
 #define uatomic_or(addr, v)			\
 	(_uatomic_or((addr),			\
-		     (unsigned long)(v),	\
-		     sizeof(*(addr))))
+		caa_cast_long_keep_sign(v),	\
+		sizeof(*(addr))))
 #endif
 
 /* uatomic_add_return */
@@ -188,10 +189,10 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 }
 
 
-#define uatomic_add_return(addr, v)					\
-	((__typeof__(*(addr))) _uatomic_add_return((addr),		\
-						  (unsigned long)(v),	\
-						  sizeof(*(addr))))
+#define uatomic_add_return(addr, v)					    \
+	((__typeof__(*(addr))) _uatomic_add_return((addr),		    \
+						caa_cast_long_keep_sign(v), \
+						sizeof(*(addr))))
 #endif /* #ifndef uatomic_add_return */
 
 #ifndef uatomic_xchg
@@ -253,7 +254,8 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 }
 
 #define uatomic_xchg(addr, v)						    \
-	((__typeof__(*(addr))) _uatomic_exchange((addr), (unsigned long)(v), \
+	((__typeof__(*(addr))) _uatomic_exchange((addr),		    \
+						caa_cast_long_keep_sign(v), \
 						sizeof(*(addr))))
 #endif /* #ifndef uatomic_xchg */
 
@@ -322,10 +324,10 @@ void _uatomic_and(void *addr, unsigned long val, int len)
 	_uatomic_link_error();
 }
 
-#define uatomic_and(addr, v)		\
-	(_uatomic_and((addr),		\
-		    (unsigned long)(v),	\
-		    sizeof(*(addr))))
+#define uatomic_and(addr, v)			\
+	(_uatomic_and((addr),			\
+		caa_cast_long_keep_sign(v),	\
+		sizeof(*(addr))))
 #endif /* #ifndef uatomic_and */
 
 #ifndef uatomic_or
@@ -393,10 +395,10 @@ void _uatomic_or(void *addr, unsigned long val, int len)
 	_uatomic_link_error();
 }
 
-#define uatomic_or(addr, v)		\
-	(_uatomic_or((addr),		\
-		     (unsigned long)(v),\
-		     sizeof(*(addr))))
+#define uatomic_or(addr, v)			\
+	(_uatomic_or((addr),			\
+		caa_cast_long_keep_sign(v),	\
+		sizeof(*(addr))))
 #endif /* #ifndef uatomic_or */
 
 #ifndef uatomic_add_return
@@ -469,10 +471,10 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
 	return 0;
 }
 
-#define uatomic_add_return(addr, v)					\
-	((__typeof__(*(addr))) _uatomic_add_return((addr),		\
-						  (unsigned long)(v),	\
-						  sizeof(*(addr))))
+#define uatomic_add_return(addr, v)					    \
+	((__typeof__(*(addr))) _uatomic_add_return((addr),		    \
+						caa_cast_long_keep_sign(v), \
+						sizeof(*(addr))))
 #endif /* #ifndef uatomic_add_return */
 
 #ifndef uatomic_xchg
@@ -546,7 +548,8 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 }
 
 #define uatomic_xchg(addr, v)						    \
-	((__typeof__(*(addr))) _uatomic_exchange((addr), (unsigned long)(v), \
+	((__typeof__(*(addr))) _uatomic_exchange((addr),		    \
+						caa_cast_long_keep_sign(v), \
 						sizeof(*(addr))))
 #endif /* #ifndef uatomic_xchg */
 
@@ -558,8 +561,10 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 #define uatomic_add(addr, v)		(void)uatomic_add_return((addr), (v))
 #endif
 
-#define uatomic_sub_return(addr, v)	uatomic_add_return((addr), -(v))
-#define uatomic_sub(addr, v)		uatomic_add((addr), -(v))
+#define uatomic_sub_return(addr, v)	\
+	uatomic_add_return((addr), -(caa_cast_long_keep_sign(v)))
+#define uatomic_sub(addr, v)		\
+	uatomic_add((addr), -(caa_cast_long_keep_sign(v)))
 
 #ifndef uatomic_inc
 #define uatomic_inc(addr)		uatomic_add((addr), 1)