Changeset e2b762ec in mainline for kernel/arch


Ignore:
Timestamp:
2009-03-16T21:58:05Z (17 years ago)
Author:
Jiri Svoboda <jirik.svoboda@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f36c061
Parents:
d9167a1c
Message:

Make kernel symbol information optional.

Location:
kernel/arch
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/amd64/src/debugger.c

    rd9167a1c re2b762ec  
    3636#include <console/kconsole.h>
    3737#include <console/cmd.h>
    38 #include <symtab.h>
    3938#include <print.h>
    4039#include <panic.h>
    … …  
    4544#include <func.h>
    4645#include <smp/ipi.h>
     46
     47#ifdef CONFIG_SYMTAB
     48#include <symtab.h>
     49#endif
    4750
    4851typedef struct  {
    … …  
    230233                }
    231234        }
     235
     236#ifdef CONFIG_SYMTAB
    232237        printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
    233238            get_symtab_entry(getip(istate)));
     239#else
     240        printf("Reached breakpoint %d:%lx\n", slot, getip(istate));
     241#endif
    234242
    235243#ifdef CONFIG_KCONSOLE
    … …  
    356364        for (i = 0; i < BKPOINTS_MAX; i++)
    357365                if (breakpoints[i].address) {
     366#ifdef CONFIG_SYMTAB
    358367                        symbol = get_symtab_entry(breakpoints[i].address);
     368#else
     369                        symbol = "n/a";
     370#endif
    359371
    360372#ifdef __32_BITS__

  • kernel/arch/amd64/src/interrupt.c

    rd9167a1c re2b762ec  
    4444#include <mm/as.h>
    4545#include <arch.h>
    46 #include <symtab.h>
    4746#include <arch/asm.h>
    4847#include <proc/scheduler.h>
    … …  
    5453#include <ddi/irq.h>
    5554
     55#ifdef CONFIG_SYMTAB
     56#include <symtab.h>
     57#endif
     58
    5659/*
    5760 * Interrupt and exception dispatching.
    … …  
    6770/*      uint64_t *x = &istate->stack[0]; */
    6871
     72#ifdef CONFIG_SYMTAB
    6973        if (!(symbol = get_symtab_entry(istate->rip)))
    7074                symbol = "";
     75#else
     76        symbol = "";
     77#endif
    7178
    7279        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);

  • kernel/arch/ia32/src/interrupt.c

    rd9167a1c re2b762ec  
    4545#include <mm/as.h>
    4646#include <arch.h>
    47 #include <symtab.h>
    4847#include <proc/thread.h>
    4948#include <proc/task.h>
    … …  
    5453#include <ddi/irq.h>
    5554
     55#ifdef CONFIG_SYMTAB
     56#include <symtab.h>
     57#endif
     58
    5659/*
    5760 * Interrupt and exception dispatching.
    … …  
    6467void decode_istate(istate_t *istate)
    6568{
    66         char *symbol = get_symtab_entry(istate->eip);
    67 
     69        char *symbol;
     70
     71#ifdef CONFIG_SYMTAB
     72        symbol = get_symtab_entry(istate->eip);
    6873        if (!symbol)
    6974                symbol = "";
     75#else
     76        symbol = "";
     77#endif
    7078
    7179        if (CPU)

  • kernel/arch/ia64/src/interrupt.c

    rd9167a1c re2b762ec  
    3939#include <panic.h>
    4040#include <print.h>
    41 #include <symtab.h>
    4241#include <debug.h>
    4342#include <console/console.h>
    … …  
    5655#include <mm/tlb.h>
    5756
     57#ifdef CONFIG_SYMTAB
     58#include <symtab.h>
     59#endif
     60
    5861#define VECTORS_64_BUNDLE       20
    5962#define VECTORS_16_BUNDLE       48
    … …  
    138141        char *ifa, *iipa, *iip;
    139142
     143#ifdef CONFIG_SYMTAB
    140144        ifa = get_symtab_entry(istate->cr_ifa);
    141145        iipa = get_symtab_entry(istate->cr_iipa);
    142146        iip = get_symtab_entry(istate->cr_iip);
     147#else
     148        ifa = iipa = iip = "n/a";
     149#endif
    143150
    144151        putchar('\n');

  • kernel/arch/mips32/src/debugger.c

    rd9167a1c re2b762ec  
    3838#include <console/kconsole.h>
    3939#include <console/cmd.h>
    40 #include <symtab.h>
    4140#include <print.h>
    4241#include <panic.h>
    … …  
    4443#include <arch/cp0.h>
    4544#include <func.h>
     45
     46#ifdef CONFIG_SYMTAB
     47#include <symtab.h>
     48#endif
    4649
    4750bpinfo_t breakpoints[BKPOINTS_MAX];
    … …  
    260263        for (i = 0; i < BKPOINTS_MAX; i++)
    261264                if (breakpoints[i].address) {
     265#ifdef CONFIG_SYMTAB
    262266                        symbol = get_symtab_entry(breakpoints[i].address);
     267#else
     268                        symbol = "n/a";
     269#endif
    263270                       
    264271                        printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
    … …  
    349356                        printf("Warning: breakpoint recursion\n");
    350357               
    351                 if (!(cur->flags & BKPOINT_FUNCCALL))
     358                if (!(cur->flags & BKPOINT_FUNCCALL)) {
     359#ifdef CONFIG_SYMTAB
    352360                        printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
    353361                            get_symtab_entry(istate->epc));
     362#else
     363                        printf("***Breakpoint %d: %p.\n", i, fireaddr);
     364#endif
     365                }
    354366
    355367                /* Return first instruction back */
    … …  
    364376                cur->flags |= BKPOINT_INPROG;
    365377        } else {
    366                 printf("***Breakpoint %p in %s.\n", fireaddr,
     378#ifdef CONFIG_SYMTAB
     379                printf("***Breakpoint %p in %s.\n", fireaddr,
    367380                       get_symtab_entry(fireaddr));
     381#else
     382                printf("***Breakpoint %p.\n", fireaddr);       
     383#endif
    368384                /* Move on to next instruction */
    369385                istate->epc += 4;

  • kernel/arch/mips32/src/exception.c

    rd9167a1c re2b762ec  
    4242#include <debug.h>
    4343#include <proc/thread.h>
    44 #include <symtab.h>
    4544#include <print.h>
    4645#include <interrupt.h>
    … …  
    4847#include <ddi/irq.h>
    4948#include <arch/debugger.h>
     49
     50#ifdef CONFIG_SYMTAB
     51#include <symtab.h>
     52#endif
    5053
    5154static char * exctable[] = {
    … …  
    7780        char *rasymbol = "";
    7881
     82#ifdef CONFIG_SYMTAB
    7983        char *s = get_symtab_entry(istate->epc);
    8084        if (s)
    … …  
    8387        if (s)
    8488                rasymbol = s;
     89#endif
    8590       
    8691        printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol, istate->ra, rasymbol, istate->sp);

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

    rd9167a1c re2b762ec  
    4141#include <panic.h>
    4242#include <arch.h>
    43 #include <symtab.h>
    4443#include <synch/mutex.h>
    4544#include <print.h>
    … …  
    4746#include <align.h>
    4847#include <interrupt.h>
     48
     49#ifdef CONFIG_SYMTAB
     50#include <symtab.h>
     51#endif
    4952
    5053static void tlb_refill_fail(istate_t *);
    … …  
    324327        char *sym2 = "";
    325328
     329#ifdef CONFIG_SYMTAB
    326330        char *s = get_symtab_entry(istate->epc);
    327331        if (s)
    … …  
    330334        if (s)
    331335                sym2 = s;
     336#endif
    332337
    333338        fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
    … …  
    342347        char *symbol = "";
    343348
     349#ifdef CONFIG_SYMTAB
    344350        char *s = get_symtab_entry(istate->epc);
    345351        if (s)
    346352                symbol = s;
     353#endif
     354
    347355        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
    348356            cp0_badvaddr_read());
    … …  
    355363        char *symbol = "";
    356364
     365#ifdef CONFIG_SYMTAB
    357366        char *s = get_symtab_entry(istate->epc);
    358367        if (s)
    359368                symbol = s;
     369#endif
     370
    360371        fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
    361372            cp0_badvaddr_read());

  • kernel/arch/ppc32/src/mm/tlb.c

    rd9167a1c re2b762ec  
    4040#include <arch.h>
    4141#include <print.h>
     42#include <macros.h>
     43
     44#ifdef CONFIG_SYMTAB
    4245#include <symtab.h>
    43 #include <macros.h>
    44 
     46#endif
    4547
    4648static unsigned int seed = 10;
    … …  
    122124        char *sym2 = "";
    123125
     126#ifdef CONFIG_SYMTAB
    124127        char *str = get_symtab_entry(istate->pc);
    125128        if (str)
    … …  
    128131        if (str)
    129132                sym2 = str;
     133#endif
    130134
    131135        fault_if_from_uspace(istate,

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

    rd9167a1c re2b762ec  
    4141#include <arch/register.h>
    4242#include <debug.h>
     43#include <print.h>
     44
     45#ifdef CONFIG_SYMTAB
    4346#include <symtab.h>
    44 #include <print.h>
     47#endif
    4548
    4649void dump_istate(istate_t *istate)
    4750{
     51        char *tpcs, *tnpcs;
     52
     53#ifdef CONFIG_SYMTAB
     54        tpcs = get_symtab_entry(istate->tpc);
     55        tnpcs = get_symtab_entry(istate->tnpc);
     56#else
     57        tpcs = tnpcs = "n/a";
     58#endif
    4859        printf("TSTATE=%#" PRIx64 "\n", istate->tstate);
    49         printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, get_symtab_entry(istate->tpc));
    50         printf("TNPC=%#" PRIx64 " (%s)\n", istate->tnpc, get_symtab_entry(istate->tnpc));
     60        printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, tpcs);
     61        printf("TNPC=%#" PRIx64 " (%s)\n", istate->tnpc, tnpcs);
    5162}
    5263
Note: See TracChangeset for help on using the changeset viewer.