X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Friscv64%2Fatomic_arch.h;h=0c382588686c48ed5af2b8dcf9f816c0aacbea9e;hb=329e79299daaa994b8e75941331a1093051ea5d9;hp=98f12fc7cb965ebe377ce1add7847136c2f0de69;hpb=0a48860c27a8eb291bcc7616ea9eb073dc660cab;p=musl

diff --git a/arch/riscv64/atomic_arch.h b/arch/riscv64/atomic_arch.h
index 98f12fc7..0c382588 100644
--- a/arch/riscv64/atomic_arch.h
+++ b/arch/riscv64/atomic_arch.h
@@ -8,13 +8,15 @@ static inline void a_barrier()
 static inline int a_cas(volatile int *p, int t, int s)
 {
 	int old, tmp;
-	__asm__("\n1:	lr.w.aqrl %0, %2\n"
+	__asm__ __volatile__ (
+		"\n1:	lr.w.aqrl %0, (%2)\n"
 		"	bne %0, %3, 1f\n"
-		"	sc.w.aqrl %1, %4, %2\n"
+		"	sc.w.aqrl %1, %4, (%2)\n"
 		"	bnez %1, 1b\n"
 		"1:"
-		: "=&r"(old), "+r"(tmp), "+A"(*p)
-		: "r"(t), "r"(s));
+		: "=&r"(old), "=&r"(tmp)
+		: "r"(p), "r"((long)t), "r"((long)s)
+		: "memory");
 	return old;
 }
 
@@ -23,12 +25,14 @@ static inline void *a_cas_p(volatile void *p, void *t, void *s)
 {
 	void *old;
 	int tmp;
-	__asm__("\n1:	lr.d.aqrl %0, %2\n"
+	__asm__ __volatile__ (
+		"\n1:	lr.d.aqrl %0, (%2)\n"
 		"	bne %0, %3, 1f\n"
-		"	sc.d.aqrl %1, %4, %2\n"
+		"	sc.d.aqrl %1, %4, (%2)\n"
 		"	bnez %1, 1b\n"
 		"1:"
-		: "=&r"(old), "+r"(tmp), "+A"(*(long *)p)
-		: "r"(t), "r"(s));
+		: "=&r"(old), "=&r"(tmp)
+		: "r"(p), "r"(t), "r"(s)
+		: "memory");
 	return old;
 }