From 2b66816a4d88f1c15468b3d307b59f1242a6a4be Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 1 Mar 2019 13:56:44 +0100 Subject: [PATCH] mips32: pracc: Fix UPPER/LOWER macros 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 Reviewed-on: http://openocd.zylin.com/4994 Tested-by: jenkins Reviewed-by: Freddie Chopin --- src/target/mips32_pracc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h index 888c847c06..cc11540b8d 100644 --- a/src/target/mips32_pracc.h +++ b/src/target/mips32_pracc.h @@ -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)*/ -- 2.30.2