Changeset e16e0d59 in mainline for kernel/arch/amd64/src

Timestamp:

2009-03-17T20:33:18Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5eb90cb

Parents:

b1c8dc0

Message:

Make optionality of symbol information less intrusive per Jakub's request. Also, improve symtab function names and update their semantics.

Location:

kernel/arch/amd64/src

Files:

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

kernel/arch/amd64/src/debugger.c

@@ -44 +44 @@
 #include <func.h>
 #include <smp/ipi.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 typedef struct  {
@@ -234 +231 @@
         }
 
-#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
+        printf("Reached breakpoint %d:%lx (%s)\n", slot, getip(istate),
+            symtab_fmt_name_lookup(getip(istate)));
 
 #ifdef CONFIG_KCONSOLE
@@ -364 +357 @@
         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
+                        symbol = symtab_fmt_name_lookup(
+                            breakpoints[i].address);
 
 #ifdef __32_BITS__

kernel/arch/amd64/src/interrupt.c

@@ -52 +52 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 /*
@@ -68 +65 @@
 {
         char *symbol;
-/*      uint64_t *x = &istate->stack[0]; */
-
-#ifdef CONFIG_SYMTAB
-        if (!(symbol = get_symtab_entry(istate->rip)))
-                symbol = "";
-#else
-        symbol = "";
-#endif
+
+        symbol = symtab_fmt_name_lookup((istate->rip);
 
         printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);