projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert to deleting kernel-level timer from cancellation handler
[musl]
/
arch
/
x86_64
/
atomic.h
diff --git
a/arch/x86_64/atomic.h
b/arch/x86_64/atomic.h
index
e74e453
..
04f6c28
100644
(file)
--- a/
arch/x86_64/atomic.h
+++ b/
arch/x86_64/atomic.h
@@
-5,33
+5,32
@@
static inline int a_ctz_64(uint64_t x)
{
static inline int a_ctz_64(uint64_t x)
{
- int r;
- __asm__( "bsf %1,%0 ; jnz 1f ; bsf %2,%0 ; addl $32,%0\n1:"
- : "=r"(r) : "r"((unsigned)x), "r"((unsigned)(x>>32)) );
+ long r;
+ __asm__( "bsf %1,%0" : "=r"(r) : "r"(x) );
return r;
}
static inline void a_and_64(volatile uint64_t *p, uint64_t v)
{
return r;
}
static inline void a_and_64(volatile uint64_t *p, uint64_t v)
{
- __asm__( "lock ; and
l %1, (%0) ; lock ; andl %2, 4(%0)
"
-
: : "r"((long *)p), "r"((unsigned)v), "r"((unsigned)(v>>32)
) : "memory" );
+ __asm__( "lock ; and
q %1, %0
"
+
: "=m"(*(long *)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 ; or
l %1, (%0) ; lock ; orl %2, 4(%0)
"
-
: : "r"((long *)p), "r"((unsigned)v), "r"((unsigned)(v>>32)
) : "memory" );
+ __asm__( "lock ; or
q %1, %0
"
+
: "=m"(*(long *)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)
{
- __asm__( "mov
l
%1, %0" : "=m"(*(long *)p) : "r"(x) : "memory" );
+ __asm__( "mov
q
%1, %0" : "=m"(*(long *)p) : "r"(x) : "memory" );
}
static inline void a_or_l(volatile void *p, long v)
{
}
static inline void a_or_l(volatile void *p, long v)
{
- __asm__( "lock ; or
l
%1, %0"
+ __asm__( "lock ; or
q
%1, %0"
: "=m"(*(long *)p) : "r"(v) : "memory" );
}
: "=m"(*(long *)p) : "r"(v) : "memory" );
}
@@
-49,6
+48,13
@@
static inline long a_cas_l(volatile void *p, long t, long s)
return t;
}
return t;
}
+static inline int a_cas(volatile int *p, int t, int s)
+{
+ __asm__( "lock ; cmpxchgl %3, %1"
+ : "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+ return t;
+}
+
static inline void *a_swap_p(void *volatile *x, void *v)
{
__asm__( "xchg %0, %1" : "=r"(v), "=m"(*(void **)x) : "0"(v) : "memory" );
static inline void *a_swap_p(void *volatile *x, void *v)
{
__asm__( "xchg %0, %1" : "=r"(v), "=m"(*(void **)x) : "0"(v) : "memory" );