nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

x86, asm: change the GEN_*_RMWcc() macros to not quote the condition

Browse source 
Change the lexical defintion of the GEN_*_RMWcc() macros to not take
the condition code as a quoted string.  This will help support
changing them to use the new __GCC_ASM_FLAG_OUTPUTS__ feature in a
subsequent patch.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/1465414726-197858-4-git-send-email-hpa@linux.intel.com
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
This commit is contained in:
H. Peter Anvin 2016-06-08 12:38:39 -07:00 committed by H. Peter Anvin
parent 117780eef7
commit 18fe58229d
6 changed files with 18 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/include/asm/atomic.h
View file

@ -77,7 +77,7 @@ static __always_inline void atomic_sub(int i, atomic_t *v)
*/ */
static __always_inline bool atomic_sub_and_test(int i, atomic_t *v) static __always_inline bool atomic_sub_and_test(int i, atomic_t *v)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e"); GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", e);
} }
/** /**
@ -114,7 +114,7 @@ static __always_inline void atomic_dec(atomic_t *v)
*/ */
static __always_inline bool atomic_dec_and_test(atomic_t *v) static __always_inline bool atomic_dec_and_test(atomic_t *v)
{ {
GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e"); GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", e);
} }
/** /**
@ -127,7 +127,7 @@ static __always_inline bool atomic_dec_and_test(atomic_t *v)
*/ */
static __always_inline bool atomic_inc_and_test(atomic_t *v) static __always_inline bool atomic_inc_and_test(atomic_t *v)
{ {
GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e"); GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", e);
} }
/** /**
@ -141,7 +141,7 @@ static __always_inline bool atomic_inc_and_test(atomic_t *v)
*/ */
static __always_inline bool atomic_add_negative(int i, atomic_t *v) static __always_inline bool atomic_add_negative(int i, atomic_t *v)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s"); GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", s);
} }
/** /**

8
arch/x86/include/asm/atomic64_64.h
View file

@ -72,7 +72,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
*/ */
static inline bool atomic64_sub_and_test(long i, atomic64_t *v) static inline bool atomic64_sub_and_test(long i, atomic64_t *v)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e"); GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", e);
} }
/** /**
@ -111,7 +111,7 @@ static __always_inline void atomic64_dec(atomic64_t *v)
*/ */
static inline bool atomic64_dec_and_test(atomic64_t *v) static inline bool atomic64_dec_and_test(atomic64_t *v)
{ {
GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e"); GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", e);
} }
/** /**
@ -124,7 +124,7 @@ static inline bool atomic64_dec_and_test(atomic64_t *v)
*/ */
static inline bool atomic64_inc_and_test(atomic64_t *v) static inline bool atomic64_inc_and_test(atomic64_t *v)
{ {
GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e"); GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", e);
} }
/** /**
@ -138,7 +138,7 @@ static inline bool atomic64_inc_and_test(atomic64_t *v)
*/ */
static inline bool atomic64_add_negative(long i, atomic64_t *v) static inline bool atomic64_add_negative(long i, atomic64_t *v)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s"); GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", s);
} }
/** /**

6
arch/x86/include/asm/bitops.h
View file

@ -203,7 +203,7 @@ static __always_inline void change_bit(long nr, volatile unsigned long *addr)
*/ */
static __always_inline bool test_and_set_bit(long nr, volatile unsigned long *addr) static __always_inline bool test_and_set_bit(long nr, volatile unsigned long *addr)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c"); GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", c);
} }
/** /**
@ -249,7 +249,7 @@ static __always_inline bool __test_and_set_bit(long nr, volatile unsigned long *
*/ */
static __always_inline bool test_and_clear_bit(long nr, volatile unsigned long *addr) static __always_inline bool test_and_clear_bit(long nr, volatile unsigned long *addr)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c"); GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", c);
} }
/** /**
@ -302,7 +302,7 @@ static __always_inline bool __test_and_change_bit(long nr, volatile unsigned lon
*/ */
static __always_inline bool test_and_change_bit(long nr, volatile unsigned long *addr) static __always_inline bool test_and_change_bit(long nr, volatile unsigned long *addr)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c"); GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", c);
} }
static __always_inline bool constant_test_bit(long nr, const volatile unsigned long *addr) static __always_inline bool constant_test_bit(long nr, const volatile unsigned long *addr)

8
arch/x86/include/asm/local.h
View file

@ -52,7 +52,7 @@ static inline void local_sub(long i, local_t *l)
*/ */
static inline bool local_sub_and_test(long i, local_t *l) static inline bool local_sub_and_test(long i, local_t *l)
{ {
GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e"); GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", e);
} }
/** /**
@ -65,7 +65,7 @@ static inline bool local_sub_and_test(long i, local_t *l)
*/ */
static inline bool local_dec_and_test(local_t *l) static inline bool local_dec_and_test(local_t *l)
{ {
GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e"); GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", e);
} }
/** /**
@ -78,7 +78,7 @@ static inline bool local_dec_and_test(local_t *l)
*/ */
static inline bool local_inc_and_test(local_t *l) static inline bool local_inc_and_test(local_t *l)
{ {
GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e"); GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", e);
} }
/** /**
@ -92,7 +92,7 @@ static inline bool local_inc_and_test(local_t *l)
*/ */
static inline bool local_add_negative(long i, local_t *l) static inline bool local_add_negative(long i, local_t *l)
{ {
GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s"); GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", s);
} }
/** /**

2
arch/x86/include/asm/preempt.h
View file

@ -81,7 +81,7 @@ static __always_inline void __preempt_count_sub(int val)
*/ */
static __always_inline bool __preempt_count_dec_and_test(void) static __always_inline bool __preempt_count_dec_and_test(void)
{ {
GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e"); GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), e);
} }
/* /*

4
arch/x86/include/asm/rmwcc.h
View file

@ -5,7 +5,7 @@
#define __GEN_RMWcc(fullop, var, cc, ...) \ #define __GEN_RMWcc(fullop, var, cc, ...) \
do { \ do { \
asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \ asm_volatile_goto (fullop "; j" #cc " %l[cc_label]" \
: : "m" (var), ## __VA_ARGS__ \ : : "m" (var), ## __VA_ARGS__ \
: "memory" : cc_label); \ : "memory" : cc_label); \
return 0; \ return 0; \
@ -24,7 +24,7 @@ cc_label: \
#define __GEN_RMWcc(fullop, var, cc, ...) \ #define __GEN_RMWcc(fullop, var, cc, ...) \
do { \ do { \
bool c; \ bool c; \
asm volatile (fullop "; set" cc " %1" \ asm volatile (fullop "; set" #cc " %1" \
: "+m" (var), "=qm" (c) \ : "+m" (var), "=qm" (c) \
: __VA_ARGS__ : "memory"); \ : __VA_ARGS__ : "memory"); \
return c; \ return c; \