Changeset fbf7b4c in mainline


Ignore:
Timestamp:
2006-06-18T10:52:41Z (18 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e600ec4
Parents:
281994b
Message:

make kernel prints case consistent

Files:
18 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/src/interrupt.c

    r281994b rfbf7b4c  
    6363
    6464        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n, __FUNCTION__);
    65         printf("%%rip: %#llX (%s)\n",istate->rip, symbol);
    66         printf("ERROR_WORD=%#llX\n", istate->error_word);
    67         printf("%%rcs=%#llX, flags=%#llX, %%cr0=%#llX\n", istate->cs, istate->rflags,read_cr0());
    68         printf("%%rax=%#llX, %%rcx=%#llX, %%rdx=%#llX\n",istate->rax,istate->rcx,istate->rdx);
    69         printf("%%rsi=%#llX, %%rdi=%#llX, %%r8 =%#llX\n",istate->rsi,istate->rdi,istate->r8);
    70         printf("%%r9 =%#llX, %%r10 =%#llX, %%r11=%#llX\n",istate->r9,istate->r10,istate->r11);
     65        printf("%%rip: %#llx (%s)\n",istate->rip, symbol);
     66        printf("ERROR_WORD=%#llx\n", istate->error_word);
     67        printf("%%rcs=%#llx, flags=%#llx, %%cr0=%#llx\n", istate->cs, istate->rflags, read_cr0());
     68        printf("%%rax=%#llx, %%rcx=%#llx, %%rdx=%#llx\n", istate->rax, istate->rcx, istate->rdx);
     69        printf("%%rsi=%#llx, %%rdi=%#llx, %%r8 =%#llx\n", istate->rsi, istate->rdi, istate->r8);
     70        printf("%%r9 =%#llx, %%r10 =%#llx, %%r11=%#llx\n", istate->r9, istate->r10, istate->r11);
    7171#ifdef CONFIG_DEBUG_ALLREGS     
    72         printf("%%r12=%#llX, %%r13=%#llX, %%r14=%#llX\n",istate->r12,istate->r13,istate->r14);
    73         printf("%%r15=%#llX, %%rbx=%#llX, %%rbp=%#llX\n",istate->r15,istate->rbx,&istate->rbp);
     72        printf("%%r12=%#llx, %%r13=%#llx, %%r14=%#llx\n", istate->r12, istate->r13, istate->r14);
     73        printf("%%r15=%#llx, %%rbx=%#llx, %%rbp=%#llx\n", istate->r15, istate->rbx, &istate->rbp);
    7474#endif
    75         printf("%%rsp=%#llX\n",&istate->stack[0]);
     75        printf("%%rsp=%#llx\n", &istate->stack[0]);
    7676}
    7777

  • arch/amd64/src/mm/memory_init.c

    r281994b rfbf7b4c  
    5252       
    5353        for (i=0;i<e820counter;i++) {
    54                 printf("E820 base: %#llX size: %#llX type: ", e820table[i].base_address, e820table[i].size);
     54                printf("E820 base: %#llx size: %#llx type: ", e820table[i].base_address, e820table[i].size);
    5555                switch (e820table[i].type) {
    5656                        case MEMMAP_MEMORY_AVAILABLE:

  • arch/amd64/src/mm/page.c

    r281994b rfbf7b4c  
    193193
    194194                print_info_errcode(n, istate);
    195                 printf("Page fault address: %llX\n", page);
     195                printf("Page fault address: %llx\n", page);
    196196                panic("page fault\n");
    197197        }

  • arch/ia32/src/interrupt.c

    r281994b rfbf7b4c  
    136136                :"=m"(mxcsr)
    137137        );
    138         fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zX",
     138        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx",
    139139                             (__native)mxcsr);
    140140
    141141        PRINT_INFO_ERRCODE(istate);
    142         printf("MXCSR: %#zX\n",(__native)(mxcsr));
     142        printf("MXCSR: %#zx\n",(__native)(mxcsr));
    143143        panic("SIMD FP exception(19)\n");
    144144}

  • arch/ia64/src/mm/tlb.c

    r281994b rfbf7b4c  
    471471                page_table_unlock(AS, true);
    472472                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
    473                         fault_if_from_uspace(istate,"Page fault at %P",va);
     473                        fault_if_from_uspace(istate,"Page fault at %p",va);
    474474                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
    475475                }
    … …  
    518518                page_table_unlock(AS, true);
    519519                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
    520                         fault_if_from_uspace(istate,"Page fault at %P",va);
     520                        fault_if_from_uspace(istate,"Page fault at %p",va);
    521521                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
    522522                }
    … …  
    564564        } else {
    565565                if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
    566                         fault_if_from_uspace(istate,"Page fault at %P",va);
     566                        fault_if_from_uspace(istate,"Page fault at %p",va);
    567567                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
    568568                        t->d = true;
    … …  
    601601        } else {
    602602                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
    603                         fault_if_from_uspace(istate,"Page fault at %P",va);
     603                        fault_if_from_uspace(istate,"Page fault at %p",va);
    604604                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
    605605                        t->a = true;
    … …  
    638638        } else {
    639639                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
    640                         fault_if_from_uspace(istate,"Page fault at %P",va);
     640                        fault_if_from_uspace(istate,"Page fault at %p",va);
    641641                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
    642642                        t->a = true;
    … …  
    680680                page_table_unlock(AS, true);
    681681                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
    682                         fault_if_from_uspace(istate,"Page fault at %P",va);
     682                        fault_if_from_uspace(istate,"Page fault at %p",va);
    683683                        panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rid);
    684684                }

  • arch/mips32/src/mm/tlb.c

    r281994b rfbf7b4c  
    345345                sym2 = s;
    346346
    347         fault_if_from_uspace(istate, "TLB Refill Exception on %P", cp0_badvaddr_read());
    348         panic("%X: TLB Refill Exception at %X(%s<-%s)\n", cp0_badvaddr_read(), istate->epc, symbol, sym2);
     347        fault_if_from_uspace(istate, "TLB Refill Exception on %p", cp0_badvaddr_read());
     348        panic("%x: TLB Refill Exception at %x(%s<-%s)\n", cp0_badvaddr_read(), istate->epc, symbol, sym2);
    349349}
    350350
    … …  
    357357        if (s)
    358358                symbol = s;
    359         fault_if_from_uspace(istate, "TLB Invalid Exception on %P", cp0_badvaddr_read());
    360         panic("%X: TLB Invalid Exception at %X(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
     359        fault_if_from_uspace(istate, "TLB Invalid Exception on %p", cp0_badvaddr_read());
     360        panic("%x: TLB Invalid Exception at %x(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
    361361}
    362362
    … …  
    368368        if (s)
    369369                symbol = s;
    370         fault_if_from_uspace(istate, "TLB Modified Exception on %P", cp0_badvaddr_read());
    371         panic("%X: TLB Modified Exception at %X(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
     370        fault_if_from_uspace(istate, "TLB Modified Exception on %p", cp0_badvaddr_read());
     371        panic("%x: TLB Modified Exception at %x(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
    372372}
    373373

  • arch/sparc64/src/mm/tlb.c

    r281994b rfbf7b4c  
    208208                t.value = itlb_tag_read_read(i);
    209209               
    210                 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",
     210                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",
    211211                        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);
    212212        }
    … …  
    217217                t.value = dtlb_tag_read_read(i);
    218218               
    219                 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",
     219                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",
    220220                        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);
    221221        }

  • arch/sparc64/src/trap/exception.c

    r281994b rfbf7b4c  
    5353void do_data_access_error(void)
    5454{
    55         panic("Data Access Error: %P\n", tpc_read());
     55        panic("Data Access Error: %p\n", tpc_read());
    5656}
    5757
    … …  
    5959void do_illegal_instruction(void)
    6060{
    61         panic("Illegal Instruction: %P\n", tpc_read());
     61        panic("Illegal Instruction: %p\n", tpc_read());
    6262}
    6363

  • genarch/src/acpi/acpi.c

    r281994b rfbf7b4c  
    107107                                        goto next;
    108108                                *signature_map[j].sdt_ptr = h;
    109                                 printf("%#zX: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
     109                                printf("%#zx: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
    110110                        }
    111111                }
    … …  
    128128                                        goto next;
    129129                                *signature_map[j].sdt_ptr = h;
    130                                 printf("%#zX: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
     130                                printf("%#zx: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
    131131                        }
    132132                }
    … …  
    162162
    163163rsdp_found:
    164         printf("%#zX: ACPI Root System Description Pointer\n", acpi_rsdp);
     164        printf("%#zx: ACPI Root System Description Pointer\n", acpi_rsdp);
    165165
    166166        acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address;

  • genarch/src/acpi/madt.c

    r281994b rfbf7b4c  
    237237{
    238238        ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));
    239         printf("MADT: ignoring %s entry: bus=%zd, source=%zd, global_int=%zd, flags=%#hX\n",
     239        printf("MADT: ignoring %s entry: bus=%zd, source=%zd, global_int=%zd, flags=%#hx\n",
    240240                entry[override->header.type], override->bus, override->source,
    241241                override->global_int, override->flags);

  • generic/include/interrupt.h

    r281994b rfbf7b4c  
    5757        if (istate_from_uspace(istate)) { \
    5858                klog_printf(cmd, ##__VA_ARGS__); \
    59                 klog_printf("Task %lld got exception at PC:%P. Task killed.", TASK->taskid, istate_get_pc(istate)); \
     59                klog_printf("Task %lld got exception at PC:%p. Task killed.", TASK->taskid, istate_get_pc(istate)); \
    6060                task_kill(TASK->taskid); \
    6161                thread_exit(); \

  • generic/src/console/cmd.c

    r281994b rfbf7b4c  
    535535                symbol = get_symtab_entry(symaddr);
    536536
    537                 printf("Calling f(0x%zX): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
     537                printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
    538538#ifdef ia64
    539539                fptr.f = symaddr;

  • generic/src/ipc/ipc.c

    r281994b rfbf7b4c  
    479479                                break;
    480480                        case IPC_PHONE_CONNECTED:
    481                                 printf("connected to: %P ",
     481                                printf("connected to: %p ",
    482482                                       task->phones[i].callee);
    483483                                break;
    484484                        case IPC_PHONE_SLAMMED:
    485                                 printf("slammed by: %P ",
     485                                printf("slammed by: %p ",
    486486                                       task->phones[i].callee);
    487487                                break;
    488488                        case IPC_PHONE_HUNGUP:
    489                                 printf("hung up - was: %P ",
     489                                printf("hung up - was: %p ",
    490490                                       task->phones[i].callee);
    491491                                break;
    … …  
    504504        for (tmp=task->answerbox.calls.next; tmp != &task->answerbox.calls;tmp = tmp->next) {
    505505                call = list_get_instance(tmp, call_t, link);
    506                 printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
     506                printf("Callid: %p Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
    507507                       call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
    508508                       IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
    … …  
    514514             tmp = tmp->next) {
    515515                call = list_get_instance(tmp, call_t, link);
    516                 printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
     516                printf("Callid: %p Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
    517517                       call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
    518518                       IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
    … …  
    522522        for (tmp=task->answerbox.answers.next; tmp != &task->answerbox.answers; tmp = tmp->next) {
    523523                call = list_get_instance(tmp, call_t, link);
    524                 printf("Callid:%P M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
     524                printf("Callid:%p M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
    525525                       IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
    526526                       IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);

  • generic/src/mm/as.c

    r281994b rfbf7b4c  
    13101310        }
    13111311
    1312         panic("Inconsistency detected while adding %d pages of used space at %P.\n", count, page);
     1312        panic("Inconsistency detected while adding %d pages of used space at %p.\n", count, page);
    13131313}
    13141314
    … …  
    14641464
    14651465error:
    1466         panic("Inconsistency detected while removing %d pages of used space from %P.\n", count, page);
     1466        panic("Inconsistency detected while removing %d pages of used space from %p.\n", count, page);
    14671467}
    14681468

  • generic/src/proc/task.c

    r281994b rfbf7b4c  
    356356               
    357357                        spinlock_lock(&t->lock);
    358                         printf("%s(%lld): address=%#zX, as=%#zX, ActiveCalls: %zd",
     358                        printf("%s(%lld): address=%#zx, as=%#zx, ActiveCalls: %zd",
    359359                                t->name, t->taskid, t, t->as, atomic_get(&t->active_calls));
    360360                        for (j=0; j < IPC_MAX_PHONES; j++) {
    361361                                if (t->phones[j].callee)
    362                                         printf(" Ph(%zd): %#zX ", j, t->phones[j].callee);
     362                                        printf(" Ph(%zd): %#zx ", j, t->phones[j].callee);
    363363                        }
    364364                        printf("\n");

  • generic/src/proc/thread.c

    r281994b rfbf7b4c  
    537537               
    538538                        t = (thread_t *) node->value[i];
    539                         printf("%s: address=%#zX, tid=%zd, state=%s, task=%#zX, code=%#zX, stack=%#zX, cpu=",
     539                        printf("%s: address=%#zx, tid=%zd, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
    540540                                t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
    541541                        if (t->cpu)
    … …  
    544544                                printf("none");
    545545                        if (t->state == Sleeping) {
    546                                 printf(", kst=%#zX", t->kstack);
    547                                 printf(", wq=%#zX", t->sleep_queue);
     546                                printf(", kst=%#zx", t->kstack);
     547                                printf(", wq=%#zx", t->sleep_queue);
    548548                        }
    549549                        printf("\n");

  • generic/src/sysinfo/sysinfo.c

    r281994b rfbf7b4c  
    245245                }
    246246               
    247                 printf("%s    %s val:%d(%X) sub:%s\n", root->name, vtype, val, val, (root->subinfo_type == SYSINFO_SUBINFO_NONE) ? "NON" : ((root->subinfo_type == SYSINFO_SUBINFO_TABLE) ? "TAB" : "FUN"));
     247                printf("%s    %s val:%d(%x) sub:%s\n", root->name, vtype, val, val, (root->subinfo_type == SYSINFO_SUBINFO_NONE) ? "NON" : ((root->subinfo_type == SYSINFO_SUBINFO_TABLE) ? "TAB" : "FUN"));
    248248               
    249249                if (root->subinfo_type == SYSINFO_SUBINFO_TABLE)

  • test/print/print1/test.c

    r281994b rfbf7b4c  
    5050        printf(" 0xint: x '%#x', 5.3x '%#5.3x', -5.3x '%#-5.3x', 3.5x '%#3.5x', -3.5x '%#-3.5x' \n",17, 17, 17, 17, 17 );
    5151
    52         printf("'%#llx' 64bit, '%#x' 32bit, '%#hhx' 8bit, '%#hx' 16bit, __native '%#zX'. '%#llX' 64bit and '%s' string.\n", 0x1234567887654321ll, 0x12345678, 0x12, 0x1234, nat, 0x1234567887654321ull, "Lovely string" );
     52        printf("'%#llx' 64bit, '%#x' 32bit, '%#hhx' 8bit, '%#hx' 16bit, __native '%#zx'. '%#llx' 64bit and '%s' string.\n", 0x1234567887654321ll, 0x12345678, 0x12, 0x1234, nat, 0x1234567887654321ull, "Lovely string" );
    5353       
    5454        printf(" Print to NULL '%s'\n",NULL);
Note: See TracChangeset for help on using the changeset viewer.