Changeset 7e752b2 in mainline for kernel/arch/sparc64/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/sparc64/src

Files:

• console.c (modified) (2 diffs)
• drivers/pci.c (modified) (1 diff)
• mm/sun4u/tlb.c (modified) (6 diffs)
• mm/sun4v/tlb.c (modified) (4 diffs)
• sun4v/md.c (modified) (1 diff)
• trap/sun4v/interrupt.c (modified) (1 diff)

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);
 }