Changeset bf61d3a in mainline for kernel/arch/ppc32/src/mm/tlb.c

Timestamp:

2010-11-26T01:34:21Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

273b958

Parents:

4b9a410 (diff), 7e752b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge compile-time printf() argument checking, fixes of actual printf() arguments and related modifications

File:

• kernel/arch/ppc32/src/mm/tlb.c (modified) (3 diffs)

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