Changeset 7e752b2 in mainline for kernel/arch/ppc32/src

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/arch/ppc32/src

Files:

• cpu/cpu.c (modified) (1 diff)
• interrupt.c (modified) (2 diffs)
• mm/frame.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/tlb.c (modified) (3 diffs)

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" : "");