Skip to content

R
riscv-gcc-1
Commit d572e439 by John David Anglin
Options

linux-atomic.c (__kernel_cmpxchg2): Reorder error checks. 

	* config/pa/linux-atomic.c (__kernel_cmpxchg2): Reorder error checks.
	(__sync_fetch_and_##OP##_##WIDTH): Change result to match type of
	__kernel_cmpxchg2.
	(__sync_##OP##_and_fetch_##WIDTH): Likewise.
	(__sync_val_compare_and_swap_##WIDTH): Likewise.
	(__sync_bool_compare_and_swap_##WIDTH): Likewise.
	(__sync_lock_test_and_set_##WIDTH): Likewise.
	(__sync_lock_release_##WIDTH): Likewise.
	(__sync_fetch_and_##OP##_4): Change result to match type of
	__kernel_cmpxchg.
	(__sync_##OP##_and_fetch_4): Likewise.
	(__sync_val_compare_and_swap_4): Likewise.
	(__sync_bool_compare_and_swap_4): likewise.
	(__sync_lock_test_and_set_4): Likewise.
	(__sync_lock_release_4): Likewise.
	(FETCH_AND_OP_2): Add long long variants.
	(OP_AND_FETCH_2): Likewise.
	(COMPARE_AND_SWAP_2 ): Likewise.
	(SYNC_LOCK_TEST_AND_SET_2): Likewise.
	(SYNC_LOCK_RELEASE_2): Likewise.
	(__sync_bool_compare_and_swap_##WIDTH): Correct return.

From-SVN: r228065
parent 9f59bddf
Showing with 68 additions and 16 deletions
libgcc/ChangeLog
2015-09-23 John David Anglin <danglin@gcc.gnu.org>
* config/pa/linux-atomic.c (__kernel_cmpxchg2): Reorder error checks.
(__sync_fetch_and_##OP##_##WIDTH): Change result to match type of
__kernel_cmpxchg2.
(__sync_##OP##_and_fetch_##WIDTH): Likewise.
(__sync_val_compare_and_swap_##WIDTH): Likewise.
(__sync_bool_compare_and_swap_##WIDTH): Likewise.
(__sync_lock_test_and_set_##WIDTH): Likewise.
(__sync_lock_release_##WIDTH): Likewise.
(__sync_fetch_and_##OP##_4): Change result to match type of
__kernel_cmpxchg.
(__sync_##OP##_and_fetch_4): Likewise.
(__sync_val_compare_and_swap_4): Likewise.
(__sync_bool_compare_and_swap_4): likewise.
(__sync_lock_test_and_set_4): Likewise.
(__sync_lock_release_4): Likewise.
(FETCH_AND_OP_2): Add long long variants.
(OP_AND_FETCH_2): Likewise.
(COMPARE_AND_SWAP_2 ): Likewise.
(SYNC_LOCK_TEST_AND_SET_2): Likewise.
(SYNC_LOCK_RELEASE_2): Likewise.
(__sync_bool_compare_and_swap_##WIDTH): Correct return.
2015-09-22 Kirill Yukhin <kirill.yukhin@intel.com> 2015-09-22 Kirill Yukhin <kirill.yukhin@intel.com>
* libgcc/config/i386/cpuinfo.c (enum processor_features): Add * libgcc/config/i386/cpuinfo.c (enum processor_features): Add
......
libgcc/config/pa/linux-atomic.c
...@@ -88,12 +88,17 @@ __kernel_cmpxchg2 (void *mem, const void *oldval, const void *newval, ...@@ -88,12 +88,17 @@ __kernel_cmpxchg2 (void *mem, const void *oldval, const void *newval,
: "i" (2) : "i" (2)
: "r1", "r20", "r22", "r29", "r31", "fr4", "memory" : "r1", "r20", "r22", "r29", "r31", "fr4", "memory"
); );
/* If the kernel LWS call is successful, lws_ret contains 0. */
if (__builtin_expect (lws_ret == 0, 1))
return 0;
if (__builtin_expect (lws_errno == -EFAULT || lws_errno == -ENOSYS, 0)) if (__builtin_expect (lws_errno == -EFAULT || lws_errno == -ENOSYS, 0))
__builtin_trap (); __builtin_trap ();
/* If the kernel LWS call fails, return EBUSY */ /* If the kernel LWS call fails with no error, return -EBUSY */
if (!lws_errno && lws_ret) if (__builtin_expect (!lws_errno, 0))
lws_errno = -EBUSY; return -EBUSY;
return lws_errno; return lws_errno;
} }
...@@ -111,7 +116,7 @@ __kernel_cmpxchg2 (void *mem, const void *oldval, const void *newval, ...@@ -111,7 +116,7 @@ __kernel_cmpxchg2 (void *mem, const void *oldval, const void *newval,
__sync_fetch_and_##OP##_##WIDTH (TYPE *ptr, TYPE val) \ __sync_fetch_and_##OP##_##WIDTH (TYPE *ptr, TYPE val) \
{ \ { \
TYPE tmp, newval; \ TYPE tmp, newval; \
int failure; \ long failure; \
\ \
do { \ do { \
tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \ tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \
...@@ -122,6 +127,13 @@ __kernel_cmpxchg2 (void *mem, const void *oldval, const void *newval, ...@@ -122,6 +127,13 @@ __kernel_cmpxchg2 (void *mem, const void *oldval, const void *newval,
return tmp; \ return tmp; \
} }
FETCH_AND_OP_2 (add, , +, long long, 8, 3)
FETCH_AND_OP_2 (sub, , -, long long, 8, 3)
FETCH_AND_OP_2 (or, , |, long long, 8, 3)
FETCH_AND_OP_2 (and, , &, long long, 8, 3)
FETCH_AND_OP_2 (xor, , ^, long long, 8, 3)
FETCH_AND_OP_2 (nand, ~, &, long long, 8, 3)
FETCH_AND_OP_2 (add, , +, short, 2, 1) FETCH_AND_OP_2 (add, , +, short, 2, 1)
FETCH_AND_OP_2 (sub, , -, short, 2, 1) FETCH_AND_OP_2 (sub, , -, short, 2, 1)
FETCH_AND_OP_2 (or, , |, short, 2, 1) FETCH_AND_OP_2 (or, , |, short, 2, 1)
...@@ -141,7 +153,7 @@ FETCH_AND_OP_2 (nand, ~, &, signed char, 1, 0) ...@@ -141,7 +153,7 @@ FETCH_AND_OP_2 (nand, ~, &, signed char, 1, 0)
__sync_##OP##_and_fetch_##WIDTH (TYPE *ptr, TYPE val) \ __sync_##OP##_and_fetch_##WIDTH (TYPE *ptr, TYPE val) \
{ \ { \
TYPE tmp, newval; \ TYPE tmp, newval; \
int failure; \ long failure; \
\ \
do { \ do { \
tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \ tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \
...@@ -152,6 +164,13 @@ FETCH_AND_OP_2 (nand, ~, &, signed char, 1, 0) ...@@ -152,6 +164,13 @@ FETCH_AND_OP_2 (nand, ~, &, signed char, 1, 0)
return PFX_OP (tmp INF_OP val); \ return PFX_OP (tmp INF_OP val); \
} }
OP_AND_FETCH_2 (add, , +, long long, 8, 3)
OP_AND_FETCH_2 (sub, , -, long long, 8, 3)
OP_AND_FETCH_2 (or, , |, long long, 8, 3)
OP_AND_FETCH_2 (and, , &, long long, 8, 3)
OP_AND_FETCH_2 (xor, , ^, long long, 8, 3)
OP_AND_FETCH_2 (nand, ~, &, long long, 8, 3)
OP_AND_FETCH_2 (add, , +, short, 2, 1) OP_AND_FETCH_2 (add, , +, short, 2, 1)
OP_AND_FETCH_2 (sub, , -, short, 2, 1) OP_AND_FETCH_2 (sub, , -, short, 2, 1)
OP_AND_FETCH_2 (or, , |, short, 2, 1) OP_AND_FETCH_2 (or, , |, short, 2, 1)
...@@ -170,7 +189,8 @@ OP_AND_FETCH_2 (nand, ~, &, signed char, 1, 0) ...@@ -170,7 +189,8 @@ OP_AND_FETCH_2 (nand, ~, &, signed char, 1, 0)
int HIDDEN \ int HIDDEN \
__sync_fetch_and_##OP##_4 (int *ptr, int val) \ __sync_fetch_and_##OP##_4 (int *ptr, int val) \
{ \ { \
int failure, tmp; \ int tmp; \
long failure; \
\ \
do { \ do { \
tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \ tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \
...@@ -191,7 +211,8 @@ FETCH_AND_OP_WORD (nand, ~, &) ...@@ -191,7 +211,8 @@ FETCH_AND_OP_WORD (nand, ~, &)
int HIDDEN \ int HIDDEN \
__sync_##OP##_and_fetch_4 (int *ptr, int val) \ __sync_##OP##_and_fetch_4 (int *ptr, int val) \
{ \ { \
int tmp, failure; \ int tmp; \
long failure; \
\ \
do { \ do { \
tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \ tmp = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \
...@@ -216,7 +237,7 @@ typedef unsigned char bool; ...@@ -216,7 +237,7 @@ typedef unsigned char bool;
TYPE newval) \ TYPE newval) \
{ \ { \
TYPE actual_oldval; \ TYPE actual_oldval; \
int fail; \ long fail; \
\ \
while (1) \ while (1) \
{ \ { \
...@@ -236,17 +257,19 @@ typedef unsigned char bool; ...@@ -236,17 +257,19 @@ typedef unsigned char bool;
__sync_bool_compare_and_swap_##WIDTH (TYPE *ptr, TYPE oldval, \ __sync_bool_compare_and_swap_##WIDTH (TYPE *ptr, TYPE oldval, \
TYPE newval) \ TYPE newval) \
{ \ { \
int failure = __kernel_cmpxchg2 (ptr, &oldval, &newval, INDEX); \ long failure = __kernel_cmpxchg2 (ptr, &oldval, &newval, INDEX); \
return (failure != 0); \ return (failure == 0); \
} }
COMPARE_AND_SWAP_2 (long long, 8, 3)
COMPARE_AND_SWAP_2 (short, 2, 1) COMPARE_AND_SWAP_2 (short, 2, 1)
COMPARE_AND_SWAP_2 (char, 1, 0) COMPARE_AND_SWAP_2 (char, 1, 0)
int HIDDEN int HIDDEN
__sync_val_compare_and_swap_4 (int *ptr, int oldval, int newval) __sync_val_compare_and_swap_4 (int *ptr, int oldval, int newval)
{ {
int actual_oldval, fail; long fail;
int actual_oldval;
while (1) while (1)
{ {
...@@ -265,7 +288,7 @@ __sync_val_compare_and_swap_4 (int *ptr, int oldval, int newval) ...@@ -265,7 +288,7 @@ __sync_val_compare_and_swap_4 (int *ptr, int oldval, int newval)
bool HIDDEN bool HIDDEN
__sync_bool_compare_and_swap_4 (int *ptr, int oldval, int newval) __sync_bool_compare_and_swap_4 (int *ptr, int oldval, int newval)
{ {
int failure = __kernel_cmpxchg (ptr, oldval, newval); long failure = __kernel_cmpxchg (ptr, oldval, newval);
return (failure == 0); return (failure == 0);
} }
...@@ -274,7 +297,7 @@ TYPE HIDDEN \ ...@@ -274,7 +297,7 @@ TYPE HIDDEN \
__sync_lock_test_and_set_##WIDTH (TYPE *ptr, TYPE val) \ __sync_lock_test_and_set_##WIDTH (TYPE *ptr, TYPE val) \
{ \ { \
TYPE oldval; \ TYPE oldval; \
int failure; \ long failure; \
\ \
do { \ do { \
oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \ oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \
...@@ -284,13 +307,15 @@ TYPE HIDDEN \ ...@@ -284,13 +307,15 @@ TYPE HIDDEN \
return oldval; \ return oldval; \
} }
SYNC_LOCK_TEST_AND_SET_2 (long long, 8, 3)
SYNC_LOCK_TEST_AND_SET_2 (short, 2, 1) SYNC_LOCK_TEST_AND_SET_2 (short, 2, 1)
SYNC_LOCK_TEST_AND_SET_2 (signed char, 1, 0) SYNC_LOCK_TEST_AND_SET_2 (signed char, 1, 0)
int HIDDEN int HIDDEN
__sync_lock_test_and_set_4 (int *ptr, int val) __sync_lock_test_and_set_4 (int *ptr, int val)
{ {
int failure, oldval; long failure;
int oldval;
do { do {
oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST);
...@@ -304,7 +329,8 @@ __sync_lock_test_and_set_4 (int *ptr, int val) ...@@ -304,7 +329,8 @@ __sync_lock_test_and_set_4 (int *ptr, int val)
void HIDDEN \ void HIDDEN \
__sync_lock_release_##WIDTH (TYPE *ptr) \ __sync_lock_release_##WIDTH (TYPE *ptr) \
{ \ { \
TYPE failure, oldval, zero = 0; \ TYPE oldval, zero = 0; \
long failure; \
\ \
do { \ do { \
oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \ oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); \
...@@ -312,13 +338,15 @@ __sync_lock_test_and_set_4 (int *ptr, int val) ...@@ -312,13 +338,15 @@ __sync_lock_test_and_set_4 (int *ptr, int val)
} while (failure != 0); \ } while (failure != 0); \
} }
SYNC_LOCK_RELEASE_2 (long long, 8, 3)
SYNC_LOCK_RELEASE_2 (short, 2, 1) SYNC_LOCK_RELEASE_2 (short, 2, 1)
SYNC_LOCK_RELEASE_2 (signed char, 1, 0) SYNC_LOCK_RELEASE_2 (signed char, 1, 0)
void HIDDEN void HIDDEN
__sync_lock_release_4 (int *ptr) __sync_lock_release_4 (int *ptr)
{ {
int failure, oldval; long failure;
int oldval;
do { do {
oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST); oldval = __atomic_load_n (ptr, __ATOMIC_SEQ_CST);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment