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

Timestamp:

2010-06-28T19:05:39Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7c31d20

Parents:

38e5675b

Message:

Switch mips32 to use the unified panic architecture. No stack traces so far.

File:

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

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

@@ -321 +321 @@
 void tlb_refill_fail(istate_t *istate)
 {
-        const char *symbol = symtab_fmt_name_lookup(istate->epc);
-        const char *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(),
-            istate->epc, symbol, sym2);
+        uintptr_t va = cp0_badvaddr_read();
+        
+        fault_if_from_uspace(istate, "TLB Refill Exception on %p.", va);
+        panic_memtrap(istate, PF_ACCESS_READ, va, "TLB Refill Exception.");
 }
 
@@ -333 +330 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-        const char *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(),
-            istate->epc, symbol);
+        uintptr_t va = cp0_badvaddr_read();
+        
+        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.", va);
+        panic_memtrap(istate, PF_ACCESS_READ, va, "TLB Invalid Exception.");
 }
 
 void tlb_modified_fail(istate_t *istate)
 {
-        const char *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(),
-            istate->epc, symbol);
+        uintptr_t va = cp0_badvaddr_read();
+        
+        fault_if_from_uspace(istate, "TLB Modified Exception on %p.", va);
+        panic_memtrap(istate, PF_ACCESS_WRITE, va, "TLB Modified Exception.");
 }