Changes in kernel/arch/ia64/src/interrupt.c [b60c582:22a28a69] in mainline

File:

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

kernel/arch/ia64/src/interrupt.c

@@ -41 +41 @@
 #include <debug.h>
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.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
-
-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
+
+static const char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
         "VHPT Translation vector",
         "Instruction TLB vector",
@@ -87 +88 @@
 };
 
-char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
+static const char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
         "Page Not Present vector",
         "Key Permission vector",
@@ -121 +122 @@
 };
 
-static char *vector_to_string(uint16_t vector);
-static void dump_interrupted_context(istate_t *istate);
-
-char *vector_to_string(uint16_t vector)
+static const char *vector_to_string(uint16_t vector)
 {
         ASSERT(vector <= VECTOR_MAX);
@@ -135 +133 @@
 }
 
-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");
+void istate_decode(istate_t *istate)
+{
         printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
             istate->ar_bspstore);
@@ -154 +144 @@
             istate->cr_ipsr);
         
-        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);
+        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei,
+            symtab_fmt_name_lookup(istate->cr_iip));
+        printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa,
+            symtab_fmt_name_lookup(istate->cr_iipa));
+        printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa,
+            symtab_fmt_name_lookup(istate->cr_ifa));
 }
 
 void general_exception(uint64_t vector, istate_t *istate)
 {
-        char *desc = "";
-
+        const char *desc;
+        
         switch (istate->cr_isr.ge_code) {
         case GE_ILLEGALOP:
@@ -187 +179 @@
                 break;
         }
-
+        
         fault_if_from_uspace(istate, "General Exception (%s).", desc);
-
-        dump_interrupted_context(istate);
-        panic("General Exception (%s).", desc);
+        panic_badtrap(istate, vector, "General Exception (%s).", desc);
 }
 
@@ -201 +191 @@
         fault_if_from_uspace(istate, "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));
+        panic_badtrap(istate, vector, "Interruption: %#hx (%s).",
+            (uint16_t) vector, vector_to_string(vector));
 #endif
 }
@@ -223 +212 @@
                 istate->cr_ipsr.ri++;
         }
-
+        
         return syscall_handler(istate->in0, istate->in1, istate->in2,
             istate->in3, istate->in4, istate->in5, istate->in6);
@@ -232 +221 @@
         fault_if_from_uspace(istate, "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));
+        panic_badtrap(istate, vector, "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:
@@ -257 +247 @@
 #endif
                 break;
-
+        
 #ifdef CONFIG_SMP
         case VECTOR_TLB_SHOOTDOWN_IPI:
@@ -264 +254 @@
                 break;
 #endif
-
+        
         case INTERRUPT_TIMER:
                 irq = irq_dispatch_and_lock(ivr.vector);
                 if (irq) {
                         irq->handler(irq);
-                        spinlock_unlock(&irq->lock);
+                        irq_spinlock_unlock(&irq->lock, false);
                 } else {
                         panic("Unhandled Internal Timer Interrupt (%d).",
@@ -288 +278 @@
                         if (!irq->preack)
                                 end_of_local_irq();
-                        spinlock_unlock(&irq->lock);
+                        irq_spinlock_unlock(&irq->lock, false);
                 } else {
                         /*