Changeset aa85487 in mainline for kernel/arch/sparc64/src/trap/exception.c

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes, revision 308

File:

• kernel/arch/sparc64/src/trap/exception.c (modified) (2 diffs)

kernel/arch/sparc64/src/trap/exception.c

@@ -46 +46 @@
 void dump_istate(istate_t *istate)
 {
-        char *tpcs, *tnpcs;
-
-        tpcs = symtab_fmt_name_lookup(istate->tpc);
-        tnpcs = symtab_fmt_name_lookup(istate->tnpc);
-
+        const char *tpcs = symtab_fmt_name_lookup(istate->tpc);
+        const char *tnpcs = symtab_fmt_name_lookup(istate->tnpc);
+        
         printf("TSTATE=%#" PRIx64 "\n", istate->tstate);
         printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, tpcs);
@@ -162 +160 @@
         fault_if_from_uspace(istate, "%s.", __func__);
         dump_istate(istate);
-//MH
-//      dump_sfsr_and_sfar();
+        describe_dmmu_fault();
         panic("%s.", __func__);
 }