Changeset 7e752b2 in mainline for kernel

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

kernel

Files:

• arch/amd64/src/debugger.c (modified) (3 diffs)
• arch/amd64/src/interrupt.c (modified) (1 diff)
• arch/amd64/src/mm/page.c (modified) (2 diffs)
• arch/arm32/src/exception.c (modified) (1 diff)
• arch/arm32/src/mm/page.c (modified) (1 diff)
• arch/arm32/src/mm/page_fault.c (modified) (2 diffs)
• arch/ia32/src/interrupt.c (modified) (2 diffs)
• arch/ia32/src/mm/page.c (modified) (1 diff)
• arch/ia32/src/smp/apic.c (modified) (1 diff)
• arch/ia64/src/interrupt.c (modified) (1 diff)
• arch/ia64/src/mm/tlb.c (modified) (8 diffs)
• arch/mips32/src/cache.c (modified) (1 diff)
• arch/mips32/src/debugger.c (modified) (4 diffs)
• arch/mips32/src/exception.c (modified) (1 diff)
• arch/mips32/src/mm/tlb.c (modified) (3 diffs)
• arch/ppc32/src/cpu/cpu.c (modified) (1 diff)
• arch/ppc32/src/interrupt.c (modified) (2 diffs)
• arch/ppc32/src/mm/frame.c (modified) (1 diff)
• arch/ppc32/src/mm/page.c (modified) (1 diff)
• arch/ppc32/src/mm/tlb.c (modified) (3 diffs)
• arch/sparc64/src/console.c (modified) (2 diffs)
• arch/sparc64/src/drivers/pci.c (modified) (1 diff)
• arch/sparc64/src/mm/sun4u/tlb.c (modified) (6 diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (4 diffs)
• arch/sparc64/src/sun4v/md.c (modified) (1 diff)
• arch/sparc64/src/trap/sun4v/interrupt.c (modified) (1 diff)
• generic/include/synch/spinlock.h (modified) (1 diff)
• generic/src/cpu/cpu.c (modified) (1 diff)
• generic/src/debug/debug.c (modified) (2 diffs)
• generic/src/debug/panic.c (modified) (3 diffs)
• generic/src/debug/stacktrace.c (modified) (2 diffs)
• generic/src/debug/symtab.c (modified) (1 diff)
• generic/src/interrupt/interrupt.c (modified) (1 diff)
• generic/src/ipc/ipc.c (modified) (1 diff)
• generic/src/main/kinit.c (modified) (4 diffs)
• generic/src/main/main.c (modified) (3 diffs)
• generic/src/mm/as.c (modified) (3 diffs)
• generic/src/mm/frame.c (modified) (6 diffs)
• generic/src/mm/slab.c (modified) (1 diff)
• generic/src/proc/program.c (modified) (1 diff)
• generic/src/proc/scheduler.c (modified) (1 diff)
• generic/src/proc/task.c (modified) (3 diffs)
• generic/src/synch/spinlock.c (modified) (1 diff)
• generic/src/sysinfo/sysinfo.c (modified) (2 diffs)
• test/avltree/avltree1.c (modified) (1 diff)
• test/fpu/fpu1_ia64.c (modified) (1 diff)
• test/fpu/fpu1_x86.c (modified) (3 diffs)
• test/fpu/sse1.c (modified) (1 diff)
• test/mm/falloc1.c (modified) (1 diff)
• test/mm/falloc2.c (modified) (2 diffs)
• test/mm/mapping1.c (modified) (4 diffs)
• test/synch/semaphore1.c (modified) (2 diffs)
• test/thread/thread1.c (modified) (1 diff)

kernel/arch/amd64/src/debugger.c

@@ -230 +230 @@
                                 return;
                         
-                        printf("*** Found ZERO on address %" PRIp " (slot %d) ***\n",
-                            breakpoints[slot].address, slot);
+                        printf("*** Found ZERO on address %p (slot %d) ***\n",
+                            (void *) breakpoints[slot].address, slot);
                 } else {
-                        printf("Data watchpoint - new data: %" PRIp "\n",
+                        printf("Data watchpoint - new data: %#" PRIxn "\n",
                             *((unative_t *) breakpoints[slot].address));
                 }
         }
         
-        printf("Reached breakpoint %d:%" PRIp " (%s)\n", slot, getip(istate),
-            symtab_fmt_name_lookup(getip(istate)));
+        printf("Reached breakpoint %d:%p (%s)\n", slot,
+            (void *) getip(istate), symtab_fmt_name_lookup(getip(istate)));
         
 #ifdef CONFIG_KCONSOLE
@@ -363 +363 @@
                         
 #ifdef __32_BITS__
-                        printf("%-4u %7" PRIs " %p %s\n", i,
-                            breakpoints[i].counter, breakpoints[i].address,
+                        printf("%-4u %7zu %p %s\n", i,
+                            breakpoints[i].counter, (void *) breakpoints[i].address,
                             symbol);
 #endif
                         
 #ifdef __64_BITS__
-                        printf("%-4u %7" PRIs " %p %s\n", i,
-                            breakpoints[i].counter, breakpoints[i].address,
+                        printf("%-4u %7zu %p %s\n", i,
+                            breakpoints[i].counter, (void *) breakpoints[i].address,
                             symbol);
 #endif
@@ -405 +405 @@
                 flags = BKPOINT_WRITE;
         
-        printf("Adding breakpoint on address: %p\n", argv->intval);
-        
-        int id = breakpoint_add((void *)argv->intval, flags, -1);
+        printf("Adding breakpoint on address: %p\n",
+            (void *) argv->intval);
+        
+        int id = breakpoint_add((void *) argv->intval, flags, -1);
         if (id < 0)
                 printf("Add breakpoint failed.\n");

kernel/arch/amd64/src/interrupt.c

@@ -65 +65 @@
 void istate_decode(istate_t *istate)
 {
-        printf("cs =%p\trip=%p\trfl=%p\terr=%p\n",
-            istate->cs, istate->rip, istate->rflags, istate->error_word);
-
+        printf("cs =%#0" PRIx64 "\trip=%p\t"
+            "rfl=%#0" PRIx64 "\terr=%#0" PRIx64 "\n",
+            istate->cs, (void *) istate->rip,
+            istate->rflags, istate->error_word);
+        
         if (istate_from_uspace(istate))
-                printf("ss =%p\n", istate->ss);
-        
-        printf("rax=%p\trbx=%p\trcx=%p\trdx=%p\n",
+                printf("ss =%#0" PRIx64 "\n", istate->ss);
+        
+        printf("rax=%#0" PRIx64 "\trbx=%#0" PRIx64 "\t"
+            "rcx=%#0" PRIx64 "\trdx=%#0" PRIx64 "\n",
             istate->rax, istate->rbx, istate->rcx, istate->rdx);
+        
         printf("rsi=%p\trdi=%p\trbp=%p\trsp=%p\n",
-            istate->rsi, istate->rdi, istate->rbp,
-            istate_from_uspace(istate) ? istate->rsp : (uintptr_t)&istate->rsp);
-        printf("r8 =%p\tr9 =%p\tr10=%p\tr11=%p\n",
+            (void *) istate->rsi, (void *) istate->rdi,
+            (void *) istate->rbp,
+            istate_from_uspace(istate) ? ((void *) istate->rsp) :
+            &istate->rsp);
+        
+        printf("r8 =%#0" PRIx64 "\tr9 =%#0" PRIx64 "\t"
+            "r10=%#0" PRIx64 "\tr11=%#0" PRIx64 "\n",
             istate->r8, istate->r9, istate->r10, istate->r11);
-        printf("r12=%p\tr13=%p\tr14=%p\tr15=%p\n",
+        
+        printf("r12=%#0" PRIx64 "\tr13=%#0" PRIx64 "\t"
+            "r14=%#0" PRIx64 "\tr15=%#0" PRIx64 "\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
 }

kernel/arch/amd64/src/mm/page.c

@@ -89 +89 @@
         
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %#x.", page);
+                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
                 panic_memtrap(istate, access, page, NULL);
         }
@@ -97 +97 @@
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%" PRIs " bytes).", physaddr,
-                    size);
+                panic("Unable to map physical memory %p (%zu bytes).",
+                    (void *) physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);

kernel/arch/arm32/src/exception.c

@@ -175 +175 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
+        printf("r0 =%#0" PRIx32 "\tr1 =%#0" PRIx32 "\t"
+            "r2 =%#0" PRIx32 "\tr3 =%#0" PRIx32 "\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf("r4 =%#0.8lx\tr5 =%#0.8lx\tr6 =%#0.8lx\tr7 =%#0.8lx\n",
+        printf("r4 =%#" PRIx32 "\tr5 =%#0" PRIx32 "\t"
+            "r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\n",
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf("r8 =%#0.8lx\tr9 =%#0.8lx\tr10=%#0.8lx\tfp =%#0.8lx\n",
-            istate->r8, istate->r9, istate->r10, istate->fp);
-        printf("r12=%#0.8lx\tsp =%#0.8lx\tlr =%#0.8lx\tspsr=%#0.8lx\n",
-            istate->r12, istate->sp, istate->lr, istate->spsr);
+        printf("r8 =%#0" PRIx32 "\tr9 =%#0" PRIx32 "\t"
+            "r10=%#0" PRIx32 "\tfp =%p\n",
+            istate->r8, istate->r9, istate->r10,
+            (void *) istate->fp);
+        printf("r12=%#0" PRIx32 "\tsp =%p\tlr =%p\tspsr=%p\n",
+            istate->r12, (void *) istate->sp,
+            (void *) istate->lr, (void *) istate->spsr);
 }
 

kernel/arch/arm32/src/mm/page.c

@@ -93 +93 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
                 panic("Unable to map physical memory %p (%d bytes).",
-                    physaddr, size);
+                    (void *) physaddr, size);
         }
         

kernel/arch/arm32/src/mm/page_fault.c

@@ -141 +141 @@
         if (instr.condition == 0xf) {
                 panic("page_fault - instruction does not access memory "
-                    "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+                    "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+                    instr_union.pc, (void *) badvaddr);
                 return PF_ACCESS_EXEC;
         }
@@ -160 +161 @@
 
         panic("page_fault - instruction doesn't access memory "
-            "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+            "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+            instr_union.pc, (void *) badvaddr);
 
         return PF_ACCESS_EXEC;

kernel/arch/ia32/src/interrupt.c

@@ -65 +65 @@
 void istate_decode(istate_t *istate)
 {
-        printf("cs =%p\teip=%p\tefl=%p\terr=%p\n",
-            istate->cs, istate->eip, istate->eflags, istate->error_word);
-
-        printf("ds =%p\tes =%p\tfs =%p\tgs =%p\n",
+        printf("cs =%#0" PRIx32 "\teip=%p\t"
+            "efl=%#0" PRIx32 "\terr=%#0" PRIx32 "\n",
+            istate->cs, (void *) istate->eip,
+            istate->eflags, istate->error_word);
+        
+        printf("ds =%#0" PRIx32 "\tes =%#0" PRIx32 "\t"
+            "fs =%#0" PRIx32 "\tgs =%#0" PRIx32 "\n",
             istate->ds, istate->es, istate->fs, istate->gs);
+        
         if (istate_from_uspace(istate))
-                printf("ss =%p\n", istate->ss);
-
-        printf("eax=%p\tebx=%p\tecx=%p\tedx=%p\n",
+                printf("ss =%#0" PRIx32 "\n", istate->ss);
+        
+        printf("eax=%#0" PRIx32 "\tebx=%#0" PRIx32 "\t"
+            "ecx=%#0" PRIx32 "\tedx=%#0" PRIx32 "\n",
             istate->eax, istate->ebx, istate->ecx, istate->edx);
+        
         printf("esi=%p\tedi=%p\tebp=%p\tesp=%p\n",
-            istate->esi, istate->edi, istate->ebp,
-            istate_from_uspace(istate) ? istate->esp : (uintptr_t)&istate->esp);
+            (void *) istate->esi, (void *) istate->edi,
+            (void *) istate->ebp,
+            istate_from_uspace(istate) ? ((void *) istate->esp) :
+            &istate->esp);
 }
 
@@ -139 +147 @@
         );
         
-        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0.8x.",
-            (unative_t) mxcsr);
-        panic_badtrap(istate, n, "SIMD FP exception, MXCSR=%#0.8x");
+        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0" PRIx32 ".",
+            mxcsr);
+        panic_badtrap(istate, n, "SIMD FP exception");
 }
 

kernel/arch/ia32/src/mm/page.c

@@ -82 +82 @@
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%d bytes).", physaddr, size);
+                panic("Unable to map physical memory %p (%zu bytes).",
+                    (void *) physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);

kernel/arch/ia32/src/smp/apic.c

@@ -477 +477 @@
 {
 #ifdef LAPIC_VERBOSE
-        printf("LVT on cpu%" PRIs ", LAPIC ID: %" PRIu8 "\n",
+        printf("LVT on cpu%u, LAPIC ID: %" PRIu8 "\n",
             CPU->id, l_apic_id());
         

kernel/arch/ia64/src/interrupt.c

@@ -135 +135 @@
 void istate_decode(istate_t *istate)
 {
-        printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
-            istate->ar_bspstore);
-        printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat,
-            istate->ar_rsc);
-        printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs,
-            istate->ar_pfs);
-        printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value,
-            istate->cr_ipsr);
-        
-        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei,
+        printf("ar.bsp=%p\tar.bspstore=%p\n",
+            (void *) istate->ar_bsp, (void *) istate->ar_bspstore);
+        printf("ar.rnat=%#0" PRIx64 "\tar.rsc=%#0" PRIx64 "\n",
+            istate->ar_rnat, istate->ar_rsc);
+        printf("ar.ifs=%#0" PRIx64 "\tar.pfs=%#0" PRIx64 "\n",
+            istate->ar_ifs, istate->ar_pfs);
+        printf("cr.isr=%#0" PRIx64 "\tcr.ipsr=%#0" PRIx64 "\n",
+            istate->cr_isr.value, istate->cr_ipsr.value);
+        
+        printf("cr.iip=%#0" PRIx64 ", #%u\t(%s)\n",
+            istate->cr_iip, istate->cr_isr.ei,
             symtab_fmt_name_lookup(istate->cr_iip));
-        printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa,
+        printf("cr.iipa=%#0" PRIx64 "\t(%s)\n", istate->cr_iipa,
             symtab_fmt_name_lookup(istate->cr_iipa));
-        printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa,
+        printf("cr.ifa=%#0" PRIx64 "\t(%s)\n", istate->cr_ifa,
             symtab_fmt_name_lookup(istate->cr_ifa));
 }

kernel/arch/ia64/src/mm/tlb.c

@@ -499 +499 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
                 }
@@ -556 +557 @@
                         } else {
                                 fault_if_from_uspace(istate,
-                                    "IO access fault at %p.", va);
+                                    "IO access fault at %p.", (void *) va);
                         }
                 }
@@ -620 +621 @@
                  */
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
@@ -668 +670 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
                 }
@@ -704 +707 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
                 }
@@ -740 +744 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }
@@ -772 +777 @@
         ASSERT(!t->w);
         if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault at %p.", va);
+                fault_if_from_uspace(istate, "Page fault at %p.",
+                    (void *) va);
                 panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
         }
@@ -812 +818 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.", va);
+                        fault_if_from_uspace(istate, "Page fault at %p.",
+                            (void *) va);
                         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
                 }

kernel/arch/mips32/src/cache.c

@@ -39 +39 @@
 void cache_error(istate_t *istate)
 {
-        panic("cache_error exception (epc=%p).", istate->epc);
+        panic("cache_error exception (epc=%p).", (void *) istate->epc);
 }
 

kernel/arch/mips32/src/debugger.c

@@ -191 +191 @@
         }
         
-        printf("Adding breakpoint on address %p\n", argv->intval);
+        printf("Adding breakpoint on address %p\n", (void *) argv->intval);
         
         cur->address = (uintptr_t) argv->intval;
@@ -267 +267 @@
                             breakpoints[i].address);
                         
-                        printf("%-4u %7" PRIs " %p %-8s %-9s %-10s %s\n", i,
-                            breakpoints[i].counter, breakpoints[i].address,
+                        printf("%-4u %7zu %p %-8s %-9s %-10s %s\n", i,
+                            breakpoints[i].counter, (void *) breakpoints[i].address,
                             ((breakpoints[i].flags & BKPOINT_INPROG) ? "true" :
                             "false"), ((breakpoints[i].flags & BKPOINT_ONESHOT)
@@ -366 +366 @@
                 
                 if (!(cur->flags & BKPOINT_FUNCCALL)) {
-                        printf("***Breakpoint %u: %p in %s.\n", i, fireaddr,
+                        printf("***Breakpoint %u: %p in %s.\n", i,
+                            (void *) fireaddr,
                             symtab_fmt_name_lookup(fireaddr));
                 }
@@ -381 +382 @@
                 cur->flags |= BKPOINT_INPROG;
         } else {
-                printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
+                printf("***Breakpoint %d: %p in %s.\n", i,
+                    (void *) fireaddr,
                     symtab_fmt_name_lookup(fireaddr));
                 

kernel/arch/mips32/src/exception.c

@@ -74 +74 @@
 void istate_decode(istate_t *istate)
 {
-        printf("epc=%p\tsta=%p\tlo =%p\thi =%p\n",
-            istate->epc, istate->status, istate->lo, istate->hi);
-        printf("a0 =%p\ta1 =%p\ta2 =%p\ta3 =%p\n",
+        printf("epc=%p\tsta=%#0" PRIx32 "\t"
+            "lo =%#0" PRIx32 "\thi =%#0" PRIx32 "\n",
+            (void *) istate->epc, istate->status,
+            istate->lo, istate->hi);
+        
+        printf("a0 =%#0" PRIx32 "\ta1 =%#0" PRIx32 "\t"
+            "a2 =%#0" PRIx32 "\ta3 =%#0" PRIx32 "\n",
             istate->a0, istate->a1, istate->a2, istate->a3);
-        printf("t0 =%p\tt1 =%p\tt2 =%p\tt3 =%p\n",
+        
+        printf("t0 =%#0" PRIx32 "\tt1 =%#0" PRIx32 "\t"
+            "t2 =%#0" PRIx32 "\tt3 =%#0" PRIx32 "\n",
             istate->t0, istate->t1, istate->t2, istate->t3);
-        printf("t4 =%p\tt5 =%p\tt6 =%p\tt7 =%p\n",
+        
+        printf("t4 =%#0" PRIx32 "\tt5 =%#0" PRIx32 "\t"
+            "t6 =%#0" PRIx32 "\tt7 =%#0" PRIx32 "\n",
             istate->t4, istate->t5, istate->t6, istate->t7);
-        printf("t8 =%p\tt9 =%p\tv0 =%p\tv1 =%p\n",
+        
+        printf("t8 =%#0" PRIx32 "\tt9 =%#0" PRIx32 "\t"
+            "v0 =%#0" PRIx32 "\tv1 =%#0" PRIx32 "\n",
             istate->t8, istate->t9, istate->v0, istate->v1);
-        printf("s0 =%p\ts1 =%p\ts2 =%p\ts3 =%p\n",
+        
+        printf("s0 =%#0" PRIx32 "\ts1 =%#0" PRIx32 "\t"
+            "s2 =%#0" PRIx32 "\ts3 =%#0" PRIx32 "\n",
             istate->s0, istate->s1, istate->s2, istate->s3);
-        printf("s4 =%p\ts5 =%p\ts6 =%p\ts7 =%p\n",
+        
+        printf("s4 =%#0" PRIx32 "\ts5 =%#0" PRIx32 "\t"
+            "s6 =%#0" PRIx32 "\ts7 =%#0" PRIx32 "\n",
             istate->s4, istate->s5, istate->s6, istate->s7);
-        printf("s8 =%p\tat =%p\tkt0=%p\tkt1=%p\n",
+        
+        printf("s8 =%#0" PRIx32 "\tat =%#0" PRIx32 "\t"
+            "kt0=%#0" PRIx32 "\tkt1=%#0" PRIx32 "\n",
             istate->s8, istate->at, istate->kt0, istate->kt1);
+        
         printf("sp =%p\tra =%p\tgp =%p\n",
-            istate->sp, istate->ra, istate->gp);
+            (void *) istate->sp, (void *) istate->ra,
+            (void *) istate->gp);
 }
 

kernel/arch/mips32/src/mm/tlb.c

@@ -323 +323 @@
         uintptr_t va = cp0_badvaddr_read();
         
-        fault_if_from_uspace(istate, "TLB Refill Exception on %p.", va);
+        fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, "TLB Refill Exception.");
 }
@@ -332 +333 @@
         uintptr_t va = cp0_badvaddr_read();
         
-        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.", va);
+        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, "TLB Invalid Exception.");
 }
@@ -340 +342 @@
         uintptr_t va = cp0_badvaddr_read();
         
-        fault_if_from_uspace(istate, "TLB Modified Exception on %p.", va);
+        fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_WRITE, va, "TLB Modified Exception.");
 }

kernel/arch/ppc32/src/cpu/cpu.c

@@ -68 +68 @@
         }
         
-        printf("cpu%" PRIs ": version=%" PRIu16" (%s), revision=%" PRIu16 "\n", cpu->id,
+        printf("cpu%u: version=%" PRIu16" (%s), revision=%" PRIu16 "\n", cpu->id,
             cpu->arch.version, name, cpu->arch.revision);
 }

kernel/arch/ppc32/src/interrupt.c

@@ -54 +54 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%p\tr1 =%p\tr2 =%p\n", istate->r0, istate->sp, istate->r2);
-        printf("r3 =%p\tr4 =%p\tr5 =%p\n", istate->r3, istate->r4, istate->r5);
-        printf("r6 =%p\tr7 =%p\tr8 =%p\n", istate->r6, istate->r7, istate->r8);
-        printf("r9 =%p\tr10=%p\tr11=%p\n",
+        printf("r0 =%#0" PRIx32 "\tr1 =%p\tr2 =%#0" PRIx32 "\n",
+            istate->r0, (void *) istate->sp, istate->r2);
+        
+        printf("r3 =%#0" PRIx32 "\tr4 =%#0" PRIx32 "\tr5 =%#0" PRIx32 "\n",
+            istate->r3, istate->r4, istate->r5);
+        
+        printf("r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\tr8 =%#0" PRIx32 "\n",
+            istate->r6, istate->r7, istate->r8);
+        
+        printf("r9 =%#0" PRIx32 "\tr10=%#0" PRIx32 "\tr11=%#0" PRIx32 "\n",
             istate->r9, istate->r10, istate->r11);
-        printf("r12=%p\tr13=%p\tr14=%p\n",
+        
+        printf("r12=%#0" PRIx32 "\tr13=%#0" PRIx32 "\tr14=%#0" PRIx32 "\n",
             istate->r12, istate->r13, istate->r14);
-        printf("r15=%p\tr16=%p\tr17=%p\n",
+        
+        printf("r15=%#0" PRIx32 "\tr16=%#0" PRIx32 "\tr17=%#0" PRIx32 "\n",
             istate->r15, istate->r16, istate->r17);
-        printf("r18=%p\tr19=%p\tr20=%p\n",
+        
+        printf("r18=%#0" PRIx32 "\tr19=%#0" PRIx32 "\tr20=%#0" PRIx32 "\n",
             istate->r18, istate->r19, istate->r20);
-        printf("r21=%p\tr22=%p\tr23=%p\n",
+        
+        printf("r21=%#0" PRIx32 "\tr22=%#0" PRIx32 "\tr23=%#0" PRIx32 "\n",
             istate->r21, istate->r22, istate->r23);
-        printf("r24=%p\tr25=%p\tr26=%p\n",
+        
+        printf("r24=%#0" PRIx32 "\tr25=%#0" PRIx32 "\tr26=%#0" PRIx32 "\n",
             istate->r24, istate->r25, istate->r26);
-        printf("r27=%p\tr28=%p\tr29=%p\n",
+        
+        printf("r27=%#0" PRIx32 "\tr28=%#0" PRIx32 "\tr29=%#0" PRIx32 "\n",
             istate->r27, istate->r28, istate->r29);
-        printf("r30=%p\tr31=%p\n", istate->r30, istate->r31);
-        printf("cr =%p\tpc =%p\tlr =%p\n", istate->cr, istate->pc, istate->lr);
-        printf("ctr=%p\txer=%p\tdar=%p\n",
+        
+        printf("r30=%#0" PRIx32 "\tr31=%#0" PRIx32 "\n",
+            istate->r30, istate->r31);
+        
+        printf("cr =%#0" PRIx32 "\tpc =%p\tlr =%p\n",
+            istate->cr, (void *) istate->pc, (void *) istate->lr);
+        
+        printf("ctr=%#0" PRIx32 "\txer=%#0" PRIx32 "\tdar=%#0" PRIx32 "\n",
             istate->ctr, istate->xer, istate->dar);
-        printf("srr1=%p\n", istate->srr1);
+        
+        printf("srr1=%p\n", (void *) istate->srr1);
 }
 
@@ -111 +129 @@
                          */
 #ifdef CONFIG_DEBUG
-                        printf("cpu%" PRIs ": spurious interrupt (inum=%" PRIu8 ")\n",
+                        printf("cpu%u: spurious interrupt (inum=%" PRIu8 ")\n",
                             CPU->id, inum);
 #endif

kernel/arch/ppc32/src/mm/frame.c

@@ -49 +49 @@
         size_t i;
         for (i = 0; i < memmap.cnt; i++) {
-                printf("%#10x %#10x\n", memmap.zones[i].start,
+                printf("%p %#0zx\n", memmap.zones[i].start,
                     memmap.zones[i].size);
         }

kernel/arch/ppc32/src/mm/page.c

@@ -49 +49 @@
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%" PRIs " bytes).",
-                    physaddr, size);
+                panic("Unable to map physical memory %p (%zu bytes).",
+                    (void *) physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);

kernel/arch/ppc32/src/mm/tlb.c

@@ -111 +111 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        fault_if_from_uspace(istate, "PHT Refill Exception on %p.", badvaddr);
+        fault_if_from_uspace(istate, "PHT Refill Exception on %p.",
+            (void *) badvaddr);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, badvaddr,
             "PHT Refill Exception.");
@@ -459 +460 @@
                 length = 0; \
         \
-        printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", \
-            sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, \
-            lower & 0xffff0000, length, mask, \
+        printf(name ": page=%#0" PRIx32 " frame=%#0" PRIx32 \
+            " length=%#0" PRIx32 " KB (mask=%#0" PRIx32 ")%s%s\n", \
+            upper & UINT32_C(0xffff0000), lower & UINT32_C(0xffff0000), \
+            length, mask, \
             ((upper >> 1) & 1) ? " supervisor" : "", \
             (upper & 1) ? " user" : "");
 
-
 void tlb_print(void)
 {
@@ -473 +474 @@
                 uint32_t vsid = sr_get(sr << 28);
                 
-                printf("sr[%02u]: vsid=%.*p (asid=%u)%s%s\n", sr,
-                    sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4,
+                printf("sr[%02" PRIu32 "]: vsid=%#0" PRIx32 " (asid=%" PRIu32 ")"
+                    "%s%s\n", sr, vsid & UINT32_C(0x00ffffff),
+                    (vsid & UINT32_C(0x00ffffff)) >> 4,
                     ((vsid >> 30) & 1) ? " supervisor" : "",
                     ((vsid >> 29) & 1) ? " user" : "");

kernel/arch/sparc64/src/console.c

@@ -70 +70 @@
         ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value);
         if (!screen)
-                panic("Cannot find %s.", prop_scr->value);
+                panic("Cannot find %s.", (char *) prop_scr->value);
         
         scr_init(screen);
@@ -83 +83 @@
         ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value);
         if (!keyboard)
-                panic("Cannot find %s.", prop_kbd->value);
+                panic("Cannot find %s.", (char *) prop_kbd->value);
         
         kbd_init(keyboard);

kernel/arch/sparc64/src/drivers/pci.c

@@ -211 +211 @@
                  * Unsupported model.
                  */
-                printf("Unsupported PCI controller model (%s).\n", prop->value);
+                printf("Unsupported PCI controller model (%s).\n",
+                    (char *) prop->value);
         }
 

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -360 +360 @@
 static void print_tlb_entry(int i, tlb_tag_read_reg_t t, tlb_data_t d)
 {
-        printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
-            "ie=%d, soft2=%#x, pfn=%#x, soft=%#x, l=%d, "
-            "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
+        printf("%u: vpn=%#" PRIx64 ", context=%u, v=%u, size=%u, nfo=%u, "
+            "ie=%u, soft2=%#x, pfn=%#x, soft=%#x, l=%u, "
+            "cp=%u, cv=%u, e=%u, p=%u, w=%u, g=%u\n", i, (uint64_t) t.vpn,
             t.context, d.v, d.size, d.nfo, d.ie, d.soft2,
             d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
@@ -441 +441 @@
     uintptr_t va, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
+        fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
         panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
 }
@@ -451 +451 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
+            (void *) va, tag.context);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
 }
@@ -462 +462 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
+            (void *) va, tag.context);
         panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
 }
@@ -484 +484 @@
             sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
 #endif
-            
-        printf("DTLB SFAR: address=%p\n", sfar);
+        
+        printf("DTLB SFAR: address=%p\n", (void *) sfar);
         
         dtlb_sfsr_write(0);
@@ -508 +508 @@
 #endif
             
-        printf("DTLB SFAR: address=%p\n", sfar);
+        printf("DTLB SFAR: address=%p\n", (void *) sfar);
         
         dtlb_sfsr_write(0);

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -358 +358 @@
     const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
+        fault_if_from_uspace(istate, "%s, address=%p.", str,
+            (void *) va);
         panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
 }
@@ -365 +366 @@
     uint64_t page_and_ctx, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
-            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
+            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
             str);
@@ -374 +375 @@
     uint64_t page_and_ctx, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
-            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
+            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
         panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
             str);
@@ -399 +400 @@
         uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
                 MMU_FLAG_DTLB | MMU_FLAG_ITLB);
-        if (errno != HV_EOK) {
-                panic("Error code = %d.\n", errno);
-        }
+        if (errno != HV_EOK)
+                panic("Error code = %" PRIu64 ".\n", errno);
 }
 

kernel/arch/sparc64/src/sun4v/md.c

@@ -310 +310 @@
         retval = retval;
         if (retval != HV_EOK) {
-                printf("Could not retrieve machine description, error = %d.\n",
-                    retval);
+                printf("Could not retrieve machine description, "
+                    "error=%" PRIu64 ".\n", retval);
         }
 }

kernel/arch/sparc64/src/trap/sun4v/interrupt.c

@@ -87 +87 @@
                 KA2PA(cpu_mondo_queues[CPU->id]),
                 CPU_MONDO_NENTRIES) != HV_EOK)
-                        panic("Initializing mondo queue failed on CPU %d.\n",
+                        panic("Initializing mondo queue failed on CPU %" PRIu64 ".\n",
                             CPU->arch.id);
 }

kernel/generic/include/synch/spinlock.h

@@ -146 +146 @@
         if ((pname)++ > (value)) { \
                 (pname) = 0; \
-                printf("Deadlock probe %s: exceeded threshold %u\n", \
+                printf("Deadlock probe %s: exceeded threshold %u\n" \
                     "cpu%u: function=%s, line=%u\n", \
                     #pname, (value), CPU->id, __func__, __LINE__); \

kernel/generic/src/cpu/cpu.c

@@ -107 +107 @@
 void cpu_list(void)
 {
-        size_t i;
+        unsigned int i;
         
         for (i = 0; i < config.cpu_count; i++) {

kernel/generic/src/debug/debug.c

@@ -52 +52 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s+%" PRIp "->%s\n", call_site_sym, call_site_off,
-                    fn_sym);
+                printf("%s()+%p->%s()\n", call_site_sym,
+                    (void *) call_site_off, fn_sym);
         else
-                printf("->%s\n", fn_sym);
+                printf("->%s()\n", fn_sym);
 }
 
@@ -67 +67 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s+%" PRIp "<-%s\n", call_site_sym, call_site_off,
-                    fn_sym);
+                printf("%s()+%p<-%s()\n", call_site_sym,
+                    (void *) call_site_off, fn_sym);
         else
-                printf("<-%s\n", fn_sym);
+                printf("<-%s()\n", fn_sym);
 }
 

kernel/generic/src/debug/panic.c

@@ -42 +42 @@
 #include <interrupt.h>
 
+#define BANNER_LEFT   "######>"
+#define BANNER_RIGHT  "<######"
+
 void panic_common(panic_category_t cat, istate_t *istate, int access,
     uintptr_t address, const char *fmt, ...)
 {
         va_list args;
-
+        
         silent = false;
-
-        printf("\nKERNEL PANIC ");
+        
+        printf("\n%s Kernel panic ", BANNER_LEFT);
         if (CPU)
-                printf("ON cpu%d ", CPU->id);
-        printf("DUE TO ");
-
+                printf("on cpu%u ", CPU->id);
+        printf("due to ");
+        
         va_start(args, fmt);
         if (cat == PANIC_ASSERT) {
-                printf("A FAILED ASSERTION:\n");
+                printf("a failed assertion: %s\n", BANNER_RIGHT);
                 vprintf(fmt, args);
                 printf("\n");
         } else if (cat == PANIC_BADTRAP) {
-                printf("BAD TRAP %ld.\n", address);
+                printf("bad trap %" PRIun ". %s\n", address,
+                    BANNER_RIGHT);
                 if (fmt) {
                         vprintf(fmt, args);
@@ -66 +70 @@
                 }
         } else if (cat == PANIC_MEMTRAP) {
-                printf("A BAD MEMORY ACCESS WHILE ");
+                printf("a bad memory access while ");
                 if (access == PF_ACCESS_READ)
-                        printf("LOADING FROM");
+                        printf("loading from");
                 else if (access == PF_ACCESS_WRITE)
-                        printf("STORING TO");
+                        printf("storing to");
                 else if (access == PF_ACCESS_EXEC)
-                        printf("BRANCHING TO");
+                        printf("branching to");
                 else
-                        printf("REFERENCING");
-                printf(" ADDRESS %p.\n", address); 
+                        printf("referencing");
+                printf(" address %p. %s\n", (void *) address,
+                    BANNER_RIGHT);
                 if (fmt) {
                         vprintf(fmt, args);
@@ -81 +86 @@
                 }
         } else {
-                printf("THE FOLLOWING REASON:\n");
+                printf("the following reason: %s\n",
+                    BANNER_RIGHT);
                 vprintf(fmt, args);
                 printf("\n");
         }
         va_end(args);
-
+        
         printf("\n");
-
+        
         if (istate) {
                 istate_decode(istate);
                 printf("\n");
         }
-
+        
         stack_trace();
         halt();

kernel/generic/src/debug/stacktrace.c

@@ -41 +41 @@
 #define STACK_FRAMES_MAX        20
 
-void
-stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
+void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
 {
         int cnt = 0;
@@ -54 +53 @@
                 if (ops->symbol_resolve &&
                     ops->symbol_resolve(ctx->pc, &symbol, &offset)) {
-                        if (offset)
-                                printf("%p: %s+%" PRIp "()\n",
-                                    ctx->fp, symbol, offset);
+                        if (offset)
+                                printf("%p: %s()+%p\n", (void *) ctx->fp,
+                                    symbol, (void *) offset);
                         else
-                                printf("%p: %s()\n",
-                                    ctx->fp, symbol);
-                } else {
-                        printf("%p: %p()\n", ctx->fp, ctx->pc);
-                }
+                                printf("%p: %s()\n", (void *) ctx->fp, symbol);
+                } else
+                        printf("%p: %p()\n", (void *) ctx->fp, (void *) ctx->pc);
+                
                 if (!ops->return_address_get(ctx, &pc))
                         break;
+                
                 if (!ops->frame_pointer_prev(ctx, &fp))
                         break;
+                
                 ctx->fp = fp;
                 ctx->pc = pc;

kernel/generic/src/debug/symtab.c

@@ -192 +192 @@
                 uintptr_t addr = uint64_t_le2host(symbol_table[pos].address_le);
                 char *realname = symbol_table[pos].symbol_name;
-                printf("%p: %s\n", addr, realname);
+                printf("%p: %s\n", (void *) addr, realname);
                 pos++;
         }

kernel/generic/src/interrupt/interrupt.c

@@ -176 +176 @@
         printf("Task %s (%" PRIu64 ") killed due to an exception at "
             "program counter %p.\n", TASK->name, TASK->taskid,
-            istate_get_pc(istate));
+            (void *) istate_get_pc(istate));
         
         stack_trace_istate(istate);

kernel/generic/src/ipc/ipc.c

@@ -702 +702 @@
         for (i = 0; i < IPC_MAX_PHONES; i++) {
                 if (SYNCH_FAILED(mutex_trylock(&task->phones[i].lock))) {
-                        printf("%d: mutex busy\n", i);
+                        printf("%zu: mutex busy\n", i);
                         continue;
                 }
                 
                 if (task->phones[i].state != IPC_PHONE_FREE) {
-                        printf("%" PRIs ": ", i);
+                        printf("%zu: ", i);
                         
                         switch (task->phones[i].state) {

kernel/generic/src/main/kinit.c

@@ -129 +129 @@
                  * For each CPU, create its load balancing thread.
                  */
-                size_t i;
+                unsigned int i;
                 
                 for (i = 0; i < config.cpu_count; i++) {
@@ -139 +139 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu" PRIs "\n", i);
+                                printf("Unable to create kcpulb thread for cpu%u\n", i);
                 }
         }
@@ -179 +179 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].addr % FRAME_SIZE) {
-                        printf("init[%" PRIs "].addr is not frame aligned\n", i);
+                        printf("init[%zu].addr is not frame aligned\n", i);
                         programs[i].task = NULL;
                         continue;
@@ -219 +219 @@
                         
                         if (rd != RE_OK)
-                                printf("Init binary %" PRIs " not used (error %d)\n", i, rd);
+                                printf("Init binary %zu not used (error %d)\n", i, rd);
                 }
         }

kernel/generic/src/main/main.c

@@ -183 +183 @@
         version_print();
         
-        LOG("\nconfig.base=%p config.kernel_size=%" PRIs
-            "\nconfig.stack_base=%p config.stack_size=%" PRIs,
+        LOG("\nconfig.base=%p config.kernel_size=%zu"
+            "\nconfig.stack_base=%p config.stack_size=%zu",
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
@@ -225 +225 @@
         slab_enable_cpucache();
         
-        printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
+        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
             config.cpu_count, SIZE2MB(zones_total_size()));
         
@@ -241 +241 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIs "].addr=%p, init[%" PRIs
-                            "].size=%" PRIs, i, init.tasks[i].addr, i,
-                            init.tasks[i].size);
+                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
+                            i, init.tasks[i].addr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");

kernel/generic/src/mm/as.c

@@ -1811 +1811 @@
         }
         
-        panic("Inconsistency detected while adding %" PRIs " pages of used "
-            "space at %p.", count, page);
+        panic("Inconsistency detected while adding %zu pages of used "
+            "space at %p.", count, (void *) page);
 }
 
@@ -1991 +1991 @@
         
 error:
-        panic("Inconsistency detected while removing %" PRIs " pages of used "
-            "space from %p.", count, page);
+        panic("Inconsistency detected while removing %zu pages of used "
+            "space from %p.", count, (void *) page);
 }
 
@@ -2105 +2105 @@
                         
                         mutex_lock(&area->lock);
-                        printf("as_area: %p, base=%p, pages=%" PRIs
-                            " (%p - %p)\n", area, area->base, area->pages,
-                            area->base, area->base + FRAMES2SIZE(area->pages));
+                        printf("as_area: %p, base=%p, pages=%zu"
+                            " (%p - %p)\n", area, (void *) area->base,
+                            area->pages, (void *) area->base,
+                            (void *) (area->base + FRAMES2SIZE(area->pages)));
                         mutex_unlock(&area->lock);
                 }

kernel/generic/src/mm/frame.c

@@ -145 +145 @@
                             (!iswithin(zones.info[i].base, zones.info[i].count,
                             base, count))) {
-                                printf("Zone (%p, %p) overlaps with previous zone (%p, %p)!\n",
-                                    PFN2ADDR(base), PFN2ADDR(count),
-                                    PFN2ADDR(zones.info[i].base),
-                                    PFN2ADDR(zones.info[i].count));
+                                printf("Zone (%p, %p) overlaps "
+                                    "with previous zone (%p %p)!\n",
+                                    (void *) PFN2ADDR(base), (void *) PFN2ADDR(count),
+                                    (void *) PFN2ADDR(zones.info[i].base),
+                                    (void *) PFN2ADDR(zones.info[i].count));
                         }
                         
@@ -1049 +1050 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " waiting for %" PRIs " frames, "
-                    "%" PRIs " available.\n", THREAD->tid, size, avail);
+                printf("Thread %" PRIu64 " waiting for %zu frames, "
+                    "%zu available.\n", THREAD->tid, size, avail);
 #endif
                 
@@ -1297 +1298 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-4" PRIs, i);
+                printf("%-4zu", i);
                 
 #ifdef __32_BITS__
-                printf("  %10p", base);
+                printf("  %p", (void *) base);
 #endif
                 
 #ifdef __64_BITS__
-                printf(" %18p", base);
+                printf(" %p", (void *) base);
 #endif
                 
-                printf(" %12" PRIs " %c%c%c      ", count,
+                printf(" %12zu %c%c%c      ", count,
                     available ? 'A' : ' ',
                     (flags & ZONE_RESERVED) ? 'R' : ' ',
@@ -1313 +1314 @@
                 
                 if (available)
-                        printf("%14" PRIs " %14" PRIs,
+                        printf("%14zu %14zu",
                             free_count, busy_count);
                 
@@ -1354 +1355 @@
         bool available = zone_flags_available(flags);
         
-        printf("Zone number:       %" PRIs "\n", znum);
-        printf("Zone base address: %p\n", base);
-        printf("Zone size:         %" PRIs " frames (%" PRIs " KiB)\n", count,
+        printf("Zone number:       %zu\n", znum);
+        printf("Zone base address: %p\n", (void *) base);
+        printf("Zone size:         %zu frames (%zu KiB)\n", count,
             SIZE2KB(FRAMES2SIZE(count)));
         printf("Zone flags:        %c%c%c\n",
@@ -1364 +1365 @@
         
         if (available) {
-                printf("Allocated space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                printf("Allocated space:   %zu frames (%zu KiB)\n",
                     busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
-                printf("Available space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                printf("Available space:   %zu frames (%zu KiB)\n",
                     free_count, SIZE2KB(FRAMES2SIZE(free_count)));
         }

kernel/generic/src/mm/slab.c

@@ -890 +890 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8" PRIs " %8u %8" PRIs " %8ld %8ld %8ld %-5s\n",
+                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
                     name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,

kernel/generic/src/proc/program.c

@@ -145 +145 @@
                 
                 program_loader = image_addr;
-                LOG("Registered program loader at 0x%" PRIp,
-                    image_addr);
+                LOG("Registered program loader at %p",
+                    (void *) image_addr);
                 
                 return EOK;

kernel/generic/src/proc/scheduler.c

@@ -727 +727 @@
                 irq_spinlock_lock(&cpus[cpu].lock, true);
                 
-                printf("cpu%u: address=%p, nrdy=%ld, needs_relink=%" PRIs "\n",
+                printf("cpu%u: address=%p, nrdy=%" PRIua ", needs_relink=%zu\n",
                     cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
                     cpus[cpu].needs_relink);

kernel/generic/src/proc/task.c

@@ -478 +478 @@
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9lu %7lu", task->taskid,
+                printf("%-8" PRIu64 " %9" PRIua " %7" PRIua, task->taskid,
                     atomic_get(&task->refcount), atomic_get(&task->active_calls));
         else
@@ -489 +489 @@
 #ifdef __64_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c %9lu %7lu",
+                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
+                    "%9" PRIua " %7" PRIua,
                     task->taskid, ucycles, usuffix, kcycles, ksuffix,
                     atomic_get(&task->refcount), atomic_get(&task->active_calls));
@@ -501 +502 @@
                 for (i = 0; i < IPC_MAX_PHONES; i++) {
                         if (task->phones[i].callee)
-                                printf(" %" PRIs ":%p", i, task->phones[i].callee);
+                                printf(" %zu:%p", i, task->phones[i].callee);
                 }
                 printf("\n");

kernel/generic/src/synch/spinlock.c

@@ -102 +102 @@
                 
                 if (i++ > DEADLOCK_THRESHOLD) {
-                        printf("cpu%u: looping on spinlock %" PRIp ":%s, "
-                            "caller=%" PRIp "(%s)\n", CPU->id, lock, lock->name,
-                            CALLER, symtab_fmt_name_lookup(CALLER));
+                        printf("cpu%u: looping on spinlock %p:%s, "
+                            "caller=%p (%s)\n", CPU->id, lock, lock->name,
+                            (void *) CALLER, symtab_fmt_name_lookup(CALLER));
                         
                         i = 0;

kernel/generic/src/sysinfo/sysinfo.c

@@ -494 +494 @@
                         break;
                 case SYSINFO_VAL_DATA:
-                        printf("+ %s (%" PRIs" bytes)\n", cur->name,
+                        printf("+ %s (%zu bytes)\n", cur->name,
                             cur->val.data.size);
                         break;
@@ -505 +505 @@
                         /* N.B.: No data was actually returned (only a dry run) */
                         (void) cur->val.fn_data(cur, &size, true);
-                        printf("+ %s (%" PRIs" bytes) [generated]\n", cur->name,
+                        printf("+ %s (%zu bytes) [generated]\n", cur->name,
                             size);
                         break;

kernel/test/avltree/avltree1.c

@@ -202 +202 @@
         avltree_create(tree);
         
-        TPRINTF("Inserting %" PRIs " nodes...", node_count);
+        TPRINTF("Inserting %zu nodes...", node_count);
         
         for (i = 0; i < node_count; i++) {

kernel/test/fpu/fpu1_ia64.c

@@ -161 +161 @@
         
         while (atomic_get(&threads_ok) != total) {
-                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
+                TPRINTF("Threads left: %" PRIua "\n",
+                    total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }

kernel/test/fpu/fpu1_x86.c

@@ -82 +82 @@
                 
                 if ((int) (100000000 * e) != E_10e8) {
-                        TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
+                        TPRINTF("tid%" PRIu64 ": e*10e8=%" PRIun " should be %" PRIun "\n",
+                            THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -115 +116 @@
                 
                 if ((int) (100000000 * pi) != PI_10e8) {
-                        TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
+                        TPRINTF("tid%" PRIu64 ": pi*10e8=%" PRIun " should be %" PRIun "\n",
+                            THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -158 +160 @@
         
         while (atomic_get(&threads_ok) != total) {
-                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
+                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }

kernel/test/fpu/sse1.c

@@ -142 +142 @@
         
         while (atomic_get(&threads_ok) != total) {
-                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
+                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }

kernel/test/mm/falloc1.c

@@ -64 +64 @@
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
-                                        TPRINTF("Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                        TPRINTF("Block at address %p (size %dK) is not aligned\n",
+                                            (void *) frames[allocated], (FRAME_SIZE << order) >> 10);
                                         return "Test failed";
                                 }

kernel/test/mm/falloc2.c

@@ -85 +85 @@
                                 for (k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); k++) {
                                         if (((uint8_t *) frames[i])[k] != val) {
-                                                TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIs "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+                                                TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %zu\n",
+                                                    THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
                                                 atomic_inc(&thread_fail);
                                                 goto cleanup;
@@ -121 +122 @@
         
         while (atomic_get(&thread_count) > 0) {
-                TPRINTF("Threads left: %ld\n", atomic_get(&thread_count));
+                TPRINTF("Threads left: %" PRIua "\n", atomic_get(&thread_count));
                 thread_sleep(1);
         }

kernel/test/mm/mapping1.c

@@ -39 +39 @@
 #define PAGE1  (PAGE0 + PAGE_SIZE)
 
-#define VALUE0  0x01234567
-#define VALUE1  0x89abcdef
+#define VALUE0  UINT32_C(0x01234567)
+#define VALUE1  UINT32_C(0x89abcdef)
 
 const char *test_mapping1(void)
@@ -50 +50 @@
         frame1 = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_KA);
         
-        TPRINTF("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));
+        TPRINTF("Writing %#" PRIx32 " to physical address %p.\n",
+            (uint32_t) VALUE0, (void *) KA2PA(frame0));
         *((uint32_t *) frame0) = VALUE0;
         
-        TPRINTF("Writing %#x to physical address %p.\n", VALUE1, KA2PA(frame1));
+        TPRINTF("Writing %#" PRIx32 " to physical address %p.\n",
+            (uint32_t) VALUE1, (void *) KA2PA(frame1));
         *((uint32_t *) frame1) = VALUE1;
         
-        TPRINTF("Mapping virtual address %p to physical address %p.\n", PAGE0, KA2PA(frame0));
+        TPRINTF("Mapping virtual address %p to physical address %p.\n",
+            (void *) PAGE0, (void *) KA2PA(frame0));
         page_mapping_insert(AS_KERNEL, PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE);
         
-        TPRINTF("Mapping virtual address %p to physical address %p.\n", PAGE1, KA2PA(frame1));
+        TPRINTF("Mapping virtual address %p to physical address %p.\n",
+            (void *) PAGE1, (void *) KA2PA(frame1));
         page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
         
         v0 = *((uint32_t *) PAGE0);
         v1 = *((uint32_t *) PAGE1);
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE0, v0);
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE1, v1);
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE0, v0);
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE1, v1);
         
         if (v0 != VALUE0)
@@ -72 +78 @@
                 return "Value at v1 not equal to VALUE1";
         
-        TPRINTF("Writing %#x to virtual address %p.\n", 0, PAGE0);
+        TPRINTF("Writing %#" PRIx32 " to virtual address %p.\n",
+            (uint32_t) 0, (void *) PAGE0);
         *((uint32_t *) PAGE0) = 0;
         
-        TPRINTF("Writing %#x to virtual address %p.\n", 0, PAGE1);
+        TPRINTF("Writing %#" PRIx32 " to virtual address %p.\n",
+            (uint32_t) 0, (void *) PAGE1);
         *((uint32_t *) PAGE1) = 0;
         
@@ -81 +89 @@
         v1 = *((uint32_t *) PAGE1);
         
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE0, *((uint32_t *) PAGE0)); 
-        TPRINTF("Value at virtual address %p is %#x.\n", PAGE1, *((uint32_t *) PAGE1));
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE0, *((uint32_t *) PAGE0));
+        TPRINTF("Value at virtual address %p is %#" PRIx32 ".\n",
+            (void *) PAGE1, *((uint32_t *) PAGE1));
         
         if (v0 != 0)

kernel/test/synch/semaphore1.c

@@ -88 +88 @@
                 producers = (4 - i) * PRODUCERS;
                 
-                TPRINTF("Creating %d consumers and %d producers...", consumers, producers);
+                TPRINTF("Creating %" PRIua " consumers and %" PRIua " producers...",
+                    consumers, producers);
                 
                 for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) {
@@ -113 +114 @@
                 
                 while ((items_consumed.count != consumers) || (items_produced.count != producers)) {
-                        TPRINTF("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count);
+                        TPRINTF("%" PRIua " consumers remaining, %" PRIua " producers remaining\n",
+                            consumers - items_consumed.count, producers - items_produced.count);
                         thread_sleep(1);
                 }

kernel/test/thread/thread1.c

@@ -76 +76 @@
         atomic_set(&finish, 0);
         while (atomic_get(&threads_finished) < total) {
-                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_finished));
+                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_finished));
                 thread_sleep(1);
         }