Changes in kernel/arch/ia64/src/interrupt.c [7e752b2:b60c582] in mainline

File:

• kernel/arch/ia64/src/interrupt.c (modified) (12 diffs)

kernel/arch/ia64/src/interrupt.c

@@ -41 +41 @@
 #include <debug.h>
 #include <console/console.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>
@@ -57 +57 @@
 #include <putchar.h>
 
-#define VECTORS_64_BUNDLE        20
-#define VECTORS_16_BUNDLE        48
-#define VECTORS_16_BUNDLE_START  0x5000
-
-#define VECTOR_MAX  0x7f00
-
-#define BUNDLE_SIZE  16
-
-static const char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
+#define VECTORS_64_BUNDLE       20
+#define VECTORS_16_BUNDLE       48
+#define VECTORS_16_BUNDLE_START 0x5000
+#define VECTOR_MAX              0x7f00
+
+#define BUNDLE_SIZE             16
+
+char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
         "VHPT Translation vector",
         "Instruction TLB vector",
@@ -88 +87 @@
 };
 
-static const char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
+char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
         "Page Not Present vector",
         "Key Permission vector",
@@ -122 +121 @@
 };
 
-static const char *vector_to_string(uint16_t vector)
+static char *vector_to_string(uint16_t vector);
+static void dump_interrupted_context(istate_t *istate);
+
+char *vector_to_string(uint16_t vector)
 {
         ASSERT(vector <= VECTOR_MAX);
@@ -133 +135 @@
 }
 
-void istate_decode(istate_t *istate)
-{
-        printf("ar.bsp=%p\tar.bspstore=%p\n",
-            (void *) istate->ar_bsp, (void *) istate->ar_bspstore);
-        printf("ar.rnat=%#0" PRIx64 "\tar.rsc=%#0" PRIx64 "\n",
-            istate->ar_rnat, istate->ar_rsc);
-        printf("ar.ifs=%#0" PRIx64 "\tar.pfs=%#0" PRIx64 "\n",
-            istate->ar_ifs, istate->ar_pfs);
-        printf("cr.isr=%#0" PRIx64 "\tcr.ipsr=%#0" PRIx64 "\n",
-            istate->cr_isr.value, istate->cr_ipsr.value);
+void dump_interrupted_context(istate_t *istate)
+{
+        char *ifa, *iipa, *iip;
+
+        ifa = symtab_fmt_name_lookup(istate->cr_ifa);
+        iipa = symtab_fmt_name_lookup(istate->cr_iipa);
+        iip = symtab_fmt_name_lookup(istate->cr_iip);
+
+        putchar('\n');
+        printf("Interrupted context dump:\n");
+        printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
+            istate->ar_bspstore);
+        printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat,
+            istate->ar_rsc);
+        printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs,
+            istate->ar_pfs);
+        printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value,
+            istate->cr_ipsr);
         
-        printf("cr.iip=%#0" PRIx64 ", #%u\t(%s)\n",
-            istate->cr_iip, istate->cr_isr.ei,
-            symtab_fmt_name_lookup(istate->cr_iip));
-        printf("cr.iipa=%#0" PRIx64 "\t(%s)\n", istate->cr_iipa,
-            symtab_fmt_name_lookup(istate->cr_iipa));
-        printf("cr.ifa=%#0" PRIx64 "\t(%s)\n", istate->cr_ifa,
-            symtab_fmt_name_lookup(istate->cr_ifa));
+        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip,
+            istate->cr_isr.ei, iip);
+        printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa, iipa);
+        printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa, ifa);
 }
 
 void general_exception(uint64_t vector, istate_t *istate)
 {
-        const char *desc;
-        
+        char *desc = "";
+
         switch (istate->cr_isr.ge_code) {
         case GE_ILLEGALOP:
@@ -180 +187 @@
                 break;
         }
-        
+
         fault_if_from_uspace(istate, "General Exception (%s).", desc);
-        panic_badtrap(istate, vector, "General Exception (%s).", desc);
+
+        dump_interrupted_context(istate);
+        panic("General Exception (%s).", desc);
 }
 
@@ -192 +201 @@
         fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
             (uint16_t) vector, vector_to_string(vector));
-        panic_badtrap(istate, vector, "Interruption: %#hx (%s).",
-            (uint16_t) vector, vector_to_string(vector));
+        dump_interrupted_context(istate);
+        panic("Interruption: %#hx (%s).", (uint16_t) vector,
+            vector_to_string(vector));
 #endif
 }
@@ -213 +223 @@
                 istate->cr_ipsr.ri++;
         }
-        
+
         return syscall_handler(istate->in0, istate->in1, istate->in2,
             istate->in3, istate->in4, istate->in5, istate->in6);
@@ -222 +232 @@
         fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
             (uint16_t) vector, vector_to_string(vector));
-        panic_badtrap(istate, vector, "Interruption: %#hx (%s).",
-            (uint16_t) vector, vector_to_string(vector));
+        dump_interrupted_context(istate);
+        panic("Interruption: %#hx (%s).", (uint16_t) vector,
+            vector_to_string(vector));
 }
 
 static void end_of_local_irq(void)
 {
-        asm volatile (
-                "mov cr.eoi=r0;;"
-        );
-}
+        asm volatile ("mov cr.eoi=r0;;");
+}
+
 
 void external_interrupt(uint64_t vector, istate_t *istate)
 {
         cr_ivr_t ivr;
+        irq_t *irq;
         
         ivr.value = ivr_read();
         srlz_d();
-        
-        irq_t *irq;
-        
+
         switch (ivr.vector) {
         case INTERRUPT_SPURIOUS:
@@ -248 +257 @@
 #endif
                 break;
-        
+
 #ifdef CONFIG_SMP
         case VECTOR_TLB_SHOOTDOWN_IPI:
@@ -255 +264 @@
                 break;
 #endif
-        
+
         case INTERRUPT_TIMER:
                 irq = irq_dispatch_and_lock(ivr.vector);
                 if (irq) {
                         irq->handler(irq);
-                        irq_spinlock_unlock(&irq->lock, false);
+                        spinlock_unlock(&irq->lock);
                 } else {
                         panic("Unhandled Internal Timer Interrupt (%d).",
@@ -279 +288 @@
                         if (!irq->preack)
                                 end_of_local_irq();
-                        irq_spinlock_unlock(&irq->lock, false);
+                        spinlock_unlock(&irq->lock);
                 } else {
                         /*