Changes in kernel/arch/amd64/src/interrupt.c [acc7ce4:98000fb] in mainline

File:

• kernel/arch/amd64/src/interrupt.c (modified) (10 diffs)

kernel/arch/amd64/src/interrupt.c

@@ -53 +53 @@
 #include <ddi/irq.h>
 #include <symtab.h>
-#include <stacktrace.h>
 
 /*
@@ -62 +61 @@
 void (* enable_irqs_function)(uint16_t irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
-const char *irqs_info = NULL;
-
-void istate_decode(istate_t *istate)
-{
-        printf("cs =%#0" PRIx64 "\trip=%p\t"
-            "rfl=%#0" PRIx64 "\terr=%#0" PRIx64 "\n",
-            istate->cs, (void *) istate->rip,
-            istate->rflags, istate->error_word);
-        
-        if (istate_from_uspace(istate))
-                printf("ss =%#0" PRIx64 "\n", istate->ss);
-        
-        printf("rax=%#0" PRIx64 "\trbx=%#0" PRIx64 "\t"
-            "rcx=%#0" PRIx64 "\trdx=%#0" PRIx64 "\n",
-            istate->rax, istate->rbx, istate->rcx, istate->rdx);
-        
-        printf("rsi=%p\trdi=%p\trbp=%p\trsp=%p\n",
-            (void *) istate->rsi, (void *) istate->rdi,
-            (void *) istate->rbp,
-            istate_from_uspace(istate) ? ((void *) istate->rsp) :
-            &istate->rsp);
-        
-        printf("r8 =%#0" PRIx64 "\tr9 =%#0" PRIx64 "\t"
-            "r10=%#0" PRIx64 "\tr11=%#0" PRIx64 "\n",
-            istate->r8, istate->r9, istate->r10, istate->r11);
-        
-        printf("r12=%#0" PRIx64 "\tr13=%#0" PRIx64 "\t"
-            "r14=%#0" PRIx64 "\tr15=%#0" PRIx64 "\n",
-            istate->r12, istate->r13, istate->r14, istate->r15);
+
+void decode_istate(int n, istate_t *istate)
+{
+        char *symbol;
+
+        symbol = symtab_fmt_name_lookup(istate->rip);
+
+        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);
+        printf("%%rip: %#llx (%s)\n", istate->rip, symbol);
+        printf("ERROR_WORD=%#llx\n", istate->error_word);
+        printf("%%cs=%#llx, rflags=%#llx, %%cr0=%#llx\n", istate->cs,
+            istate->rflags, read_cr0());
+        printf("%%rax=%#llx, %%rcx=%#llx, %%rdx=%#llx\n", istate->rax,
+            istate->rcx, istate->rdx);
+        printf("%%rsi=%#llx, %%rdi=%#llx, %%r8=%#llx\n", istate->rsi,
+            istate->rdi, istate->r8);
+        printf("%%r9=%#llx, %%r10=%#llx, %%r11=%#llx\n", istate->r9,
+            istate->r10, istate->r11);
+        printf("%%rsp=%#llx\n", &istate->stack[0]);
 }
 
@@ -102 +91 @@
 }
 
-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.");
-}
-
-static void de_fault(unsigned int n, istate_t *istate)
-{
-        fault_if_from_uspace(istate, "Divide error.");
-        panic_badtrap(istate, n, "Divide error.");
-}
-
-/** General Protection Fault.
- *
- */
-static void gp_fault(unsigned int n, istate_t *istate)
+static void null_interrupt(int n, istate_t *istate)
+{
+        fault_if_from_uspace(istate, "Unserviced interrupt: %d.", n);
+        decode_istate(n, istate);
+        panic("Unserviced interrupt.");
+}
+
+/** General Protection Fault. */
+static void gp_fault(int n, istate_t *istate)
 {
         if (TASK) {
-                irq_spinlock_lock(&TASK->lock, false);
-                size_t ver = TASK->arch.iomapver;
-                irq_spinlock_unlock(&TASK->lock, false);
-                
+                size_t ver;
+
+                spinlock_lock(&TASK->lock);
+                ver = TASK->arch.iomapver;
+                spinlock_unlock(&TASK->lock);
+
                 if (CPU->arch.iomapver_copy != ver) {
                         /*
@@ -137 +121 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        panic_badtrap(istate, n, "General protection fault.");
-}
-
-static void ss_fault(unsigned int n, istate_t *istate)
+
+        decode_istate(n, istate);
+        panic("General protection fault.");
+}
+
+static void ss_fault(int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        panic_badtrap(istate, n, "Stack fault.");
-}
-
-static void nm_fault(unsigned int n, istate_t *istate)
+        decode_istate(n, istate);
+        panic("Stack fault.");
+}
+
+static void nm_fault(int n, istate_t *istate)
 {
 #ifdef CONFIG_FPU_LAZY
@@ -157 +144 @@
 
 #ifdef CONFIG_SMP
-static void tlb_shootdown_ipi(unsigned int n, istate_t *istate)
+static void tlb_shootdown_ipi(int n, istate_t *istate)
 {
         trap_virtual_eoi();
@@ -164 +151 @@
 #endif
 
-/** Handler of IRQ exceptions.
- *
- */
-static void irq_interrupt(unsigned int n, istate_t *istate)
+/** Handler of IRQ exceptions */
+static void irq_interrupt(int n, istate_t *istate)
 {
         ASSERT(n >= IVT_IRQBASE);
         
-        unsigned int inum = n - IVT_IRQBASE;
+        int inum = n - IVT_IRQBASE;
         bool ack = false;
         ASSERT(inum < IRQ_COUNT);
@@ -181 +166 @@
                  * The IRQ handler was found.
                  */
-                
+                 
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
@@ -188 +173 @@
                 }
                 irq->handler(irq);
-                irq_spinlock_unlock(&irq->lock, false);
+                spinlock_unlock(&irq->lock);
         } else {
                 /*
@@ -194 +179 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%u: spurious interrupt (inum=%u)\n", CPU->id, inum);
+                printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
 #endif
         }
@@ -204 +189 @@
 void interrupt_init(void)
 {
-        unsigned int i;
+        int i;
         
         for (i = 0; i < IVT_ITEMS; i++)
-                exc_register(i, "null", false, (iroutine_t) null_interrupt);
+                exc_register(i, "null", (iroutine) null_interrupt);
         
         for (i = 0; i < IRQ_COUNT; i++) {
                 if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
-                        exc_register(IVT_IRQBASE + i, "irq", true,
-                            (iroutine_t) irq_interrupt);
+                        exc_register(IVT_IRQBASE + i, "irq",
+                            (iroutine) irq_interrupt);
         }
         
-        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(7, "nm_fault", (iroutine) nm_fault);
+        exc_register(12, "ss_fault", (iroutine) ss_fault);
+        exc_register(13, "gp_fault", (iroutine) gp_fault);
+        exc_register(14, "ident_mapper", (iroutine) ident_page_fault);
         
 #ifdef CONFIG_SMP
-        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true,
-            (iroutine_t) tlb_shootdown_ipi);
+        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
+            (iroutine) tlb_shootdown_ipi);
 #endif
 }