Changeset e16e0d59 in mainline for kernel/arch/mips32/src/mm/tlb.c

Timestamp:

2009-03-17T20:33:18Z (15 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.

File:

• kernel/arch/mips32/src/mm/tlb.c (modified) (4 diffs)

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

@@ -46 +46 @@
 #include <align.h>
 #include <interrupt.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 static void tlb_refill_fail(istate_t *);
@@ -324 +321 @@
 void tlb_refill_fail(istate_t *istate)
 {
-        char *symbol = "";
-        char *sym2 = "";
-
-#ifdef CONFIG_SYMTAB
-        char *s = get_symtab_entry(istate->epc);
-        if (s)
-                symbol = s;
-        s = get_symtab_entry(istate->ra);
-        if (s)
-                sym2 = s;
-#endif
-
+        char *symbol, *sym2;
+
+        symbol = symtab_fmt_name_lookup(istate->epc);
+        sym2 = symtab_fmt_name_lookup(istate->ra);
+        
         fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
             cp0_badvaddr_read());
-        panic("%x: TLB Refill Exception at %x(%s<-%s).", cp0_badvaddr_read(),
+        panic("%x: TLB Refill Exception at %x (%s<-%s).", cp0_badvaddr_read(),
             istate->epc, symbol, sym2);
 }
@@ -345 +335 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-        char *symbol = "";
-
-#ifdef CONFIG_SYMTAB
-        char *s = get_symtab_entry(istate->epc);
-        if (s)
-                symbol = s;
-#endif
+        char *symbol;
+
+        symbol = symtab_fmt_name_lookup(istate->epc);
 
         fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
             cp0_badvaddr_read());
-        panic("%x: TLB Invalid Exception at %x(%s).", cp0_badvaddr_read(),
+        panic("%x: TLB Invalid Exception at %x (%s).", cp0_badvaddr_read(),
             istate->epc, symbol);
 }
@@ -361 +347 @@
 void tlb_modified_fail(istate_t *istate)
 {
-        char *symbol = "";
-
-#ifdef CONFIG_SYMTAB
-        char *s = get_symtab_entry(istate->epc);
-        if (s)
-                symbol = s;
-#endif
+        char *symbol;
+
+        symbol = symtab_fmt_name_lookup(istate->epc);
 
         fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
             cp0_badvaddr_read());
-        panic("%x: TLB Modified Exception at %x(%s).", cp0_badvaddr_read(),
+        panic("%x: TLB Modified Exception at %x (%s).", cp0_badvaddr_read(),
             istate->epc, symbol);
 }