Changeset cf85e24c in mainline for arch

Timestamp:

2006-04-22T23:00:26Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

12c7f27

Parents:

e692a27

Message:

printf-related and other code cleanup

Location:

arch

Files:

• amd64/src/debugger.c (modified) (1 diff)
• ia32/src/interrupt.c (modified) (2 diffs)
• ia32/src/mm/frame.c (modified) (1 diff)
• ia32/src/smp/mps.c (modified) (2 diffs)
• ia64/src/interrupt.c (modified) (3 diffs)
• ia64/src/mm/tlb.c (modified) (3 diffs)
• mips32/src/drivers/arc.c (modified) (3 diffs)
• mips32/src/exception.c (modified) (1 diff)
• ppc32/src/mm/memory_init.c (modified) (1 diff)
• ppc64/src/mm/memory_init.c (modified) (1 diff)
• sparc64/src/mm/tlb.c (modified) (1 diff)

arch/amd64/src/debugger.c

@@ -232 +232 @@
                         if (*((__native *) breakpoints[slot].address) != 0)
                                 return;
-                        printf("**** Found ZERO on address %P ****\n",
+                        printf("**** Found ZERO on address %p ****\n",
                                slot, breakpoints[slot].address);
                 } else {
-                        printf("Data watchpoint - new data: %P\n",
+                        printf("Data watchpoint - new data: %p\n",
                                *((__native *) breakpoints[slot].address));
                 }
         }
-        printf("Reached breakpoint %d:%P(%s)\n", slot, getip(istate),
+        printf("Reached breakpoint %d:%p(%s)\n", slot, getip(istate),
                get_symtab_entry(getip(istate)));
         printf("***Type 'exit' to exit kconsole.\n");

arch/ia32/src/interrupt.c

@@ -62 +62 @@
                 printf("----------------EXCEPTION OCCURED----------------\n");
                 
-        printf("%%eip: %#X (%s)\n",istate->eip,symbol);
-        printf("ERROR_WORD=%#X\n", istate->error_word);
-        printf("%%cs=%#X,flags=%#X\n", istate->cs, istate->eflags);
-        printf("%%eax=%#X, %%ecx=%#X, %%edx=%#X, %%esp=%#X\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
+        printf("%%eip: %#x (%s)\n",istate->eip,symbol);
+        printf("ERROR_WORD=%#x\n", istate->error_word);
+        printf("%%cs=%#x,flags=%#x\n", istate->cs, istate->eflags);
+        printf("%%eax=%#x, %%ecx=%#x, %%edx=%#x, %%esp=%#x\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
 #ifdef CONFIG_DEBUG_ALLREGS
-        printf("%%esi=%#X, %%edi=%#X, %%ebp=%#X, %%ebx=%#X\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
+        printf("%%esi=%#x, %%edi=%#x, %%ebp=%#x, %%ebx=%#x\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
 #endif
-        printf("stack: %#X, %#X, %#X, %#X\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
-        printf("       %#X, %#X, %#X, %#X\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
+        printf("stack: %#x, %#x, %#x, %#x\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
+        printf("       %#x, %#x, %#x, %#x\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
 }
 
@@ -121 +121 @@
         if (!as_page_fault(page)) {
                 PRINT_INFO_ERRCODE(istate);
-                printf("page fault address: %#X\n", page);
+                printf("page fault address: %#x\n", page);
                 panic("page fault\n");
         }

arch/ia32/src/mm/frame.c

@@ -92 +92 @@
                 else
                         name = "invalid";
-                printf("%P %#llXB %s\n", 
+                printf("%p %#llXB %s\n", 
                        (__native) e820table[i].base_address, 
                        (__u64) e820table[i].size,

arch/ia32/src/smp/mps.c

@@ -188 +188 @@
         
 fs_found:
-        printf("%P: MPS Floating Pointer Structure\n", fs);
+        printf("%p: MPS Floating Pointer Structure\n", fs);
 
         if (fs->config_type == 0 && fs->configuration_table) {
@@ -407 +407 @@
                 switch (cur[CT_EXT_ENTRY_TYPE]) {
                         default:
-                                printf("%P: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
+                                printf("%p: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
                                 break;
                 }

arch/ia64/src/interrupt.c

@@ -132 +132 @@
         putchar('\n');
         printf("Interrupted context dump:\n");
-        printf("ar.bsp=%P\tar.bspstore=%P\n", istate->ar_bsp, istate->ar_bspstore);
-        printf("ar.rnat=%#llX\tar.rsc=%$llX\n", istate->ar_rnat, istate->ar_rsc);
-        printf("ar.ifs=%#llX\tar.pfs=%#llX\n", istate->ar_ifs, istate->ar_pfs);
-        printf("cr.isr=%#llX\tcr.ipsr=%#llX\t\n", istate->cr_isr.value, istate->cr_ipsr);
+        printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp, istate->ar_bspstore);
+        printf("ar.rnat=%#llx\tar.rsc=%$llx\n", istate->ar_rnat, istate->ar_rsc);
+        printf("ar.ifs=%#llx\tar.pfs=%#llx\n", istate->ar_ifs, istate->ar_pfs);
+        printf("cr.isr=%#llx\tcr.ipsr=%#llx\t\n", istate->cr_isr.value, istate->cr_ipsr);
         
-        printf("cr.iip=%#llX, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei ,iip ? iip : "?");
-        printf("cr.iipa=%#llX\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
-        printf("cr.ifa=%#llX\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
+        printf("cr.iip=%#llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, iip ? iip : "?");
+        printf("cr.iipa=%#llx\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
+        printf("cr.ifa=%#llx\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
 }
 
@@ -183 +183 @@
 #else
         dump_interrupted_context(istate);
-        panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
+        panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
 #endif
 }
@@ -218 +218 @@
 {
         dump_interrupted_context(istate);
-        panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
+        panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
 }
 

arch/ia64/src/mm/tlb.c

@@ -449 +449 @@
                 page_table_unlock(AS, true);
                 if (!as_page_fault(va)) {
-                        panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
                 }
         }
@@ -495 +495 @@
                 page_table_unlock(AS, true);
                 if (!as_page_fault(va)) {
-                        panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, va, rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                 }
         }
@@ -610 +610 @@
                 page_table_unlock(AS, true);
                 if (!as_page_fault(va)) {
-                        panic("%s: va=%P, rid=%d\n", __FUNCTION__, va, rr.map.rid);
+                        panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rr.map.rid);
                 }
         }

arch/mips32/src/drivers/arc.c

@@ -136 +136 @@
                 switch (configdata->descr[i].type) {
                 case CmResourceTypePort:
-                        printf("Port: %P-size:%d ",
+                        printf("Port: %p-size:%d ",
                                (__address)configdata->descr[i].u.port.start,
                                configdata->descr[i].u.port.length);
@@ -146 +146 @@
                         break;
                 case CmResourceTypeMemory:
-                        printf("Memory: %P-size:%d ",
+                        printf("Memory: %p-size:%d ",
                                (__address)configdata->descr[i].u.port.start,
                                configdata->descr[i].u.port.length);
@@ -213 +213 @@
         desc = arc_entry->getmemorydescriptor(NULL);
         while (desc) {
-                printf("%s: %d(%P) (size: %dKB)\n",basetypes[desc->type],
+                printf("%s: %d(%p) (size: %dKB)\n",basetypes[desc->type],
                        desc->basepage * ARC_FRAME,
                        desc->basepage * ARC_FRAME,

arch/mips32/src/exception.c

@@ -74 +74 @@
                 rasymbol = s;
         
-        printf("PC: %#X(%s) RA: %#X(%s), SP(%P)\n",istate->epc,pcsymbol,
-               istate->ra,rasymbol, istate->sp);
+        printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol, istate->ra, rasymbol, istate->sp);
 }
 

arch/ppc32/src/mm/memory_init.c

@@ -44 +44 @@
         
         for (i = 0; i < bootinfo.memmap.count; i++)
-                printf("base: %#X size: %#X\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
+                printf("base: %#x size: %#x\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
 }

arch/ppc64/src/mm/memory_init.c

@@ -44 +44 @@
         
         for (i = 0; i < bootinfo.memmap.count; i++)
-                printf("base: %P size: %#X\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
+                printf("base: %p size: %#x\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
 }

arch/sparc64/src/mm/tlb.c

@@ -173 +173 @@
                 tpc_str = get_symtab_entry(tpc);
 
-                printf("Faulting page: %P, ASID=%d\n", tag.vpn * PAGE_SIZE, tag.context);
-                printf("TPC=%P, (%s)\n", tpc, tpc_str ? tpc_str : "?");
+                printf("Faulting page: %p, ASID=%d\n", tag.vpn * PAGE_SIZE, tag.context);
+                printf("TPC=%p, (%s)\n", tpc, tpc_str ? tpc_str : "?");
                 panic("%s\n", __FUNCTION__);
         }