M src/arm/common.h → src/arm/common.h

@@ -18,23 +18,27 @@ #define UNUSED(V) (void)(V)
 
 #if defined(__PPC__) || defined(__POWERPC__)
 #define LOAD_32(DEST, ADDR, ARR) { \
-	uint32_t _tmp = (ADDR); \
-	asm("lwbrx %0, %1, %2" : "=r"(DEST) : "r"(_tmp), "p"(ARR)); \
+	uint32_t _addr = (ADDR); \
+	void* _ptr = (ARR); \
+	asm("lwbrx %0, %1, %2" : "=r"(DEST) : "b"(_ptr), "r"(_addr)); \
 }
 
 #define LOAD_16(DEST, ADDR, ARR) { \
-	uint32_t _tmp = (ADDR); \
-	asm("lhbrx %0, %1, %2" : "=r"(DEST) : "r"(_tmp), "p"(ARR)); \
+	uint32_t _addr = (ADDR); \
+	void* _ptr = (ARR); \
+	asm("lhbrx %0, %1, %2" : "=r"(DEST) : "b"(_ptr), "r"(_addr)); \
 }
 
 #define STORE_32(SRC, ADDR, ARR) { \
-	uint32_t _tmp = (ADDR); \
-	asm("stwbrx %0, %1, %2" : : "r"(SRC), "r"(_tmp), "p"(ARR)); \
+	uint32_t _addr = (ADDR); \
+	void* _ptr = (ARR); \
+	asm("stwbrx %0, %1, %2" : : "r"(SRC), "b"(_ptr), "r"(_addr)); \
 }
 
 #define STORE_16(SRC, ADDR, ARR) { \
-	uint32_t _tmp = (ADDR); \
-	asm("sthbrx %0, %1, %2" : : "r"(SRC), "r"(_tmp), "p"(ARR)); \
+	uint32_t _addr = (ADDR); \
+	void* _ptr = (ARR); \
+	asm("sthbrx %0, %1, %2" : : "r"(SRC), "b"(_ptr), "r"(_addr)); \
 }
 #else
 #define LOAD_32(DEST, ADDR, ARR) DEST = ((uint32_t*) ARR)[(ADDR) >> 2]