From 80dc5addb6cdb1d4c689e9a3e66a19ea248ca8d2 Mon Sep 17 00:00:00 2001
From: Ayrton Munoz <ayrton@google.com>
Date: Fri, 23 Sep 2022 03:27:23 -0400
Subject: Switch to PRIxPTR format specifier macros

LK defines uintptr_t as `unsigned long` for every arch, but
musl defines it as `unsigned int` for ARM so this switches
%lx to PRIxPTR when printing `uintptr_t`s. It also adds PRI
macros for the paddr_t, vaddr_t and addr_t typedefs and
changes the definition of PRIxPTR_USER when IS_64BIT is
false.

Bug: 230134581
Change-Id: I8bb5adef690a65adf426816f51313db3b1df9c3a
---
 dev/interrupt/arm_gic/arm_gic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dev')

diff --git a/dev/interrupt/arm_gic/arm_gic.c b/dev/interrupt/arm_gic/arm_gic.c
index de65fb65..06e4a11e 100644
--- a/dev/interrupt/arm_gic/arm_gic.c
+++ b/dev/interrupt/arm_gic/arm_gic.c
@@ -36,6 +36,7 @@
 #include <arch/ops.h>
 #include <platform/gic.h>
 #include <trace.h>
+#include <inttypes.h>
 #if WITH_LIB_SM
 #include <lib/sm.h>
 #include <lib/sm/sm_err.h>
@@ -544,7 +545,7 @@ enum handler_return __platform_irq(struct iframe *frame)
 
     uint cpu = arch_curr_cpu_num();
 
-    LTRACEF_LEVEL(2, "iar 0x%x cpu %u currthread %p vector %d pc 0x%lx\n", iar, cpu,
+    LTRACEF_LEVEL(2, "iar 0x%x cpu %u currthread %p vector %d pc 0x%" PRIxPTR "\n", iar, cpu,
                   get_current_thread(), vector, (uintptr_t)IFRAME_PC(frame));
 
     // deliver the interrupt
-- 
cgit v1.2.3