Changes in kernel/arch/mips32/src/exception.c [41a7f62:e16e0d59] in mainline

File:

• kernel/arch/mips32/src/exception.c (modified) (9 diffs)

kernel/arch/mips32/src/exception.c

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup mips32  
  * @{
  */
@@ -38 +38 @@
 #include <panic.h>
 #include <arch/cp0.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <arch.h>
 #include <debug.h>
@@ -49 +49 @@
 #include <symtab.h>
 
-static const char *exctable[] = {
+static char * exctable[] = {
         "Interrupt",
         "TLB Modified",
@@ -67 +67 @@
         "Floating Point",
         NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-        "WatchHi/WatchLo",  /* 23 */
+        "WatchHi/WatchLo", /* 23 */
         NULL, NULL, NULL, NULL, NULL, NULL, NULL,
         "Virtual Coherency - data",
 };
 
-void istate_decode(istate_t *istate)
+static void print_regdump(istate_t *istate)
 {
-        printf("epc=%p\tsta=%#010" PRIx32 "\t"
-            "lo =%#010" PRIx32 "\thi =%#010" PRIx32 "\n",
-            (void *) istate->epc, istate->status,
-            istate->lo, istate->hi);
-        
-        printf("a0 =%#010" PRIx32 "\ta1 =%#010" PRIx32 "\t"
-            "a2 =%#010" PRIx32 "\ta3 =%#010" PRIx32 "\n",
-            istate->a0, istate->a1, istate->a2, istate->a3);
-        
-        printf("t0 =%#010" PRIx32 "\tt1 =%#010" PRIx32 "\t"
-            "t2 =%#010" PRIx32 "\tt3 =%#010" PRIx32 "\n",
-            istate->t0, istate->t1, istate->t2, istate->t3);
-        
-        printf("t4 =%#010" PRIx32 "\tt5 =%#010" PRIx32 "\t"
-            "t6 =%#010" PRIx32 "\tt7 =%#010" PRIx32 "\n",
-            istate->t4, istate->t5, istate->t6, istate->t7);
-        
-        printf("t8 =%#010" PRIx32 "\tt9 =%#010" PRIx32 "\t"
-            "v0 =%#010" PRIx32 "\tv1 =%#010" PRIx32 "\n",
-            istate->t8, istate->t9, istate->v0, istate->v1);
-        
-        printf("s0 =%#010" PRIx32 "\ts1 =%#010" PRIx32 "\t"
-            "s2 =%#010" PRIx32 "\ts3 =%#010" PRIx32 "\n",
-            istate->s0, istate->s1, istate->s2, istate->s3);
-        
-        printf("s4 =%#010" PRIx32 "\ts5 =%#010" PRIx32 "\t"
-            "s6 =%#010" PRIx32 "\ts7 =%#010" PRIx32 "\n",
-            istate->s4, istate->s5, istate->s6, istate->s7);
-        
-        printf("s8 =%#010" PRIx32 "\tat =%#010" PRIx32 "\t"
-            "kt0=%#010" PRIx32 "\tkt1=%#010" PRIx32 "\n",
-            istate->s8, istate->at, istate->kt0, istate->kt1);
-        
-        printf("sp =%p\tra =%p\tgp =%p\n",
-            (void *) istate->sp, (void *) istate->ra,
-            (void *) istate->gp);
+        char *pcsymbol, *rasymbol;
+
+        pcsymbol = symtab_fmt_name_lookup(istate->epc);
+        rasymbol = symtab_fmt_name_lookup(istate->ra);
+
+        printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol,
+            istate->ra, rasymbol, istate->sp);
 }
 
-static void unhandled_exception(unsigned int n, istate_t *istate)
+static void unhandled_exception(int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "Unhandled exception %s.", exctable[n]);
-        panic_badtrap(istate, n, "Unhandled exception %s.", exctable[n]);
+        
+        print_regdump(istate);
+        panic("Unhandled exception %s.", exctable[n]);
 }
 
-static void reserved_instr_exception(unsigned int n, istate_t *istate)
+static void reserved_instr_exception(int n, istate_t *istate)
 {
-        if (*((uint32_t *) istate->epc) == 0x7c03e83b) {
+        if (*((uint32_t *)istate->epc) == 0x7c03e83b) {
                 ASSERT(THREAD);
                 istate->epc += 4;
-                istate->v1 = istate->kt1;
-        } else
+                istate->v1 = istate->k1;
+        } else 
                 unhandled_exception(n, istate);
 }
 
-static void breakpoint_exception(unsigned int n, istate_t *istate)
+static void breakpoint_exception(int n, istate_t *istate)
 {
 #ifdef CONFIG_DEBUG
@@ -140 +113 @@
 }
 
-static void tlbmod_exception(unsigned int n, istate_t *istate)
+static void tlbmod_exception(int n, istate_t *istate)
 {
         tlb_modified(istate);
 }
 
-static void tlbinv_exception(unsigned int n, istate_t *istate)
+static void tlbinv_exception(int n, istate_t *istate)
 {
         tlb_invalid(istate);
@@ -151 +124 @@
 
 #ifdef CONFIG_FPU_LAZY
-static void cpuns_exception(unsigned int n, istate_t *istate)
+static void cpuns_exception(int n, istate_t *istate)
 {
         if (cp0_cause_coperr(cp0_cause_read()) == fpu_cop_id)
                 scheduler_fpu_lazy_request();
         else {
-                fault_if_from_uspace(istate,
-                    "Unhandled Coprocessor Unusable Exception.");
-                panic_badtrap(istate, n,
-                    "Unhandled Coprocessor Unusable Exception.");
+                fault_if_from_uspace(istate, "Unhandled Coprocessor Unusable Exception.");
+                panic("Unhandled Coprocessor Unusable Exception.");
         }
 }
 #endif
 
-static void interrupt_exception(unsigned int n, istate_t *istate)
+static void interrupt_exception(int n, istate_t *istate)
 {
-        /* Decode interrupt number and process the interrupt */
-        uint32_t cause = (cp0_cause_read() >> 8) & 0xff;
+        uint32_t cause;
+        int i;
         
-        unsigned int i;
+        /* decode interrupt number and process the interrupt */
+        cause = (cp0_cause_read() >> 8) & 0xff;
+        
         for (i = 0; i < 8; i++) {
                 if (cause & (1 << i)) {
@@ -178 +151 @@
                                  */
                                 irq->handler(irq);
-                                irq_spinlock_unlock(&irq->lock, false);
+                                spinlock_unlock(&irq->lock);
                         } else {
                                 /*
@@ -184 +157 @@
                                  */
 #ifdef CONFIG_DEBUG
-                                printf("cpu%u: spurious interrupt (inum=%u)\n",
+                                printf("cpu%u: spurious interrupt (inum=%d)\n",
                                     CPU->id, i);
 #endif
@@ -193 +166 @@
 
 /** Handle syscall userspace call */
-static void syscall_exception(unsigned int n, istate_t *istate)
+static void syscall_exception(int n, istate_t *istate)
 {
-        fault_if_from_uspace(istate, "Syscall is handled through shortcut.");
+        panic("Syscall is handled through shortcut.");
 }
 
 void exception_init(void)
 {
-        unsigned int i;
-        
+        int i;
+
         /* Clear exception table */
         for (i = 0; i < IVT_ITEMS; i++)
-                exc_register(i, "undef", false,
-                    (iroutine_t) unhandled_exception);
+                exc_register(i, "undef", (iroutine) unhandled_exception);
         
-        exc_register(EXC_Bp, "bkpoint", true,
-            (iroutine_t) breakpoint_exception);
-        exc_register(EXC_RI, "resinstr", true,
-            (iroutine_t) reserved_instr_exception);
-        exc_register(EXC_Mod, "tlb_mod", true,
-            (iroutine_t) tlbmod_exception);
-        exc_register(EXC_TLBL, "tlbinvl", true,
-            (iroutine_t) tlbinv_exception);
-        exc_register(EXC_TLBS, "tlbinvl", true,
-            (iroutine_t) tlbinv_exception);
-        exc_register(EXC_Int, "interrupt", true,
-            (iroutine_t) interrupt_exception);
-        
+        exc_register(EXC_Bp, "bkpoint", (iroutine) breakpoint_exception);
+        exc_register(EXC_RI, "resinstr", (iroutine) reserved_instr_exception);
+        exc_register(EXC_Mod, "tlb_mod", (iroutine) tlbmod_exception);
+        exc_register(EXC_TLBL, "tlbinvl", (iroutine) tlbinv_exception);
+        exc_register(EXC_TLBS, "tlbinvl", (iroutine) tlbinv_exception);
+        exc_register(EXC_Int, "interrupt", (iroutine) interrupt_exception);
 #ifdef CONFIG_FPU_LAZY
-        exc_register(EXC_CpU, "cpunus", true,
-            (iroutine_t) cpuns_exception);
+        exc_register(EXC_CpU, "cpunus", (iroutine) cpuns_exception);
 #endif
-        
-        exc_register(EXC_Sys, "syscall", true,
-            (iroutine_t) syscall_exception);
+        exc_register(EXC_Sys, "syscall", (iroutine) syscall_exception);
 }