remove gratuitous temp vars, casts, and suffixes in x86_64 atomic.h

aside from general cleanup, this should allow the identical atomic.h
file to be used for the upcoming x32 port.
This commit is contained in:
Rich Felker 2014-01-11 19:37:09 -05:00
parent f29e834d98
commit 311736516e

View File

@ -5,28 +5,26 @@
static inline int a_ctz_64(uint64_t x) static inline int a_ctz_64(uint64_t x)
{ {
long r; __asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
__asm__( "bsf %1,%0" : "=r"(r) : "r"(x) ); return x;
return r;
} }
static inline int a_ctz_l(unsigned long x) static inline int a_ctz_l(unsigned long x)
{ {
long r; __asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
__asm__( "bsf %1,%0" : "=r"(r) : "r"(x) ); return x;
return r;
} }
static inline void a_and_64(volatile uint64_t *p, uint64_t v) static inline void a_and_64(volatile uint64_t *p, uint64_t v)
{ {
__asm__( "lock ; andq %1, %0" __asm__( "lock ; and %1, %0"
: "=m"(*(long *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline void a_or_64(volatile uint64_t *p, uint64_t v) static inline void a_or_64(volatile uint64_t *p, uint64_t v)
{ {
__asm__( "lock ; orq %1, %0" __asm__( "lock ; or %1, %0"
: "=m"(*(long *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline void a_store_l(volatile void *p, long x) static inline void a_store_l(volatile void *p, long x)
@ -56,7 +54,7 @@ static inline long a_cas_l(volatile void *p, long t, long s)
static inline int a_cas(volatile int *p, int t, int s) static inline int a_cas(volatile int *p, int t, int s)
{ {
__asm__( "lock ; cmpxchgl %3, %1" __asm__( "lock ; cmpxchg %3, %1"
: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" ); : "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
return t; return t;
} }
@ -74,13 +72,13 @@ static inline long a_swap_l(volatile void *x, long v)
static inline void a_or(volatile void *p, int v) static inline void a_or(volatile void *p, int v)
{ {
__asm__( "lock ; orl %1, %0" __asm__( "lock ; or %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*(int *)p) : "r"(v) : "memory" );
} }
static inline void a_and(volatile void *p, int v) static inline void a_and(volatile void *p, int v)
{ {
__asm__( "lock ; andl %1, %0" __asm__( "lock ; and %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*(int *)p) : "r"(v) : "memory" );
} }