Changeset e2b762ec in mainline for kernel/arch/mips32/src

Timestamp:

2009-03-16T21:58:05Z (16 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/mips32/src

Files:

• debugger.c (modified) (5 diffs)
• exception.c (modified) (4 diffs)
• mm/tlb.c (modified) (6 diffs)

kernel/arch/mips32/src/debugger.c

@@ -38 +38 @@
 #include <console/kconsole.h>
 #include <console/cmd.h>
-#include <symtab.h>
 #include <print.h>
 #include <panic.h>
@@ -44 +43 @@
 #include <arch/cp0.h>
 #include <func.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 bpinfo_t breakpoints[BKPOINTS_MAX];
@@ -260 +263 @@
         for (i = 0; i < BKPOINTS_MAX; i++)
                 if (breakpoints[i].address) {
+#ifdef CONFIG_SYMTAB
                         symbol = get_symtab_entry(breakpoints[i].address);
+#else
+                        symbol = "n/a";
+#endif
                         
                         printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
@@ -349 +356 @@
                         printf("Warning: breakpoint recursion\n");
                 
-                if (!(cur->flags & BKPOINT_FUNCCALL))
+                if (!(cur->flags & BKPOINT_FUNCCALL)) {
+#ifdef CONFIG_SYMTAB
                         printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
                             get_symtab_entry(istate->epc));
+#else
+                        printf("***Breakpoint %d: %p.\n", i, fireaddr);
+#endif
+                }
 
                 /* Return first instruction back */
@@ -364 +376 @@
                 cur->flags |= BKPOINT_INPROG;
         } else {
-                printf("***Breakpoint %p in %s.\n", fireaddr, 
+#ifdef CONFIG_SYMTAB
+                printf("***Breakpoint %p in %s.\n", fireaddr,
                        get_symtab_entry(fireaddr));
+#else
+                printf("***Breakpoint %p.\n", fireaddr);        
+#endif
                 /* Move on to next instruction */
                 istate->epc += 4;

kernel/arch/mips32/src/exception.c

@@ -42 +42 @@
 #include <debug.h>
 #include <proc/thread.h>
-#include <symtab.h>
 #include <print.h>
 #include <interrupt.h>
@@ -48 +47 @@
 #include <ddi/irq.h>
 #include <arch/debugger.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 static char * exctable[] = {
@@ -77 +80 @@
         char *rasymbol = "";
 
+#ifdef CONFIG_SYMTAB
         char *s = get_symtab_entry(istate->epc);
         if (s)
@@ -83 +87 @@
         if (s)
                 rasymbol = s;
+#endif
         
         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

@@ -41 +41 @@
 #include <panic.h>
 #include <arch.h>
-#include <symtab.h>
 #include <synch/mutex.h>
 #include <print.h>
@@ -47 +46 @@
 #include <align.h>
 #include <interrupt.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 static void tlb_refill_fail(istate_t *);
@@ -324 +327 @@
         char *sym2 = "";
 
+#ifdef CONFIG_SYMTAB
         char *s = get_symtab_entry(istate->epc);
         if (s)
@@ -330 +334 @@
         if (s)
                 sym2 = s;
+#endif
 
         fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
@@ -342 +347 @@
         char *symbol = "";
 
+#ifdef CONFIG_SYMTAB
         char *s = get_symtab_entry(istate->epc);
         if (s)
                 symbol = s;
+#endif
+
         fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
             cp0_badvaddr_read());
@@ -355 +363 @@
         char *symbol = "";
 
+#ifdef CONFIG_SYMTAB
         char *s = get_symtab_entry(istate->epc);
         if (s)
                 symbol = s;
+#endif
+
         fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
             cp0_badvaddr_read());