Changes in kernel/arch/ia32/src/interrupt.c [203deeb8:7e752b2] in mainline

File:

• kernel/arch/ia32/src/interrupt.c (modified) (8 diffs)

kernel/arch/ia32/src/interrupt.c

@@ -63 +63 @@
 void (* eoi_function)(void) = NULL;
 
-void decode_istate(istate_t *istate)
-{
-        char *symbol;
-
-        symbol = symtab_fmt_name_lookup(istate->eip);
-
-        if (CPU)
-                printf("----------------EXCEPTION OCCURED (cpu%u)----------------\n", CPU->id);
-        else
-                printf("----------------EXCEPTION OCCURED----------------\n");
-                
-        printf("%%eip: %#lx (%s)\n", istate->eip, symbol);
-        printf("ERROR_WORD=%#lx\n", istate->error_word);
-        printf("%%cs=%#lx,flags=%#lx\n", istate->cs, istate->eflags);
-        printf("%%eax=%#lx, %%ecx=%#lx, %%edx=%#lx, %%esp=%p\n", istate->eax, istate->ecx, istate->edx, &istate->stack[0]);
-        printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
-        printf("       %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
-
-        stack_trace_istate(istate);
+void istate_decode(istate_t *istate)
+{
+        printf("cs =%#0" PRIx32 "\teip=%p\t"
+            "efl=%#0" PRIx32 "\terr=%#0" PRIx32 "\n",
+            istate->cs, (void *) istate->eip,
+            istate->eflags, istate->error_word);
+        
+        printf("ds =%#0" PRIx32 "\tes =%#0" PRIx32 "\t"
+            "fs =%#0" PRIx32 "\tgs =%#0" PRIx32 "\n",
+            istate->ds, istate->es, istate->fs, istate->gs);
+        
+        if (istate_from_uspace(istate))
+                printf("ss =%#0" PRIx32 "\n", istate->ss);
+        
+        printf("eax=%#0" PRIx32 "\tebx=%#0" PRIx32 "\t"
+            "ecx=%#0" PRIx32 "\tedx=%#0" PRIx32 "\n",
+            istate->eax, istate->ebx, istate->ecx, istate->edx);
+        
+        printf("esi=%p\tedi=%p\tebp=%p\tesp=%p\n",
+            (void *) istate->esi, (void *) istate->edi,
+            (void *) istate->ebp,
+            istate_from_uspace(istate) ? ((void *) istate->esp) :
+            &istate->esp);
 }
 
@@ -93 +97 @@
 }
 
-static void null_interrupt(int n, istate_t *istate)
-{
-        fault_if_from_uspace(istate, "Unserviced interrupt: %d.", n);
-
-        decode_istate(istate);
-        panic("Unserviced interrupt: %d.", n);
-}
-
-static void de_fault(int n, istate_t *istate)
+static void null_interrupt(unsigned int n, istate_t *istate)
+{
+        fault_if_from_uspace(istate, "Unserviced interrupt: %u.", n);
+        panic_badtrap(istate, n, "Unserviced interrupt: %u.", n);
+}
+
+static void de_fault(unsigned int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "Divide error.");
-
-        decode_istate(istate);
-        panic("Divide error.");
+        panic_badtrap(istate, n, "Divide error.");
 }
 
 /** General Protection Fault. */
-static void gp_fault(int n __attribute__((unused)), istate_t *istate)
+static void gp_fault(unsigned int n __attribute__((unused)), istate_t *istate)
 {
         if (TASK) {
-                size_t ver;
+                irq_spinlock_lock(&TASK->lock, false);
+                size_t ver = TASK->arch.iomapver;
+                irq_spinlock_unlock(&TASK->lock, false);
                 
-                spinlock_lock(&TASK->lock);
-                ver = TASK->arch.iomapver;
-                spinlock_unlock(&TASK->lock);
-        
                 if (CPU->arch.iomapver_copy != ver) {
                         /*
@@ -132 +130 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-
-        decode_istate(istate);
-        panic("General protection fault.");
-}
-
-static void ss_fault(int n __attribute__((unused)), istate_t *istate)
+        panic_badtrap(istate, n, "General protection fault.");
+}
+
+static void ss_fault(unsigned int n __attribute__((unused)), istate_t *istate)
 {
         fault_if_from_uspace(istate, "Stack fault.");
-
-        decode_istate(istate);
-        panic("Stack fault.");
-}
-
-static void simd_fp_exception(int n __attribute__((unused)), istate_t *istate)
+        panic_badtrap(istate, n, "Stack fault.");
+}
+
+static void simd_fp_exception(unsigned int n __attribute__((unused)), istate_t *istate)
 {
         uint32_t mxcsr;
-        asm (
+        asm volatile (
                 "stmxcsr %[mxcsr]\n"
                 : [mxcsr] "=m" (mxcsr)
         );
-        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx.",
-            (unative_t) mxcsr);
-        
-        decode_istate(istate);
-        printf("MXCSR: %#lx\n", mxcsr);
-        panic("SIMD FP exception(19).");
-}
-
-static void nm_fault(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
-{
-#ifdef CONFIG_FPU_LAZY     
+        
+        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0" PRIx32 ".",
+            mxcsr);
+        panic_badtrap(istate, n, "SIMD FP exception");
+}
+
+static void nm_fault(unsigned int n __attribute__((unused)),
+    istate_t *istate __attribute__((unused)))
+{
+#ifdef CONFIG_FPU_LAZY
         scheduler_fpu_lazy_request();
 #else
         fault_if_from_uspace(istate, "FPU fault.");
-        panic("FPU fault.");
+        panic_badtrap(istate, n, "FPU fault.");
 #endif
 }
 
 #ifdef CONFIG_SMP
-static void tlb_shootdown_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
+static void tlb_shootdown_ipi(unsigned int n __attribute__((unused)),
+    istate_t *istate __attribute__((unused)))
 {
         trap_virtual_eoi();
@@ -179 +173 @@
 
 /** Handler of IRQ exceptions */
-static void irq_interrupt(int n, istate_t *istate __attribute__((unused)))
+static void irq_interrupt(unsigned int n, istate_t *istate __attribute__((unused)))
 {
         ASSERT(n >= IVT_IRQBASE);
         
-        int inum = n - IVT_IRQBASE;
+        unsigned int inum = n - IVT_IRQBASE;
         bool ack = false;
         ASSERT(inum < IRQ_COUNT);
@@ -193 +187 @@
                  * The IRQ handler was found.
                  */
-                 
+                
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
@@ -200 +194 @@
                 }
                 irq->handler(irq);
-                spinlock_unlock(&irq->lock);
+                irq_spinlock_unlock(&irq->lock, false);
         } else {
                 /*
@@ -206 +200 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, inum);
+                printf("cpu%u: spurious interrupt (inum=%u)\n", CPU->id, inum);
 #endif
         }
@@ -216 +210 @@
 void interrupt_init(void)
 {
-        int i;
+        unsigned int i;
         
         for (i = 0; i < IVT_ITEMS; i++)
-                exc_register(i, "null", (iroutine) null_interrupt);
+                exc_register(i, "null", false, (iroutine_t) null_interrupt);
         
         for (i = 0; i < IRQ_COUNT; i++) {
                 if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
-                        exc_register(IVT_IRQBASE + i, "irq", (iroutine) irq_interrupt);
+                        exc_register(IVT_IRQBASE + i, "irq", true,
+                            (iroutine_t) irq_interrupt);
         }
         
-        exc_register(0, "de_fault", (iroutine) de_fault);
-        exc_register(7, "nm_fault", (iroutine) nm_fault);
-        exc_register(12, "ss_fault", (iroutine) ss_fault);
-        exc_register(13, "gp_fault", (iroutine) gp_fault);
-        exc_register(19, "simd_fp", (iroutine) simd_fp_exception);
+        exc_register(0, "de_fault", true, (iroutine_t) de_fault);
+        exc_register(7, "nm_fault", true, (iroutine_t) nm_fault);
+        exc_register(12, "ss_fault", true, (iroutine_t) ss_fault);
+        exc_register(13, "gp_fault", true, (iroutine_t) gp_fault);
+        exc_register(19, "simd_fp", true, (iroutine_t) simd_fp_exception);
         
 #ifdef CONFIG_SMP
-        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", (iroutine) tlb_shootdown_ipi);
+        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true,
+            (iroutine_t) tlb_shootdown_ipi);
 #endif
 }