Changes in kernel/arch/mips32/src/exception.c [d99c1d2:da1bafb] in mainline

File:

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

kernel/arch/mips32/src/exception.c

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -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",
@@ -74 +74 @@
 static void print_regdump(istate_t *istate)
 {
-        const char *pcsymbol = symtab_fmt_name_lookup(istate->epc);
-        const char *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);
+        printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc,
+            symtab_fmt_name_lookup(istate->epc), istate->ra,
+            symtab_fmt_name_lookup(istate->ra), istate->sp);
 }
 
@@ -135 +133 @@
 static void interrupt_exception(int n, istate_t *istate)
 {
-        uint32_t cause;
-        int i;
+        /* Decode interrupt number and process the interrupt */
+        uint32_t cause = (cp0_cause_read() >> 8) & 0xff;
         
-        /* decode interrupt number and process the interrupt */
-        cause = (cp0_cause_read() >> 8) & 0xff;
-        
+        unsigned int i;
         for (i = 0; i < 8; i++) {
                 if (cause & (1 << i)) {
@@ -149 +145 @@
                                  */
                                 irq->handler(irq);
-                                spinlock_unlock(&irq->lock);
+                                irq_spinlock_unlock(&irq->lock, false);
                         } else {
                                 /*
@@ -172 +168 @@
 {
         int i;
-
+        
         /* Clear exception table */
         for (i = 0; i < IVT_ITEMS; i++)