fix broken cancellation on x32 due to incorrect saved-PC offset

[musl] / arch / microblaze / atomic.h

diff --git a/arch/microblaze/atomic.h b/arch/microblaze/atomic.h
index ee7aa25..93404b9 100644 (file)
--- a/arch/microblaze/atomic.h
+++ b/arch/microblaze/atomic.h
@@ -22,19 +22,6 @@ static inline int a_ctz_64(uint64_t x)
        return a_ctz_l(y);
 }
 
-static inline int a_cas_1(volatile int *p, int t, int s)
-{
-       register int tmp;
-       do {
-               __asm__ __volatile__ ("lwx %0, %1, r0"
-                       : "=r"(tmp) : "r"(p) : "memory");
-               if (tmp != t) return tmp;
-               __asm__ __volatile__ ("swx %2, %1, r0 ; addic %0, r0, 0"
-                       : "=r"(tmp) : "r"(p), "r"(s) : "cc", "memory");
-       } while (tmp);
-       return t;
-}
-
 static inline int a_cas(volatile int *p, int t, int s)
 {
        register int old, tmp;
@@ -58,11 +45,6 @@ static inline void *a_cas_p(volatile void *p, void *t, void *s)
        return (void *)a_cas(p, (int)t, (int)s);
 }
 
-static inline long a_cas_l(volatile void *p, long t, long s)
-{
-       return a_cas(p, t, s);
-}
-
 static inline int a_swap(volatile int *x, int v)
 {
        register int old, tmp;
@@ -108,11 +90,16 @@ static inline void a_dec(volatile int *x)
 
 static inline void a_store(volatile int *p, int x)
 {
-       *p=x;
+       __asm__ __volatile__ (
+               "swi %1, %0"
+               : "=m"(*p) : "r"(x) : "memory" );
 }
 
-static inline void a_spin()
+#define a_spin a_barrier
+
+static inline void a_barrier()
 {
+       a_cas(&(int){0}, 0, 0);
 }
 
 static inline void a_crash()
@@ -134,6 +121,11 @@ static inline void a_or(volatile int *p, int v)
        while (a_cas(p, old, old|v) != old);
 }
 
+static inline void a_or_l(volatile void *p, long v)
+{
+       a_or(p, v);
+}
+
 static inline void a_and_64(volatile uint64_t *p, uint64_t v)
 {
        union { uint64_t v; uint32_t r[2]; } u = { v };