Skip to content

LL/SC: be flexible with ret type #9900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2022
Merged

LL/SC: be flexible with ret type #9900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions opal/include/opal/sys/arm64/atomic_llsc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@
# define opal_atomic_ll_32(addr, ret) \
do { \
opal_atomic_int32_t *_addr = (addr); \
int32_t _ret; \
\
__asm__ __volatile__("ldaxr %w0, [%1] \n" : "=&r"(_ret) : "r"(_addr)); \
\
ret = (typeof(ret)) _ret; \
__asm__ __volatile__("ldaxr %w0, [%1] \n" : "=&r"(ret) : "r"(_addr)); \
} while (0)

# define opal_atomic_sc_32(addr, newval, ret) \
Expand All @@ -62,11 +59,8 @@
# define opal_atomic_ll_64(addr, ret) \
do { \
opal_atomic_int64_t *_addr = (addr); \
int64_t _ret; \
\
__asm__ __volatile__("ldaxr %0, [%1] \n" : "=&r"(_ret) : "r"(_addr)); \
\
ret = (typeof(ret)) _ret; \
__asm__ __volatile__("ldaxr %0, [%1] \n" : "=&r"(ret) : "r"(_addr)); \
} while (0)

# define opal_atomic_sc_64(addr, newval, ret) \
Expand Down
8 changes: 2 additions & 6 deletions opal/include/opal/sys/powerpc/atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,7 @@ static inline bool opal_atomic_compare_exchange_strong_32(opal_atomic_int32_t *a
# define opal_atomic_ll_32(addr, ret) \
do { \
opal_atomic_int32_t *_addr = (addr); \
int32_t _ret; \
__asm__ __volatile__("lwarx %0, 0, %1 \n\t" : "=&r"(_ret) : "r"(_addr)); \
ret = (typeof(ret)) _ret; \
__asm__ __volatile__("lwarx %0, 0, %1 \n\t" : "=&r"(ret) : "r"(_addr)); \
} while (0)

# define opal_atomic_sc_32(addr, value, ret) \
Expand Down Expand Up @@ -248,9 +246,7 @@ static inline bool opal_atomic_compare_exchange_strong_64(opal_atomic_int64_t *a
# define opal_atomic_ll_64(addr, ret) \
do { \
opal_atomic_int64_t *_addr = (addr); \
int64_t _ret; \
__asm__ __volatile__("ldarx %0, 0, %1 \n\t" : "=&r"(_ret) : "r"(_addr)); \
ret = (typeof(ret)) _ret; \
__asm__ __volatile__("ldarx %0, 0, %1 \n\t" : "=&r"(ret) : "r"(_addr)); \
} while (0)

# define opal_atomic_sc_64(addr, value, ret) \
Expand Down