Browse Source

correct pointer types for a_ll_p and a_sc_p primitives on mips64

these changes should not affect generated code, but they reflect that
the underlying objects operated on by a_cas_p are supposed to have
type volatile void *, not volatile long. in theory a compiler could
treat the effective type mismatch in the "m" memory operands as
undefined behavior.
Rich Felker 9 years ago
parent
commit
de400b6609
1 changed files with 4 additions and 4 deletions
  1. 4 4
      arch/mips64/atomic_arch.h

+ 4 - 4
arch/mips64/atomic_arch.h

@@ -19,22 +19,22 @@ static inline int a_sc(volatile int *p, int v)
 }
 
 #define a_ll_p a_ll_p
-static inline void *a_ll_p(volatile long *p)
+static inline void *a_ll_p(volatile void *p)
 {
 	void *v;
 	__asm__ __volatile__ (
 		"lld %0, %1"
-		: "=r"(v) : "m"(*p));
+		: "=r"(v) : "m"(*(void *volatile *)p));
 	return v;
 }
 
 #define a_sc_p a_sc_p
-static inline int a_sc_p(volatile long *p, void *v)
+static inline int a_sc_p(volatile void *p, void *v)
 {
 	long r;
 	__asm__ __volatile__ (
 		"scd %0, %1"
-		: "=r"(r), "=m"(*p) : "0"(v) : "memory");
+		: "=r"(r), "=m"(*(void *volatile *)p) : "0"(v) : "memory");
 	return r;
 }