aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/arm/arch.c5
-rw-r--r--arch/arm/arm/faults.c3
-rw-r--r--arch/arm/arm/mmu.c21
-rw-r--r--arch/arm/arm/thread.c3
-rw-r--r--dev/interrupt/arm_gic/arm_gic.c3
-rw-r--r--include/arch/usercopy.h3
-rw-r--r--include/sys/types.h6
-rw-r--r--kernel/vm/aslr.c2
-rw-r--r--kernel/vm/physmem.c5
-rw-r--r--kernel/vm/pmm.c21
-rw-r--r--kernel/vm/vm.c13
-rw-r--r--kernel/vm/vmm.c15
-rw-r--r--lib/debug/debug.c3
-rw-r--r--lib/heap/miniheap/miniheap.c9
14 files changed, 65 insertions, 47 deletions
diff --git a/arch/arm/arm/arch.c b/arch/arm/arm/arch.c
index 3e7cdfbf..c198a56c 100644
--- a/arch/arm/arm/arch.c
+++ b/arch/arm/arm/arch.c
@@ -41,6 +41,7 @@
#include <target.h>
#include <kernel/thread.h>
#include <kernel/vm.h>
+#include <inttypes.h>
#define LOCAL_TRACE 0
@@ -345,7 +346,7 @@ void arch_chain_load(void *entry, ulong arg0, ulong arg1, ulong arg2, ulong arg3
/* add the low bits of the virtual address back */
entry_pa |= ((addr_t)entry & 0xfff);
- LTRACEF("entry pa 0x%lx\n", entry_pa);
+ LTRACEF("entry pa 0x%" PRIxPADDR "\n", entry_pa);
/* figure out the mapping for the chain load routine */
if (arm_vtop((addr_t)&arm_chain_load, &loader_pa) < 0) {
@@ -357,7 +358,7 @@ void arch_chain_load(void *entry, ulong arg0, ulong arg1, ulong arg2, ulong arg3
paddr_t loader_pa_section = round_down(loader_pa, SECTION_SIZE);
- LTRACEF("loader address %p, phys 0x%lx, surrounding large page 0x%lx\n",
+ LTRACEF("loader address %p, phys 0x%" PRIxPADDR ", surrounding large page 0x%" PRIxPADDR "\n",
&arm_chain_load, loader_pa, loader_pa_section);
/* using large pages, map around the target location */
diff --git a/arch/arm/arm/faults.c b/arch/arm/arm/faults.c
index 65d7b0b4..d77a8368 100644
--- a/arch/arm/arm/faults.c
+++ b/arch/arm/arm/faults.c
@@ -27,6 +27,7 @@
#include <platform.h>
#include <string.h>
#include <lib/trusty/trusty_app.h>
+#include <inttypes.h>
struct fault_handler_table_entry {
uint32_t pc;
@@ -100,7 +101,7 @@ static void dump_thread_info(void)
struct trusty_app *app = current_trusty_app();
if (app) {
- dprintf(CRITICAL, "load bias %lx\n", app->load_bias);
+ dprintf(CRITICAL, "load bias %" PRIxVADDR "\n", app->load_bias);
}
}
diff --git a/arch/arm/arm/mmu.c b/arch/arm/arm/mmu.c
index a9c53091..860c4a57 100644
--- a/arch/arm/arm/mmu.c
+++ b/arch/arm/arm/mmu.c
@@ -35,6 +35,7 @@
#include <arch/arm/mmu.h>
#include <kernel/vm.h>
#include <lk/init.h>
+#include <inttypes.h>
#define LOCAL_TRACE 0
#define TRACE_CONTEXT_SWITCH 0
@@ -159,7 +160,7 @@ static void arm_mmu_map_section(arch_aspace_t *aspace, addr_t paddr, addr_t vadd
{
int index;
- LTRACEF("aspace %p tt %p pa 0x%lx va 0x%lx flags 0x%x\n", aspace, aspace->tt_virt, paddr, vaddr, flags);
+ LTRACEF("aspace %p tt %p pa 0x%" PRIxPADDR " va 0x%" PRIxVADDR " flags 0x%x\n", aspace, aspace->tt_virt, paddr, vaddr, flags);
DEBUG_ASSERT(aspace);
DEBUG_ASSERT(aspace->tt_virt);
@@ -290,7 +291,7 @@ void arch_mmu_context_switch(arch_aspace_t *aspace)
status_t arch_mmu_query(arch_aspace_t *aspace, vaddr_t vaddr, paddr_t *paddr, uint *flags)
{
- LTRACEF("aspace %p, vaddr 0x%lx\n", aspace, vaddr);
+ LTRACEF("aspace %p, vaddr 0x%" PRIxVADDR "\n", aspace, vaddr);
DEBUG_ASSERT(aspace);
DEBUG_ASSERT(aspace->tt_virt);
@@ -459,7 +460,7 @@ static status_t get_l2_table(arch_aspace_t *aspace, uint32_t l1_index, paddr_t *
*ppa = pa + (PAGE_SIZE / L1E_PER_PAGE) * (l1_index & (L1E_PER_PAGE-1));
- LTRACEF("allocated pagetable at %p, pa 0x%lx, pa 0x%lx\n", l2_va, pa, *ppa);
+ LTRACEF("allocated pagetable at %p, pa 0x%" PRIxPADDR ", pa 0x%" PRIxPADDR "\n", l2_va, pa, *ppa);
return NO_ERROR;
}
@@ -480,14 +481,14 @@ static void put_l2_table(arch_aspace_t *aspace, uint32_t l1_index, paddr_t l2_pa
/* we can free this l2 table */
vm_page_t *page = paddr_to_vm_page(l2_pa);
if (!page)
- panic("bad page table paddr 0x%lx\n", l2_pa);
+ panic("bad page table paddr 0x%" PRIxPADDR "\n", l2_pa);
/* verify that it is in our page list */
DEBUG_ASSERT(list_in_list(&page->node));
list_delete(&page->node);
- LTRACEF("freeing pagetable at 0x%lx\n", l2_pa);
+ LTRACEF("freeing pagetable at 0x%" PRIxPADDR "\n", l2_pa);
pmm_free_page(page);
}
@@ -514,7 +515,7 @@ vaddr_t arch_mmu_pick_spot(arch_aspace_t *aspace,
vaddr_t end, uint next_region_flags,
vaddr_t alignment, size_t size, uint flags)
{
- LTRACEF("base 0x%lx, end 0x%lx, align %ld, size %zd, flags 0x%x\n",
+ LTRACEF("base 0x%" PRIxVADDR ", end 0x%" PRIxVADDR ", align %" PRIdVADDR ", size %zd, flags 0x%x\n",
base, end, alignment, size, flags);
vaddr_t spot;
@@ -542,7 +543,7 @@ vaddr_t arch_mmu_pick_spot(arch_aspace_t *aspace,
int arch_mmu_map(arch_aspace_t *aspace, addr_t vaddr, paddr_t paddr, size_t count, uint flags)
{
- LTRACEF("vaddr 0x%lx paddr 0x%lx count %zu flags 0x%x\n", vaddr, paddr, count, flags);
+ LTRACEF("vaddr 0x%" PRIxVADDR " paddr 0x%" PRIxPADDR " count %zu flags 0x%x\n", vaddr, paddr, count, flags);
DEBUG_ASSERT(aspace);
DEBUG_ASSERT(aspace->tt_virt);
@@ -673,7 +674,7 @@ int arch_mmu_unmap(arch_aspace_t *aspace, vaddr_t vaddr, size_t count)
if (!IS_PAGE_ALIGNED(vaddr))
return ERR_INVALID_ARGS;
- LTRACEF("vaddr 0x%lx count %zu\n", vaddr, count);
+ LTRACEF("vaddr 0x%" PRIxVADDR " count %zu\n", vaddr, count);
int unmapped = 0;
while (count > 0) {
@@ -764,7 +765,7 @@ int arch_mmu_unmap(arch_aspace_t *aspace, vaddr_t vaddr, size_t count)
status_t arch_mmu_init_aspace(arch_aspace_t *aspace, vaddr_t base, size_t size, uint flags)
{
- LTRACEF("aspace %p, base 0x%lx, size 0x%zx, flags 0x%x\n", aspace, base, size, flags);
+ LTRACEF("aspace %p, base 0x%" PRIxVADDR ", size 0x%zx, flags 0x%x\n", aspace, base, size, flags);
DEBUG_ASSERT(aspace);
@@ -807,7 +808,7 @@ status_t arch_mmu_init_aspace(arch_aspace_t *aspace, vaddr_t base, size_t size,
memset(aspace->tt_virt, 0, tt_sz);
}
- LTRACEF("tt_phys 0x%lx tt_virt %p\n", aspace->tt_phys, aspace->tt_virt);
+ LTRACEF("tt_phys 0x%" PRIxPADDR " tt_virt %p\n", aspace->tt_phys, aspace->tt_virt);
return NO_ERROR;
}
diff --git a/arch/arm/arm/thread.c b/arch/arm/arm/thread.c
index ab98e916..091cfb1c 100644
--- a/arch/arm/arm/thread.c
+++ b/arch/arm/arm/thread.c
@@ -27,6 +27,7 @@
#include <trace.h>
#include <kernel/thread.h>
#include <arch/arm.h>
+#include <inttypes.h>
struct context_switch_frame {
vaddr_t tpidrurw;
@@ -111,6 +112,6 @@ void arch_dump_thread(thread_t *t)
{
if (t->state != THREAD_RUNNING) {
dprintf(INFO, "\tarch: ");
- dprintf(INFO, "sp 0x%lx\n", t->arch.sp);
+ dprintf(INFO, "sp 0x%" PRIxVADDR "\n", t->arch.sp);
}
}
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
diff --git a/include/arch/usercopy.h b/include/arch/usercopy.h
index c37d7915..3b53f9d4 100644
--- a/include/arch/usercopy.h
+++ b/include/arch/usercopy.h
@@ -25,6 +25,7 @@
#define __ARCH_USERCOPY_H
#include <sys/types.h>
+#include <inttypes.h>
#if IS_64BIT && USER_32BIT
typedef uint32_t user_addr_t;
@@ -37,7 +38,7 @@ typedef uint32_t user_size_t;
typedef vaddr_t user_addr_t;
typedef size_t user_size_t;
-#define PRIxPTR_USER "lx"
+#define PRIxPTR_USER PRIxVADDR
#define PRIxSIZE_USER "zx"
#define PRIuSIZE_USER "zu"
#endif
diff --git a/include/sys/types.h b/include/sys/types.h
index 145ce25e..1a9da225 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -43,10 +43,16 @@ typedef int status_t;
typedef uintptr_t addr_t;
#define ADDR_MAX UINTPTR_MAX
+#define PRIxADDR PRIxPTR
+#define PRIdADDR PRIdPTR
typedef uintptr_t vaddr_t;
#define VADDR_MAX UINTPTR_MAX
+#define PRIxVADDR PRIxPTR
+#define PRIdVADDR PRIdPTR
typedef uintptr_t paddr_t;
#define PADDR_MAX UINTPTR_MAX
+#define PRIxPADDR PRIxPTR
+#define PRIdPADDR PRIdPTR
typedef int kobj_id;
diff --git a/kernel/vm/aslr.c b/kernel/vm/aslr.c
index 41065f10..16b1ae3c 100644
--- a/kernel/vm/aslr.c
+++ b/kernel/vm/aslr.c
@@ -38,7 +38,7 @@ vaddr_t aslr_randomize_kernel_base(vaddr_t kernel_base) {
struct mmu_initial_mapping* second_mapping = &mmu_initial_mappings[1];
if (second_mapping->size) {
- LTRACEF("non-kernel mapping phys:0x%" PRIxPTR " virt:0x%" PRIxPTR
+ LTRACEF("non-kernel mapping phys:0x%" PRIxPADDR " virt:0x%" PRIxVADDR
" size:%zu\n",
second_mapping->phys, second_mapping->virt,
second_mapping->size);
diff --git a/kernel/vm/physmem.c b/kernel/vm/physmem.c
index 4933079f..83c4503e 100644
--- a/kernel/vm/physmem.c
+++ b/kernel/vm/physmem.c
@@ -25,6 +25,7 @@
#include <kernel/vm.h>
#include <kernel/physmem.h>
#include <trace.h>
+#include <inttypes.h>
#define LOCAL_TRACE 0
@@ -124,7 +125,7 @@ static int phys_mem_obj_get_page(struct vmm_obj* obj,
size_t* paddr_size) {
struct phys_mem_obj* phys_obj = phys_mem_obj_from_vmm_obj(obj);
- LTRACEF("offset %zd phys_obj paddr 0x%lx\n", offset, phys_obj->paddr);
+ LTRACEF("offset %zd phys_obj paddr 0x%" PRIxPADDR "\n", offset, phys_obj->paddr);
if (offset >= phys_obj->size) {
TRACEF("offset %zd out of range size %zd\n", offset,
@@ -134,7 +135,7 @@ static int phys_mem_obj_get_page(struct vmm_obj* obj,
*paddr = phys_obj->paddr + offset;
*paddr_size = phys_obj->size - offset;
- LTRACEF("offset %zd -> paddr 0x%lx, size %zu\n", offset,
+ LTRACEF("offset %zd -> paddr 0x%" PRIxPADDR ", size %zu\n", offset,
*paddr, *paddr_size);
return 0;
diff --git a/kernel/vm/pmm.c b/kernel/vm/pmm.c
index c1fb042e..bcc6da67 100644
--- a/kernel/vm/pmm.c
+++ b/kernel/vm/pmm.c
@@ -33,6 +33,7 @@
#include <lib/console.h>
#include <kernel/mutex.h>
#include <kernel/spinlock.h>
+#include <inttypes.h>
#define LOCAL_TRACE 0
@@ -149,7 +150,7 @@ static void init_page_array(pmm_arena_t *arena, size_t page_count,
status_t pmm_add_arena(pmm_arena_t *arena)
{
- LTRACEF("arena %p name '%s' base 0x%lx size 0x%zx\n", arena, arena->name, arena->base, arena->size);
+ LTRACEF("arena %p name '%s' base 0x%" PRIxPADDR " size 0x%zx\n", arena, arena->name, arena->base, arena->size);
DEBUG_ASSERT(arena);
DEBUG_ASSERT(IS_PAGE_ALIGNED(arena->base));
@@ -205,7 +206,7 @@ status_t pmm_add_arena_late(pmm_arena_t *arena)
size_t pages_reserved;
spin_lock_saved_state_t state;
- LTRACEF("arena %p name '%s' base 0x%lx size 0x%zx\n",
+ LTRACEF("arena %p name '%s' base 0x%" PRIxPADDR " size 0x%zx\n",
arena, arena->name, arena->base, arena->size);
DEBUG_ASSERT(arena);
@@ -336,7 +337,7 @@ static size_t pmm_arena_find_free_run(pmm_arena_t *a, uint count,
uint aligned_offset = (rounded_base - a->base) / PAGE_SIZE;
uint start = aligned_offset;
LTRACEF("starting search at aligned offset %u\n", start);
- LTRACEF("arena base 0x%lx size %zu\n", a->base, a->size);
+ LTRACEF("arena base 0x%" PRIxPADDR " size %zu\n", a->base, a->size);
retry:
/*
@@ -484,7 +485,7 @@ status_t pmm_alloc(struct vmm_obj **objp, struct obj_ref* ref, uint count,
size_t pmm_alloc_range(paddr_t address, uint count, struct list_node *list)
{
- LTRACEF("address 0x%lx, count %u\n", address, count);
+ LTRACEF("address 0x%" PRIxPADDR ", count %u\n", address, count);
DEBUG_ASSERT(list);
@@ -652,14 +653,14 @@ static void dump_page(const vm_page_t *page)
{
DEBUG_ASSERT(page);
- printf("page %p: address 0x%lx flags 0x%x\n", page, vm_page_to_paddr(page), page->flags);
+ printf("page %p: address 0x%" PRIxPADDR " flags 0x%x\n", page, vm_page_to_paddr(page), page->flags);
}
static void dump_arena(const pmm_arena_t *arena, bool dump_pages)
{
DEBUG_ASSERT(arena);
- printf("arena %p: name '%s' base 0x%lx size 0x%zx priority %u flags 0x%x\n",
+ printf("arena %p: name '%s' base 0x%" PRIxPADDR " size 0x%zx priority %u flags 0x%x\n",
arena, arena->name, arena->base, arena->size, arena->priority, arena->flags);
printf("\tpage_array %p, free_count %zu\n",
arena->page_array, arena->free_count);
@@ -681,14 +682,14 @@ static void dump_arena(const pmm_arena_t *arena, bool dump_pages)
}
} else {
if (last != -1) {
- printf("\t\t0x%lx - 0x%lx\n", arena->base + last * PAGE_SIZE, arena->base + i * PAGE_SIZE);
+ printf("\t\t0x%" PRIxPADDR " - 0x%" PRIxPADDR "\n", arena->base + last * PAGE_SIZE, arena->base + i * PAGE_SIZE);
}
last = -1;
}
}
if (last != -1) {
- printf("\t\t0x%lx - 0x%lx\n", arena->base + last * PAGE_SIZE, arena->base + arena->size);
+ printf("\t\t0x%" PRIxPADDR " - 0x%" PRIxPADDR "\n", arena->base + last * PAGE_SIZE, arena->base + arena->size);
}
}
@@ -733,7 +734,7 @@ usage:
vm_page_t *p;
list_for_every_entry(&list, p, vm_page_t, node) {
- printf("\tpage %p, address 0x%lx\n", p, vm_page_to_paddr(p));
+ printf("\tpage %p, address 0x%" PRIxPADDR "\n", p, vm_page_to_paddr(p));
}
/* add the pages to the local allocated list */
@@ -754,7 +755,7 @@ usage:
paddr_t pa;
size_t ret = pmm_alloc_contiguous(argv[2].u, argv[3].u, &pa, &list);
- printf("pmm_alloc_contiguous returns %zu, address 0x%lx\n", ret, pa);
+ printf("pmm_alloc_contiguous returns %zu, address 0x%" PRIxPADDR "\n", ret, pa);
printf("address %% align = 0x%lx\n", pa % argv[3].u);
/* add the pages to the local allocated list */
diff --git a/kernel/vm/vm.c b/kernel/vm/vm.c
index f972e90b..f35b0b95 100644
--- a/kernel/vm/vm.c
+++ b/kernel/vm/vm.c
@@ -32,6 +32,7 @@
#include <arch/mmu.h>
#include <kernel/thread.h>
#include <debug.h>
+#include <inttypes.h>
#define LOCAL_TRACE 0
@@ -45,7 +46,7 @@ extern char __data_start;
* allocate the physical pages and throw them away */
static void mark_pages_in_use(vaddr_t va, size_t len)
{
- LTRACEF("va 0x%lx, len 0x%zx\n", va, len);
+ LTRACEF("va 0x%" PRIxVADDR ", len 0x%zx\n", va, len);
struct list_node list;
list_initialize(&list);
@@ -54,7 +55,7 @@ static void mark_pages_in_use(vaddr_t va, size_t len)
len = page_align(len + (va & (PAGE_SIZE - 1)));
va = round_down(va, PAGE_SIZE);
- LTRACEF("aligned va 0x%lx, len 0x%zx\n", va, len);
+ LTRACEF("aligned va 0x%" PRIxVADDR ", len 0x%zx\n", va, len);
for (size_t offset = 0; offset < len; offset += PAGE_SIZE) {
uint flags;
@@ -66,10 +67,10 @@ static void mark_pages_in_use(vaddr_t va, size_t len)
/* allocate the range, throw the results away */
if (pmm_alloc_range(pa, 1, &list) != 1) {
- panic("Could not alloc pa 0x%lx\n", pa);
+ panic("Could not alloc pa 0x%" PRIxPADDR "\n", pa);
}
} else {
- panic("Could not find pa for va 0x%lx\n", va);
+ panic("Could not find pa for va 0x%" PRIxVADDR "\n", va);
}
}
}
@@ -93,7 +94,7 @@ static void vm_init_preheap(uint level)
/* mark the physical pages used by the boot time allocator */
if (alloc_end != alloc_start) {
- LTRACEF("marking boot alloc used from 0x%lx to 0x%lx\n", alloc_start, alloc_end);
+ LTRACEF("marking boot alloc used from 0x%" PRIxPTR " to 0x%" PRIxPTR "\n", alloc_start, alloc_end);
/*
* if _end is not page aligned, the kernel and the boot time allocator
@@ -279,7 +280,7 @@ usage:
status_t err = arch_mmu_query(&aspace->arch_aspace, argv[2].u, &pa, &flags);
printf("arch_mmu_query returns %d\n", err);
if (err >= 0) {
- printf("\tpa 0x%lx, flags 0x%x\n", pa, flags);
+ printf("\tpa 0x%" PRIxPADDR ", flags 0x%x\n", pa, flags);
}
} else if (!strcmp(argv[1].str, "map")) {
if (argc < 6) goto notenoughargs;
diff --git a/kernel/vm/vmm.c b/kernel/vm/vmm.c
index dbf84e3f..4b4dca21 100644
--- a/kernel/vm/vmm.c
+++ b/kernel/vm/vmm.c
@@ -28,6 +28,7 @@
#include <lib/rand/rand.h>
#include <string.h>
#include <trace.h>
+#include <inttypes.h>
#include "vm_priv.h"
@@ -260,7 +261,7 @@ static status_t add_region_to_aspace(vmm_aspace_t* aspace, vmm_region_t* r) {
DEBUG_ASSERT(aspace);
DEBUG_ASSERT(r);
- LTRACEF("aspace %p base 0x%lx size 0x%zx r %p base 0x%lx size 0x%zx flags 0x%x\n",
+ LTRACEF("aspace %p base 0x%" PRIxVADDR " size 0x%zx r %p base 0x%" PRIxVADDR " size 0x%zx flags 0x%x\n",
aspace, aspace->base, aspace->size, r, r->base, r->obj_slice.size,
r->flags);
@@ -278,7 +279,7 @@ static status_t add_region_to_aspace(vmm_aspace_t* aspace, vmm_region_t* r) {
LTRACEF("couldn't find spot\n");
vmm_region_t *r_coll = bst_search_type(&aspace->regions, r,
vmm_region_cmp, vmm_region_t, node);
- LTRACEF("colliding r %p base 0x%lx size 0x%zx flags 0x%x\n",
+ LTRACEF("colliding r %p base 0x%" PRIxVADDR " size 0x%zx flags 0x%x\n",
r_coll, r_coll->base, r_coll->obj_slice.size, r_coll->flags);
return ERR_NO_MEMORY;
}
@@ -692,7 +693,7 @@ static status_t alloc_region(vmm_aspace_t* aspace,
}
vaddr = alloc_spot(aspace, size, align_pow2, arch_mmu_flags);
- LTRACEF("alloc_spot returns 0x%lx\n", vaddr);
+ LTRACEF("alloc_spot returns 0x%" PRIxVADDR "\n", vaddr);
if (vaddr == (vaddr_t)-1) {
LTRACEF("failed to find spot\n");
@@ -761,7 +762,7 @@ status_t vmm_reserve_space(vmm_aspace_t* aspace,
vaddr_t vaddr) {
status_t ret;
- LTRACEF("aspace %p name '%s' size 0x%zx vaddr 0x%lx\n", aspace, name, size,
+ LTRACEF("aspace %p name '%s' size 0x%zx vaddr 0x%" PRIxVADDR "\n", aspace, name, size,
vaddr);
DEBUG_ASSERT(aspace);
@@ -910,7 +911,7 @@ status_t vmm_alloc_physical_etc(vmm_aspace_t* aspace,
uint i;
size_t page_size;
- LTRACEF("aspace %p name '%s' size 0x%zx ptr %p paddr 0x%lx... vmm_flags 0x%x "
+ LTRACEF("aspace %p name '%s' size 0x%zx ptr %p paddr 0x%" PRIxPADDR "... vmm_flags 0x%x "
"arch_mmu_flags 0x%x\n",
aspace, name, size, ptr ? *ptr : 0, paddr[0], vmm_flags,
arch_mmu_flags);
@@ -1306,7 +1307,7 @@ void vmm_set_active_aspace(vmm_aspace_t* aspace) {
static void dump_region(const vmm_region_t* r) {
DEBUG_ASSERT(r);
- printf("\tregion %p: name '%s' range 0x%lx - 0x%lx size 0x%zx flags 0x%x "
+ printf("\tregion %p: name '%s' range 0x%" PRIxVADDR " - 0x%" PRIxVADDR " size 0x%zx flags 0x%x "
"mmu_flags 0x%x\n",
r, r->name, r->base, r->base + (r->obj_slice.size - 1),
r->obj_slice.size, r->flags, r->arch_mmu_flags);
@@ -1315,7 +1316,7 @@ static void dump_region(const vmm_region_t* r) {
static void dump_aspace(const vmm_aspace_t* a) {
DEBUG_ASSERT(a);
- printf("aspace %p: name '%s' range 0x%lx - 0x%lx size 0x%zx flags 0x%x\n",
+ printf("aspace %p: name '%s' range 0x%" PRIxVADDR " - 0x%" PRIxVADDR " size 0x%zx flags 0x%x\n",
a, a->name, a->base, a->base + (a->size - 1), a->size, a->flags);
printf("regions:\n");
diff --git a/lib/debug/debug.c b/lib/debug/debug.c
index 084b6c2c..a6e609a1 100644
--- a/lib/debug/debug.c
+++ b/lib/debug/debug.c
@@ -34,6 +34,7 @@
#include <platform/debug.h>
#include <kernel/spinlock.h>
#include <kernel/thread.h>
+#include <inttypes.h>
void spin(uint32_t usecs)
{
@@ -133,7 +134,7 @@ void hexdump(const void *ptr, size_t len)
size_t s = round_up(MIN(len - count, 16), 4);
size_t i;
- printf("0x%08lx: ", address);
+ printf("0x%08" PRIxADDR ": ", address);
for (i = 0; i < s / 4; i++) {
u.buf[i] = ((const uint32_t *)address)[i];
printf("%08x ", u.buf[i]);
diff --git a/lib/heap/miniheap/miniheap.c b/lib/heap/miniheap/miniheap.c
index ac705cf5..51f9412c 100644
--- a/lib/heap/miniheap/miniheap.c
+++ b/lib/heap/miniheap/miniheap.c
@@ -34,6 +34,7 @@
#include <lib/miniheap.h>
#include <lib/heap.h>
#include <lib/page_alloc.h>
+#include <inttypes.h>
#define LOCAL_TRACE 0
@@ -84,7 +85,7 @@ static ssize_t heap_grow(size_t len);
static void dump_free_chunk(struct free_heap_chunk *chunk)
{
- dprintf(INFO, "\t\tbase %p, end 0x%lx, len 0x%zx\n", chunk, (vaddr_t)chunk + chunk->len, chunk->len);
+ dprintf(INFO, "\t\tbase %p, end 0x%" PRIxVADDR ", len 0x%zx\n", chunk, (vaddr_t)chunk + chunk->len, chunk->len);
}
void miniheap_dump(void)
@@ -402,12 +403,12 @@ void miniheap_trim(void)
DEBUG_ASSERT(end_page <= end);
DEBUG_ASSERT(start_page >= start);
- LTRACEF("start page 0x%lx, end page 0x%lx\n", start_page, end_page);
+ LTRACEF("start page 0x%" PRIxPTR ", end page 0x%" PRIxPTR "\n", start_page, end_page);
retry:
// see if the free block encompasses at least one page
if (unlikely(end_page > start_page)) {
- LTRACEF("could trim: start 0x%lx, end 0x%lx\n", start_page, end_page);
+ LTRACEF("could trim: start 0x%" PRIxPTR ", end 0x%" PRIxPTR "\n", start_page, end_page);
// cases where the start of the block is already page aligned
if (start_page == start) {
@@ -462,7 +463,7 @@ retry:
free_chunk:
// return it to the allocator
- LTRACEF("returning %p size 0x%lx to the page allocator\n", (void *)start_page, end_page - start_page);
+ LTRACEF("returning %p size 0x%" PRIxPTR " to the page allocator\n", (void *)start_page, end_page - start_page);
page_free((void *)start_page, (end_page - start_page) / PAGE_SIZE);
// tweak accounting
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 02:05:38 +0000