Changeset e2b762ec in mainline for kernel/arch/amd64

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/amd64/src

Files:

• debugger.c (modified) (4 diffs)
• interrupt.c (modified) (3 diffs)

kernel/arch/amd64/src/debugger.c

@@ -36 +36 @@
 #include <console/kconsole.h>
 #include <console/cmd.h>
-#include <symtab.h>
 #include <print.h>
 #include <panic.h>
@@ -45 +44 @@
 #include <func.h>
 #include <smp/ipi.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 typedef struct  {
@@ -230 +233 @@
                 }
         }
+
+#ifdef CONFIG_SYMTAB
         printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
             get_symtab_entry(getip(istate)));
+#else
+        printf("Reached breakpoint %d:%lx\n", slot, getip(istate));
+#endif
 
 #ifdef CONFIG_KCONSOLE
@@ -356 +364 @@
         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
 
 #ifdef __32_BITS__

kernel/arch/amd64/src/interrupt.c

@@ -44 +44 @@
 #include <mm/as.h>
 #include <arch.h>
-#include <symtab.h>
 #include <arch/asm.h>
 #include <proc/scheduler.h>
@@ -54 +53 @@
 #include <ddi/irq.h>
 
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
+
 /*
  * Interrupt and exception dispatching.
@@ -67 +70 @@
 /*      uint64_t *x = &istate->stack[0]; */
 
+#ifdef CONFIG_SYMTAB
         if (!(symbol = get_symtab_entry(istate->rip)))
                 symbol = "";
+#else
+        symbol = "";
+#endif
 
         printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);