WebSVN – HelenOS-historic – Path Comparison – / – /kernel/trunk/arch Rev 1191 and /kernel/trunk/arch/ Rev 1196

Ignore whitespace Rev 1191 → Rev 1196

 /kernel/trunk/arch/sparc64/src/mm/tlb.c
 ,7 → 201,7
         d.value = itlb_data_access_read(i);
         t.value = itlb_tag_read_read(i);
-        printf("%d: vpn=%Q, context=%d, v=%d, size=%d, nfo=%d, ie=%d, soft2=%X, diag=%X, pfn=%X, soft=%X, l=%d, cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n",
+        printf("%d: vpn=%#llX, context=%d, v=%d, size=%d, nfo=%d, ie=%d, soft2=%#X, diag=%#X, pfn=%#X, soft=%#X, l=%d, cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n",
             i, t.vpn, t.context, d.v, d.size, d.nfo, d.ie, d.soft2, d.diag, d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
     }
 ,7 → 210,7
         d.value = dtlb_data_access_read(i);
         t.value = dtlb_tag_read_read(i);
-        printf("%d: vpn=%Q, context=%d, v=%d, size=%d, nfo=%d, ie=%d, soft2=%X, diag=%X, pfn=%X, soft=%X, l=%d, cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n",
+        printf("%d: vpn=%#llX, context=%d, v=%d, size=%d, nfo=%d, ie=%d, soft2=%#X, diag=%#X, pfn=%#X, soft=%#X, l=%d, cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n",
             i, t.vpn, t.context, d.v, d.size, d.nfo, d.ie, d.soft2, d.diag, d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
     }

 /kernel/trunk/arch/ia64/src/interrupt.c
 ,13 → 132,13
     putchar('\n');
     printf("Interrupted context dump:\n");
     printf("ar.bsp=%P\tar.bspstore=%P\n", istate->ar_bsp, istate->ar_bspstore);
-    printf("ar.rnat=%Q\tar.rsc=%Q\n", istate->ar_rnat, istate->ar_rsc);
-    printf("ar.ifs=%Q\tar.pfs=%Q\n", istate->ar_ifs, istate->ar_pfs);
-    printf("cr.isr=%Q\tcr.ipsr=%Q\t\n", istate->cr_isr.value, istate->cr_ipsr);
+    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=%Q, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei ,iip ? iip : "?");
-    printf("cr.iipa=%Q\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
-    printf("cr.ifa=%Q\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 : "?");
 }
 void general_exception(__u64 vector, istate_t *istate)
 ,7 → 182,7
     scheduler_fpu_lazy_request();
 #else
     dump_interrupted_context(istate);
-    panic("Interruption: %W (%s)\n", (__u16) vector, vector_to_string(vector));
+    panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
 #endif
 }
 ,7 → 217,7
 void universal_handler(__u64 vector, istate_t *istate)
 {
     dump_interrupted_context(istate);
-    panic("Interruption: %W (%s)\n", (__u16) vector, vector_to_string(vector));
+    panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
 }
 void external_interrupt(__u64 vector, istate_t *istate)

 /kernel/trunk/arch/ppc32/Makefile.inc
 ,6 → 55,11
 CONFIG_PAGE_PT = y
 DEFS += -DCONFIG_PAGE_PT
+## Compile with support for software integer division.
+#
+CONFIG_SOFTINT = y
 ARCH_SOURCES = \
     arch/$(ARCH)/src/console.c \
     arch/$(ARCH)/src/context.S \

/kernel/trunk/arch/ppc32/src/mm/memory_init.c
43,5 → 43,5
count_t i;

for (i = 0; i < bootinfo.memmap.count; i++)
printf("base: %L size: %L\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);
}

 /kernel/trunk/arch/amd64/src/debugger.c
 ,7 → 105,7
     for (i=0; i < BKPOINTS_MAX; i++)
         if (breakpoints[i].address) {
             symbol = get_symtab_entry(breakpoints[i].address);
-            printf("%d. 0x%p in %s\n",i,
+            printf("%d. %p in %s\n",i,
                    breakpoints[i].address, symbol);
             printf("     Count(%d) ", breakpoints[i].counter);
             printf("\n");

 /kernel/trunk/arch/amd64/src/mm/memory_init.c
 ,7 → 45,7
     __u8 i;
     for (i=0;i<e820counter;i++) {
-        printf("E820 base: %Q size: %Q type: ", e820table[i].base_address, e820table[i].size);
+        printf("E820 base: %#llX size: %#llX type: ", e820table[i].base_address, e820table[i].size);
         switch (e820table[i].type) {
             case MEMMAP_MEMORY_AVAILABLE:
                 printf("available memory\n");

 /kernel/trunk/arch/amd64/src/interrupt.c
 ,17 → 51,17
         symbol = "";
     printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n, __FUNCTION__);
-    printf("%%rip: %Q (%s)\n",istate->rip, symbol);
-    printf("ERROR_WORD=%Q\n", istate->error_word);
-    printf("%%rcs=%Q, flags=%Q, %%cr0=%Q\n", istate->cs, istate->rflags,read_cr0());
-    printf("%%rax=%Q, %%rcx=%Q, %%rdx=%Q\n",istate->rax,istate->rcx,istate->rdx);
-    printf("%%rsi=%Q, %%rdi=%Q, %%r8 =%Q\n",istate->rsi,istate->rdi,istate->r8);
-    printf("%%r9 =%Q, %%r10 =%Q, %%r11=%Q\n",istate->r9,istate->r10,istate->r11);
+    printf("%%rip: %#llX (%s)\n",istate->rip, symbol);
+    printf("ERROR_WORD=%#llX\n", istate->error_word);
+    printf("%%rcs=%#llX, flags=%#llX, %%cr0=%#llX\n", istate->cs, istate->rflags,read_cr0());
+    printf("%%rax=%#llX, %%rcx=%#llX, %%rdx=%#llX\n",istate->rax,istate->rcx,istate->rdx);
+    printf("%%rsi=%#llX, %%rdi=%#llX, %%r8 =%#llX\n",istate->rsi,istate->rdi,istate->r8);
+    printf("%%r9 =%#llX, %%r10 =%#llX, %%r11=%#llX\n",istate->r9,istate->r10,istate->r11);
 #ifdef CONFIG_DEBUG_ALLREGS
-    printf("%%r12=%Q, %%r13=%Q, %%r14=%Q\n",istate->r12,istate->r13,istate->r14);
-    printf("%%r15=%Q, %%rbx=%Q, %%rbp=%Q\n",istate->r15,istate->rbx,&istate->rbp);
+    printf("%%r12=%#llX, %%r13=%#llX, %%r14=%#llX\n",istate->r12,istate->r13,istate->r14);
+    printf("%%r15=%#llX, %%rbx=%#llX, %%rbp=%#llX\n",istate->r15,istate->rbx,&istate->rbp);
 #endif
-    printf("%%rsp=%Q\n",&istate->stack[0]);
+    printf("%%rsp=%#llX\n",&istate->stack[0]);
 }
 /*

/kernel/trunk/arch/ppc64/src/mm/memory_init.c
43,5 → 43,5
count_t i;

for (i = 0; i < bootinfo.memmap.count; i++)
printf("base: %L size: %L\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);
}

 /kernel/trunk/arch/mips32/Makefile.inc
 ,7 → 106,12
     CFLAGS += -mhard-float -mips3
 endif
+## Compile with support for software integer division.
+#
+CONFIG_SOFTINT = y
 ARCH_SOURCES = \
     arch/$(ARCH)/src/start.S \
     arch/$(ARCH)/src/context.S \

 /kernel/trunk/arch/mips32/src/exception.c
 ,7 → 73,7
     if (s)
         rasymbol = s;
-    printf("PC: %X(%s) RA: %X(%s), SP(%P)\n",istate->epc,pcsymbol,
+    printf("PC: %#X(%s) RA: %#X(%s), SP(%P)\n",istate->epc,pcsymbol,
            istate->ra,rasymbol, istate->sp);
 }

 /kernel/trunk/arch/mips32/src/debugger.c
 ,7 → 242,7
     for (i=0; i < BKPOINTS_MAX; i++)
         if (breakpoints[i].address) {
             symbol = get_symtab_entry(breakpoints[i].address);
-            printf("%d. 0x%p in %s\n",i,
+            printf("%d. %p in %s\n",i,
                    breakpoints[i].address, symbol);
             printf("     Count(%d) ", breakpoints[i].counter);
             if (breakpoints[i].flags & BKPOINT_INPROG)
 ,7 → 328,7
             printf("Warning: breakpoint recursion\n");
         if (!(cur->flags & BKPOINT_FUNCCALL))
-            printf("***Breakpoint %d: 0x%p in %s.\n", i,
+            printf("***Breakpoint %d: %p in %s.\n", i,
                    fireaddr, get_symtab_entry(istate->epc));
         /* Return first instruction back */
 ,7 → 341,7
         }
         cur->flags |= BKPOINT_INPROG;
     } else {
-        printf("***Breakpoint 0x%p in %s.\n", fireaddr,
+        printf("***Breakpoint %p in %s.\n", fireaddr,
                get_symtab_entry(fireaddr));
         /* Move on to next instruction */
         istate->epc += 4;

 /kernel/trunk/arch/mips32/src/mm/tlb.c
 ,8 → 409,8
         lo0.value = cp0_entry_lo0_read();
         lo1.value = cp0_entry_lo1_read();
-        printf("%d: asid=%d, vpn2=%d, mask=%d\tg[0]=%d, v[0]=%d, d[0]=%d, c[0]=%B, pfn[0]=%d\n"
-               "\t\t\t\tg[1]=%d, v[1]=%d, d[1]=%d, c[1]=%B, pfn[1]=%d\n",
+        printf("%d: asid=%d, vpn2=%d, mask=%d\tg[0]=%d, v[0]=%d, d[0]=%d, c[0]=%hhd, pfn[0]=%d\n"
+               "\t\t\t\tg[1]=%d, v[1]=%d, d[1]=%d, c[1]=%hhd, pfn[1]=%d\n",
                i, hi.asid, hi.vpn2, mask.mask, lo0.g, lo0.v, lo0.d, lo0.c, lo0.pfn,
                lo1.g, lo1.v, lo1.d, lo1.c, lo1.pfn);
     }

 /kernel/trunk/arch/ia32/Makefile.inc
 ,6 → 102,11
     DEFS += -DCONFIG_SIMICS_FIX
 endif
+## Compile with support for software integer division.
+#
+CONFIG_SOFTINT = y
 ARCH_SOURCES = \
     arch/$(ARCH)/src/context.s \
     arch/$(ARCH)/src/debug/panic.s \

 /kernel/trunk/arch/ia32/src/smp/apic.c
 ,13 → 412,13
     printf("LVT on cpu%d, LAPIC ID: %d\n", CPU->id, l_apic_id());
     tm.value = l_apic[LVT_Tm];
-    printf("LVT Tm: vector=%B, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
+    printf("LVT Tm: vector=%hhd, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
     lint.value = l_apic[LVT_LINT0];
-    printf("LVT LINT0: vector=%B, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
+    printf("LVT LINT0: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
     lint.value = l_apic[LVT_LINT1];
-    printf("LVT LINT1: vector=%B, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
+    printf("LVT LINT1: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
     error.value = l_apic[LVT_Err];
-    printf("LVT Err: vector=%B, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
+    printf("LVT Err: vector=%hhd, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
 #endif
 }

 /kernel/trunk/arch/ia32/src/mm/frame.c
 ,7 → 91,7
             name = e820names[e820table[i].type];
         else
             name = "invalid";
-        printf("%P %QB %s\n",
+        printf("%P %#llXB %s\n",
                (__native) e820table[i].base_address,
                (__u64) e820table[i].size,
                name);

 /kernel/trunk/arch/ia32/src/mm/memory_init.c
 ,7 → 45,7
     __u8 i;
     for (i=0;i<e820counter;i++) {
-        printf("E820 base: %Q size: %Q type: ", e820table[i].base_address, e820table[i].size);
+        printf("E820 base: %#llX size: %lld type: ", e820table[i].base_address, e820table[i].size);
         switch (e820table[i].type) {
             case MEMMAP_MEMORY_AVAILABLE:
                 printf("available memory\n");

 /kernel/trunk/arch/ia32/src/interrupt.c
 ,15 → 61,15
     else
         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]);
 }
 void null_interrupt(int n, istate_t *istate)
 ,7 → 100,7
         "stmxcsr %0;\n"
         :"=m"(mxcsr)
     );
-    printf("MXCSR: %X\n",(__native)(mxcsr));
+    printf("MXCSR: %#zX\n",(__native)(mxcsr));
     panic("SIMD FP exception(19)\n");
 }
 ,7 → 120,7
     page = read_cr2();
     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");
     }
 }

Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1191 → Rev 1196