Fix uatomic sign cast

[urcu.git] / urcu / uatomic / x86.h

diff --git a/urcu/uatomic/x86.h b/urcu/uatomic/x86.h
index 9b67f1608d365830bd951382781ada35f91b6150..afe6e37a9d7bf455694077fcbbe3cb2c2dd3a8cb 100644 (file)
--- a/urcu/uatomic/x86.h
+++ b/urcu/uatomic/x86.h
@@ -102,8 +102,9 @@ 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),        \
+       ((__typeof__(*(addr))) __uatomic_cmpxchg((addr),                      \
+                                               caa_cast_long_keep_sign(old), \
+                                               caa_cast_long_keep_sign(_new),\
                                                sizeof(*(addr))))
 
 /* xchg */
@@ -163,7 +164,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))))
 
 /* uatomic_add_return */
@@ -226,10 +228,10 @@ unsigned long __uatomic_add_return(void *addr, unsigned long val,
        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))))
 
 /* uatomic_and */
 
@@ -283,7 +285,7 @@ void __uatomic_and(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_and(addr, v)                                             \
-       (__uatomic_and((addr), (unsigned long)(v), sizeof(*(addr))))
+       (__uatomic_and((addr), caa_cast_long_keep_sign(v), sizeof(*(addr))))
 
 /* uatomic_or */
 
@@ -337,7 +339,7 @@ void __uatomic_or(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_or(addr, v)                                              \
-       (__uatomic_or((addr), (unsigned long)(v), sizeof(*(addr))))
+       (__uatomic_or((addr), caa_cast_long_keep_sign(v), sizeof(*(addr))))
 
 /* uatomic_add */
 
@@ -391,7 +393,7 @@ void __uatomic_add(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_add(addr, v)                                             \
-       (__uatomic_add((addr), (unsigned long)(v), sizeof(*(addr))))
+       (__uatomic_add((addr), caa_cast_long_keep_sign(v), sizeof(*(addr))))
 
 
 /* uatomic_inc */
@@ -517,7 +519,7 @@ extern unsigned long _compat_uatomic_set(void *addr,
                                         unsigned long _new, int len);
 #define compat_uatomic_set(addr, _new)                                        \
        ((__typeof__(*(addr))) _compat_uatomic_set((addr),                     \
-                                               (unsigned long)(_new),         \
+                                               caa_cast_long_keep_sign(_new), \
                                                sizeof(*(addr))))
 
 
@@ -525,35 +527,35 @@ extern unsigned long _compat_uatomic_xchg(void *addr,
                                          unsigned long _new, int len);
 #define compat_uatomic_xchg(addr, _new)                                               \
        ((__typeof__(*(addr))) _compat_uatomic_xchg((addr),                    \
-                                               (unsigned long)(_new),         \
+                                               caa_cast_long_keep_sign(_new), \
                                                sizeof(*(addr))))
 
 extern unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old,
                                             unsigned long _new, int len);
 #define compat_uatomic_cmpxchg(addr, old, _new)                                       \
        ((__typeof__(*(addr))) _compat_uatomic_cmpxchg((addr),                 \
-                                               (unsigned long)(old),          \
-                                               (unsigned long)(_new),         \
+                                               caa_cast_long_keep_sign(old),  \
+                                               caa_cast_long_keep_sign(_new), \
                                                sizeof(*(addr))))
 
 extern void _compat_uatomic_and(void *addr, unsigned long _new, int len);
 #define compat_uatomic_and(addr, v)                                   \
        (_compat_uatomic_and((addr),                                   \
-                       (unsigned long)(v),                            \
+                       caa_cast_long_keep_sign(v),                    \
                        sizeof(*(addr))))
 
 extern void _compat_uatomic_or(void *addr, unsigned long _new, int len);
 #define compat_uatomic_or(addr, v)                                    \
        (_compat_uatomic_or((addr),                                    \
-                         (unsigned long)(v),                          \
+                         caa_cast_long_keep_sign(v),                  \
                          sizeof(*(addr))))
 
 extern unsigned long _compat_uatomic_add_return(void *addr,
                                                unsigned long _new, int len);
-#define compat_uatomic_add_return(addr, v)                            \
-       ((__typeof__(*(addr))) _compat_uatomic_add_return((addr),      \
-                                                  (unsigned long)(v), \
-                                                  sizeof(*(addr))))
+#define compat_uatomic_add_return(addr, v)                                 \
+       ((__typeof__(*(addr))) _compat_uatomic_add_return((addr),           \
+                                               caa_cast_long_keep_sign(v), \
+                                               sizeof(*(addr))))
 
 #define compat_uatomic_add(addr, v)                                           \
                ((void)compat_uatomic_add_return((addr), (v)))