Browse Source

fix inconsistency in a_and and a_or argument types on x86[_64]

conceptually, and on other archs, these functions take a pointer to
int, but in the i386, x86_64, and x32 versions of atomic.h, they took
a pointer to void instead.
master
Rich Felker 11 years ago
parent
commit
c648cefb27
  1. 8
      arch/i386/atomic.h
  2. 8
      arch/x32/atomic.h
  3. 8
      arch/x86_64/atomic.h

8
arch/i386/atomic.h

@ -50,16 +50,16 @@ static inline int a_cas(volatile int *p, int t, int s)
return t; return t;
} }
static inline void a_or(volatile void *p, int v) static inline void a_or(volatile int *p, int v)
{ {
__asm__( "lock ; orl %1, %0" __asm__( "lock ; orl %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline void a_and(volatile void *p, int v) static inline void a_and(volatile int *p, int v)
{ {
__asm__( "lock ; andl %1, %0" __asm__( "lock ; andl %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline int a_swap(volatile int *x, int v) static inline int a_swap(volatile int *x, int v)

8
arch/x32/atomic.h

@ -47,16 +47,16 @@ static inline int a_cas(volatile int *p, int t, int s)
return t; return t;
} }
static inline void a_or(volatile void *p, int v) static inline void a_or(volatile int *p, int v)
{ {
__asm__( "lock ; or %1, %0" __asm__( "lock ; or %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline void a_and(volatile void *p, int v) static inline void a_and(volatile int *p, int v)
{ {
__asm__( "lock ; and %1, %0" __asm__( "lock ; and %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline int a_swap(volatile int *x, int v) static inline int a_swap(volatile int *x, int v)

8
arch/x86_64/atomic.h

@ -47,16 +47,16 @@ static inline int a_cas(volatile int *p, int t, int s)
return t; return t;
} }
static inline void a_or(volatile void *p, int v) static inline void a_or(volatile int *p, int v)
{ {
__asm__( "lock ; or %1, %0" __asm__( "lock ; or %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline void a_and(volatile void *p, int v) static inline void a_and(volatile int *p, int v)
{ {
__asm__( "lock ; and %1, %0" __asm__( "lock ; and %1, %0"
: "=m"(*(int *)p) : "r"(v) : "memory" ); : "=m"(*p) : "r"(v) : "memory" );
} }
static inline int a_swap(volatile int *x, int v) static inline int a_swap(volatile int *x, int v)

Loading…
Cancel
Save