projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LOAD_SHARED and STORE_SHARED should have CMM_ prefix
[urcu.git]
/
urcu
/
uatomic_generic.h
diff --git
a/urcu/uatomic_generic.h
b/urcu/uatomic_generic.h
index 9ee7b7bdc22a6bedeef45ef6447d930162375c99..347e73f849bc9a354c7c023ece400b7837ff1048 100644
(file)
--- a/
urcu/uatomic_generic.h
+++ b/
urcu/uatomic_generic.h
@@
-28,16
+28,12
@@
extern "C" {
#endif
extern "C" {
#endif
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG (__SIZEOF_LONG__ * 8)
-#endif
-
#ifndef uatomic_set
#ifndef uatomic_set
-#define uatomic_set(addr, v) STORE_SHARED(*(addr), (v))
+#define uatomic_set(addr, v)
CMM_
STORE_SHARED(*(addr), (v))
#endif
#ifndef uatomic_read
#endif
#ifndef uatomic_read
-#define uatomic_read(addr) LOAD_SHARED(*(addr))
+#define uatomic_read(addr)
CMM_
LOAD_SHARED(*(addr))
#endif
#if !defined __OPTIMIZE__ || defined UATOMIC_NO_LINK_ERROR
#endif
#if !defined __OPTIMIZE__ || defined UATOMIC_NO_LINK_ERROR
@@
-75,7
+71,7
@@
unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
#endif
case 4:
return __sync_val_compare_and_swap_4(addr, old, _new);
#endif
case 4:
return __sync_val_compare_and_swap_4(addr, old, _new);
-#if (BITS_PER_LONG == 64)
+#if (
CAA_
BITS_PER_LONG == 64)
case 8:
return __sync_val_compare_and_swap_8(addr, old, _new);
#endif
case 8:
return __sync_val_compare_and_swap_8(addr, old, _new);
#endif
@@
-109,7
+105,7
@@
unsigned long _uatomic_add_return(void *addr, unsigned long val,
#endif
case 4:
return __sync_add_and_fetch_4(addr, val);
#endif
case 4:
return __sync_add_and_fetch_4(addr, val);
-#if (BITS_PER_LONG == 64)
+#if (
CAA_
BITS_PER_LONG == 64)
case 8:
return __sync_add_and_fetch_8(addr, val);
#endif
case 8:
return __sync_add_and_fetch_8(addr, val);
#endif
@@
-162,11
+158,11
@@
unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
do {
old = uatomic_read((unsigned int *)addr);
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)
+#if (
CAA_
BITS_PER_LONG == 64)
case 8:
{
unsigned long old;
case 8:
{
unsigned long old;
@@
-237,7
+233,7
@@
unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
return old + val;
}
return old + val;
}
-#if (BITS_PER_LONG == 64)
+#if (
CAA_
BITS_PER_LONG == 64)
case 8:
{
unsigned long old, oldt;
case 8:
{
unsigned long old, oldt;
@@
-309,7
+305,7
@@
unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
return old;
}
return old;
}
-#if (BITS_PER_LONG == 64)
+#if (
CAA_
BITS_PER_LONG == 64)
case 8:
{
unsigned long old, oldt;
case 8:
{
unsigned long old, oldt;
This page took
0.023779 seconds
and
4
git commands to generate.