Changeset 7bb6b06 in mainline for kernel/arch/sparc64/src/mm/tlb.c

Timestamp:

2006-09-10T21:21:39Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9a5b556

Parents:

208fa65

Message:

Small improvements here and there.

File:

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

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

@@ -48 +48 @@
 #include <config.h>
 #include <arch/trap/trap.h>
+#include <arch/trap/exception.h>
 #include <panic.h>
 #include <arch/asm.h>
-#include <symtab.h>
 
 static void dtlb_pte_copy(pte_t *t, bool ro);
@@ -308 +308 @@
 void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, const char *str)
 {
-        char *tpc_str = get_symtab_entry(istate->tpc);
-
         fault_if_from_uspace(istate, "%s\n", str);
-        printf("TPC=%p, (%s)\n", istate->tpc, tpc_str);
+        dump_istate(istate);
         panic("%s\n", str);
 }
@@ -318 +316 @@
 {
         uintptr_t va;
-        char *tpc_str = get_symtab_entry(istate->tpc);
+
+        va = tag.vpn << PAGE_WIDTH;
+
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
+        dump_istate(istate);
+        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
+        panic("%s\n", str);
+}
+
+void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str)
+{
+        uintptr_t va;
 
         va = tag.vpn << PAGE_WIDTH;
@@ -324 +333 @@
         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
         printf("Faulting page: %p, ASID=%d\n", va, tag.context);
-        printf("TPC=%p, (%s)\n", istate->tpc, tpc_str);
-        panic("%s\n", str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str)
-{
-        uintptr_t va;
-        char *tpc_str = get_symtab_entry(istate->tpc);
-
-        va = tag.vpn << PAGE_WIDTH;
-
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
-        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
-        printf("TPC=%p, (%s)\n", istate->tpc, tpc_str);
+        dump_istate(istate);
         panic("%s\n", str);
 }