Changeset 7bb6b06 in mainline for kernel/arch/sparc64/src/trap

Timestamp:

2006-09-10T21:21:39Z (19 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.

Location:

kernel/arch/sparc64/src/trap

Files:

• exception.c (modified) (10 diffs)
• trap_table.S (modified) (2 diffs)

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

@@ -40 +40 @@
 #include <debug.h>
 #include <typedefs.h>
+#include <symtab.h>
+#include <print.h>
+
+void dump_istate(istate_t *istate)
+{
+        printf("TSTATE=%#llx\n", istate->tstate);
+        printf("TPC=%#llx (%s)\n", istate->tpc, get_symtab_entry(istate->tpc));
+        printf("TNPC=%#llx (%s)\n", istate->tnpc, get_symtab_entry(istate->tnpc));
+}
 
 /** Handle instruction_access_exception. (0x8) */
@@ -45 +54 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -52 +62 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -59 +70 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -66 +78 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -73 +86 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -80 +94 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s from %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -87 +102 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s from %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -94 +110 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s from %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 
@@ -101 +118 @@
 {
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-        panic("%s at %p.\n", __FUNCTION__, istate->tpc);
+        dump_istate(istate);
+        panic("%s\n", __FUNCTION__);
 }
 

kernel/arch/sparc64/src/trap/trap_table.S

@@ -651 +651 @@
         ba 1f
         nop
-
 0:
         save %sp, -PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE, %sp
@@ -782 +781 @@
         /*
          * OTHERWIN != 0 or fall-through from the OTHERWIN == 0 case.
-         * The CWP has already been restored to the value it had prior to the SAVE
+         * The CWP has already been restored to the value it had after the SAVE
          * at the beginning of this function.
          */