Commit 5bf67094 authored by Max Filippov's avatar Max Filippov

xtensa: use "m" constraint instead of "a" in bitops.h assembly

Use "m" constraint instead of "r" for the address, as "m" allows
compiler to access adjacent locations using base + offset, while "r"
requires updating the base register every time.
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent e4449170
...@@ -150,13 +150,14 @@ static inline void op##_bit(unsigned int bit, volatile unsigned long *p)\ ...@@ -150,13 +150,14 @@ static inline void op##_bit(unsigned int bit, volatile unsigned long *p)\
p += bit >> 5; \ p += bit >> 5; \
\ \
__asm__ __volatile__( \ __asm__ __volatile__( \
"1: l32i %[value], %[addr], 0\n" \ "1: l32i %[value], %[mem]\n" \
" wsr %[value], scompare1\n" \ " wsr %[value], scompare1\n" \
" "insn" %[tmp], %[value], %[mask]\n" \ " "insn" %[tmp], %[value], %[mask]\n" \
" s32c1i %[tmp], %[addr], 0\n" \ " s32c1i %[tmp], %[mem]\n" \
" bne %[tmp], %[value], 1b\n" \ " bne %[tmp], %[value], 1b\n" \
: [tmp] "=&a" (tmp), [value] "=&a" (value) \ : [tmp] "=&a" (tmp), [value] "=&a" (value), \
: [mask] "a" (inv mask), [addr] "a" (p) \ [mem] "+m" (*p) \
: [mask] "a" (inv mask) \
: "memory"); \ : "memory"); \
} }
...@@ -170,13 +171,14 @@ test_and_##op##_bit(unsigned int bit, volatile unsigned long *p) \ ...@@ -170,13 +171,14 @@ test_and_##op##_bit(unsigned int bit, volatile unsigned long *p) \
p += bit >> 5; \ p += bit >> 5; \
\ \
__asm__ __volatile__( \ __asm__ __volatile__( \
"1: l32i %[value], %[addr], 0\n" \ "1: l32i %[value], %[mem]\n" \
" wsr %[value], scompare1\n" \ " wsr %[value], scompare1\n" \
" "insn" %[tmp], %[value], %[mask]\n" \ " "insn" %[tmp], %[value], %[mask]\n" \
" s32c1i %[tmp], %[addr], 0\n" \ " s32c1i %[tmp], %[mem]\n" \
" bne %[tmp], %[value], 1b\n" \ " bne %[tmp], %[value], 1b\n" \
: [tmp] "=&a" (tmp), [value] "=&a" (value) \ : [tmp] "=&a" (tmp), [value] "=&a" (value), \
: [mask] "a" (inv mask), [addr] "a" (p) \ [mem] "+m" (*p) \
: [mask] "a" (inv mask) \
: "memory"); \ : "memory"); \
\ \
return tmp & mask; \ return tmp & mask; \
......
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