From 3b27725385614d44add9351191765181edc3f4c1 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sun, 31 Jan 2016 16:33:44 +0100 Subject: [PATCH] better a_sc inline asm constraint on aarch64 and arm "Q" input constraint was used for the written object, instead of "=Q" output constraint. this should not cause problems because "memory" is on the clobber list, but "=Q" better documents the intent and more consistent with the actual asm code. this changes the generated code, because different registers are used, but other than the register names nothing should change. --- arch/aarch64/atomic_arch.h | 4 ++-- arch/arm/atomic_arch.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/aarch64/atomic_arch.h b/arch/aarch64/atomic_arch.h index 6b4f1a4d..af93d879 100644 --- a/arch/aarch64/atomic_arch.h +++ b/arch/aarch64/atomic_arch.h @@ -10,7 +10,7 @@ static inline int a_ll(volatile int *p) static inline int a_sc(volatile int *p, int v) { int r; - __asm__ __volatile__ ("stlxr %w0,%w1,%2" : "=&r"(r) : "r"(v), "Q"(*p) : "memory"); + __asm__ __volatile__ ("stlxr %w0,%w2,%1" : "=&r"(r), "=Q"(*p) : "r"(v) : "memory"); return !r; } @@ -44,7 +44,7 @@ static inline void *a_ll_p(volatile void *p) static inline int a_sc_p(volatile int *p, void *v) { int r; - __asm__ __volatile__ ("stlxr %w0,%1,%2" : "=&r"(r) : "r"(v), "Q"(*(void *volatile *)p) : "memory"); + __asm__ __volatile__ ("stlxr %w0,%2,%1" : "=&r"(r), "=Q"(*(void *volatile *)p) : "r"(v) : "memory"); return !r; } diff --git a/arch/arm/atomic_arch.h b/arch/arm/atomic_arch.h index 21db6b22..706fa1f2 100644 --- a/arch/arm/atomic_arch.h +++ b/arch/arm/atomic_arch.h @@ -16,7 +16,7 @@ static inline int a_ll(volatile int *p) static inline int a_sc(volatile int *p, int v) { int r; - __asm__ __volatile__ ("strex %0,%1,%2" : "=&r"(r) : "r"(v), "Q"(*p) : "memory"); + __asm__ __volatile__ ("strex %0,%2,%1" : "=&r"(r), "=Q"(*p) : "r"(v) : "memory"); return !r; } -- 2.25.1