mips32: pracc: Fix UPPER/LOWER macros 94/4994/2
authorMarek Vasut <marek.vasut@gmail.com>
Fri, 1 Mar 2019 12:56:44 +0000 (13:56 +0100)
committerFreddie Chopin <freddie.chopin@gmail.com>
Sat, 23 Mar 2019 17:43:17 +0000 (17:43 +0000)
These macros are missing parenthesis around the argument, which can
lead to side effects, add them. Replace the argument name to avoid
conflict with uint32_t data type, since the macro can be applied to
other data types as well.

Change-Id: I32d2ffec6c062795d7c8bb23d1dfa3378bfc3a58
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Reviewed-on: http://openocd.zylin.com/4994
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
src/target/mips32_pracc.h

index 888c847..cc11540 100644 (file)
@@ -39,8 +39,8 @@
 #define PRACC_OUT_OFFSET                       (MIPS32_PRACC_PARAM_OUT - MIPS32_PRACC_BASE_ADDR)
 
 #define MIPS32_FASTDATA_HANDLER_SIZE   0x80
-#define UPPER16(uint32_t)                              (uint32_t >> 16)
-#define LOWER16(uint32_t)                              (uint32_t & 0xFFFF)
+#define UPPER16(addr)                          ((addr) >> 16)
+#define LOWER16(addr)                          ((addr) & 0xFFFF)
 #define NEG16(v)                                               (((~(v)) + 1) & 0xFFFF)
 #define SWAP16(v)                              ((LOWER16(v) << 16) | (UPPER16(v)))
 /*#define NEG18(v) (((~(v)) + 1) & 0x3FFFF)*/