Changeset 280a27e in mainline for arch


Ignore:
Timestamp:
2006-04-16T13:16:44Z (19 years ago)
Author:
Josef Cejka <malyzelenyhnus@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
50de918
Parents:
c624b96
Message:

Printf ported back from uspace to kernel.
Printf calls changed to match new conventions.

Location:
arch
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/src/debugger.c

    rc624b96 r280a27e  
    106106                if (breakpoints[i].address) {
    107107                        symbol = get_symtab_entry(breakpoints[i].address);
    108                         printf("%d. 0x%p in %s\n",i,
     108                        printf("%d. %p in %s\n",i,
    109109                               breakpoints[i].address, symbol);
    110110                        printf("     Count(%d) ", breakpoints[i].counter);

  • arch/amd64/src/interrupt.c

    rc624b96 r280a27e  
    5252
    5353        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n, __FUNCTION__);
    54         printf("%%rip: %Q (%s)\n",istate->rip, symbol);
    55         printf("ERROR_WORD=%Q\n", istate->error_word);
    56         printf("%%rcs=%Q, flags=%Q, %%cr0=%Q\n", istate->cs, istate->rflags,read_cr0());
    57         printf("%%rax=%Q, %%rcx=%Q, %%rdx=%Q\n",istate->rax,istate->rcx,istate->rdx);
    58         printf("%%rsi=%Q, %%rdi=%Q, %%r8 =%Q\n",istate->rsi,istate->rdi,istate->r8);
    59         printf("%%r9 =%Q, %%r10 =%Q, %%r11=%Q\n",istate->r9,istate->r10,istate->r11);
     54        printf("%%rip: %#llX (%s)\n",istate->rip, symbol);
     55        printf("ERROR_WORD=%#llX\n", istate->error_word);
     56        printf("%%rcs=%#llX, flags=%#llX, %%cr0=%#llX\n", istate->cs, istate->rflags,read_cr0());
     57        printf("%%rax=%#llX, %%rcx=%#llX, %%rdx=%#llX\n",istate->rax,istate->rcx,istate->rdx);
     58        printf("%%rsi=%#llX, %%rdi=%#llX, %%r8 =%#llX\n",istate->rsi,istate->rdi,istate->r8);
     59        printf("%%r9 =%#llX, %%r10 =%#llX, %%r11=%#llX\n",istate->r9,istate->r10,istate->r11);
    6060#ifdef CONFIG_DEBUG_ALLREGS     
    61         printf("%%r12=%Q, %%r13=%Q, %%r14=%Q\n",istate->r12,istate->r13,istate->r14);
    62         printf("%%r15=%Q, %%rbx=%Q, %%rbp=%Q\n",istate->r15,istate->rbx,&istate->rbp);
     61        printf("%%r12=%#llX, %%r13=%#llX, %%r14=%#llX\n",istate->r12,istate->r13,istate->r14);
     62        printf("%%r15=%#llX, %%rbx=%#llX, %%rbp=%#llX\n",istate->r15,istate->rbx,&istate->rbp);
    6363#endif
    64         printf("%%rsp=%Q\n",&istate->stack[0]);
     64        printf("%%rsp=%#llX\n",&istate->stack[0]);
    6565}
    6666

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

    rc624b96 r280a27e  
    4646       
    4747        for (i=0;i<e820counter;i++) {
    48                 printf("E820 base: %Q size: %Q type: ", e820table[i].base_address, e820table[i].size);
     48                printf("E820 base: %#llX size: %#llX type: ", e820table[i].base_address, e820table[i].size);
    4949                switch (e820table[i].type) {
    5050                        case MEMMAP_MEMORY_AVAILABLE:

  • arch/ia32/Makefile.inc

    rc624b96 r280a27e  
    103103endif
    104104
     105## Compile with support for software integer division.
     106#
     107
     108CONFIG_SOFTINT = y
     109
    105110ARCH_SOURCES = \
    106111        arch/$(ARCH)/src/context.s \

  • arch/ia32/src/interrupt.c

    rc624b96 r280a27e  
    6262                printf("----------------EXCEPTION OCCURED----------------\n");
    6363               
    64         printf("%%eip: %X (%s)\n",istate->eip,symbol);
    65         printf("ERROR_WORD=%X\n", istate->error_word);
    66         printf("%%cs=%X,flags=%X\n", istate->cs, istate->eflags);
    67         printf("%%eax=%X, %%ecx=%X, %%edx=%X, %%esp=%X\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
     64        printf("%%eip: %#X (%s)\n",istate->eip,symbol);
     65        printf("ERROR_WORD=%#X\n", istate->error_word);
     66        printf("%%cs=%#X,flags=%#X\n", istate->cs, istate->eflags);
     67        printf("%%eax=%#X, %%ecx=%#X, %%edx=%#X, %%esp=%#X\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
    6868#ifdef CONFIG_DEBUG_ALLREGS
    69         printf("%%esi=%X, %%edi=%X, %%ebp=%X, %%ebx=%X\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
     69        printf("%%esi=%#X, %%edi=%#X, %%ebp=%#X, %%ebx=%#X\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
    7070#endif
    71         printf("stack: %X, %X, %X, %X\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
    72         printf("       %X, %X, %X, %X\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
     71        printf("stack: %#X, %#X, %#X, %#X\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
     72        printf("       %#X, %#X, %#X, %#X\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
    7373}
    7474
    … …  
    101101                :"=m"(mxcsr)
    102102        );
    103         printf("MXCSR: %X\n",(__native)(mxcsr));
     103        printf("MXCSR: %#zX\n",(__native)(mxcsr));
    104104        panic("SIMD FP exception(19)\n");
    105105}
    … …  
    121121        if (!as_page_fault(page)) {
    122122                PRINT_INFO_ERRCODE(istate);
    123                 printf("page fault address: %X\n", page);
     123                printf("page fault address: %#X\n", page);
    124124                panic("page fault\n");
    125125        }

  • arch/ia32/src/mm/frame.c

    rc624b96 r280a27e  
    9292                else
    9393                        name = "invalid";
    94                 printf("%P %QB %s\n",
     94                printf("%P %#llXB %s\n",
    9595                       (__native) e820table[i].base_address,
    9696                       (__u64) e820table[i].size,

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

    rc624b96 r280a27e  
    4646       
    4747        for (i=0;i<e820counter;i++) {
    48                 printf("E820 base: %Q size: %Q type: ", e820table[i].base_address, e820table[i].size);
     48                printf("E820 base: %#llX size: %lld type: ", e820table[i].base_address, e820table[i].size);
    4949                switch (e820table[i].type) {
    5050                        case MEMMAP_MEMORY_AVAILABLE:

  • arch/ia32/src/smp/apic.c

    rc624b96 r280a27e  
    413413
    414414        tm.value = l_apic[LVT_Tm];
    415         printf("LVT Tm: vector=%B, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
     415        printf("LVT Tm: vector=%hhd, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
    416416        lint.value = l_apic[LVT_LINT0];
    417         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]);
     417        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]);
    418418        lint.value = l_apic[LVT_LINT1];
    419         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]);   
     419        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]); 
    420420        error.value = l_apic[LVT_Err];
    421         printf("LVT Err: vector=%B, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
     421        printf("LVT Err: vector=%hhd, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
    422422#endif
    423423}

  • arch/ia64/src/interrupt.c

    rc624b96 r280a27e  
    133133        printf("Interrupted context dump:\n");
    134134        printf("ar.bsp=%P\tar.bspstore=%P\n", istate->ar_bsp, istate->ar_bspstore);
    135         printf("ar.rnat=%Q\tar.rsc=%Q\n", istate->ar_rnat, istate->ar_rsc);
    136         printf("ar.ifs=%Q\tar.pfs=%Q\n", istate->ar_ifs, istate->ar_pfs);
    137         printf("cr.isr=%Q\tcr.ipsr=%Q\t\n", istate->cr_isr.value, istate->cr_ipsr);
     135        printf("ar.rnat=%#llX\tar.rsc=%$llX\n", istate->ar_rnat, istate->ar_rsc);
     136        printf("ar.ifs=%#llX\tar.pfs=%#llX\n", istate->ar_ifs, istate->ar_pfs);
     137        printf("cr.isr=%#llX\tcr.ipsr=%#llX\t\n", istate->cr_isr.value, istate->cr_ipsr);
    138138       
    139         printf("cr.iip=%Q, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei ,iip ? iip : "?");
    140         printf("cr.iipa=%Q\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
    141         printf("cr.ifa=%Q\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
     139        printf("cr.iip=%#llX, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei ,iip ? iip : "?");
     140        printf("cr.iipa=%#llX\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
     141        printf("cr.ifa=%#llX\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
    142142}
    143143
    … …  
    183183#else
    184184        dump_interrupted_context(istate);
    185         panic("Interruption: %W (%s)\n", (__u16) vector, vector_to_string(vector));
     185        panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
    186186#endif
    187187}
    … …  
    218218{
    219219        dump_interrupted_context(istate);
    220         panic("Interruption: %W (%s)\n", (__u16) vector, vector_to_string(vector));
     220        panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
    221221}
    222222

  • arch/mips32/Makefile.inc

    rc624b96 r280a27e  
    107107endif
    108108
     109## Compile with support for software integer division.
     110#
     111
     112CONFIG_SOFTINT = y
     113
    109114
    110115ARCH_SOURCES = \

  • arch/mips32/src/debugger.c

    rc624b96 r280a27e  
    243243                if (breakpoints[i].address) {
    244244                        symbol = get_symtab_entry(breakpoints[i].address);
    245                         printf("%d. 0x%p in %s\n",i,
     245                        printf("%d. %p in %s\n",i,
    246246                               breakpoints[i].address, symbol);
    247247                        printf("     Count(%d) ", breakpoints[i].counter);
    … …  
    329329               
    330330                if (!(cur->flags & BKPOINT_FUNCCALL))
    331                         printf("***Breakpoint %d: 0x%p in %s.\n", i,
     331                        printf("***Breakpoint %d: %p in %s.\n", i,
    332332                               fireaddr, get_symtab_entry(istate->epc));
    333333
    … …  
    342342                cur->flags |= BKPOINT_INPROG;
    343343        } else {
    344                 printf("***Breakpoint 0x%p in %s.\n", fireaddr,
     344                printf("***Breakpoint %p in %s.\n", fireaddr,
    345345                       get_symtab_entry(fireaddr));
    346346                /* Move on to next instruction */

  • arch/mips32/src/exception.c

    rc624b96 r280a27e  
    7474                rasymbol = s;
    7575       
    76         printf("PC: %X(%s) RA: %X(%s), SP(%P)\n",istate->epc,pcsymbol,
     76        printf("PC: %#X(%s) RA: %#X(%s), SP(%P)\n",istate->epc,pcsymbol,
    7777               istate->ra,rasymbol, istate->sp);
    7878}

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

    rc624b96 r280a27e  
    410410                lo1.value = cp0_entry_lo1_read();
    411411               
    412                 printf("%d: asid=%d, vpn2=%d, mask=%d\tg[0]=%d, v[0]=%d, d[0]=%d, c[0]=%B, pfn[0]=%d\n"
    413                        "\t\t\t\tg[1]=%d, v[1]=%d, d[1]=%d, c[1]=%B, pfn[1]=%d\n",
     412                printf("%d: asid=%d, vpn2=%d, mask=%d\tg[0]=%d, v[0]=%d, d[0]=%d, c[0]=%hhd, pfn[0]=%d\n"
     413                       "\t\t\t\tg[1]=%d, v[1]=%d, d[1]=%d, c[1]=%hhd, pfn[1]=%d\n",
    414414                       i, hi.asid, hi.vpn2, mask.mask, lo0.g, lo0.v, lo0.d, lo0.c, lo0.pfn,
    415415                       lo1.g, lo1.v, lo1.d, lo1.c, lo1.pfn);

  • arch/ppc32/Makefile.inc

    rc624b96 r280a27e  
    5656DEFS += -DCONFIG_PAGE_PT
    5757
     58## Compile with support for software integer division.
     59#
     60
     61CONFIG_SOFTINT = y
     62
    5863ARCH_SOURCES = \
    5964        arch/$(ARCH)/src/console.c \

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

    rc624b96 r280a27e  
    4444       
    4545        for (i = 0; i < bootinfo.memmap.count; i++)
    46                 printf("base: %L size: %L\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
     46                printf("base: %#X size: %#X\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
    4747}

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

    rc624b96 r280a27e  
    4444       
    4545        for (i = 0; i < bootinfo.memmap.count; i++)
    46                 printf("base: %L size: %L\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
     46                printf("base: %P size: %#X\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
    4747}

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

    rc624b96 r280a27e  
    202202                t.value = itlb_tag_read_read(i);
    203203               
    204                 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",
     204                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",
    205205                        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);
    206206        }
    … …  
    211211                t.value = dtlb_tag_read_read(i);
    212212               
    213                 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",
     213                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",
    214214                        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);
    215215        }
Note: See TracChangeset for help on using the changeset viewer.