fix: UINTxx_C macro usage
UINTxx_C macro from standard library [1] accepts a scalar/constant value
and concatenates the C standard modifier (U, UL) to make it an unsigned
integer value.
The macro is not meant to be fed with expressions such as masks
e.g. UINT32_C(1 << 3)
The end result is concatenation of the U modifier to the tail of the
expression which is probably not the desired operation.
Most of the code base uses UINTxx_C macro with a single integer value as
parameter, although there are few places where expressions are used.
This change updates the latter to only use constants.
[1] https://git.trustedfirmware.org/hafnium/prebuilts.git/tree/linux-x64/clang/lib64/clang/12.0.5/include/stdint.h#n378
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I205646171e4b673b6507838f2211efa4c275753c
diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index cd64d68..9323ff5 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -59,7 +59,7 @@
/*
* Target function IDs for framework messages from the SPMD.
*/
-#define SPMD_FWK_MSG_BIT UINT64_C(1 << 31)
+#define SPMD_FWK_MSG_BIT (UINT64_C(1) << 31)
#define SPMD_FWK_MSG_FUNC_MASK UINT64_C(0xFF)
#define SPMD_FWK_MSG_PSCI UINT8_C(0)
#define SPMD_FWK_MSG_FFA_VERSION_REQ UINT8_C(0x8)
diff --git a/src/arch/aarch64/mm.c b/src/arch/aarch64/mm.c
index faccd67..64adfef 100644
--- a/src/arch/aarch64/mm.c
+++ b/src/arch/aarch64/mm.c
@@ -94,7 +94,7 @@
/* The following construct and destruct stage-2 memory attributes. */
#define STAGE2_MEMATTR(outer, inner) ((((outer) << 2) | (inner)) << 2)
-#define STAGE2_MEMATTR_TYPE_MASK UINT64_C(3 << 4)
+#define STAGE2_MEMATTR_TYPE_MASK (UINT64_C(3) << 4)
#define STAGE2_ACCESS_READ UINT64_C(1)
#define STAGE2_ACCESS_WRITE UINT64_C(2)