WebSVN – HelenOS – Diff – /branches/tracing/kernel/arch/ia64/src/interrupt.c

 #include <arch/interrupt.h>
 #include <interrupt.h>
 #include <ddi/irq.h>
 #include <panic.h>
 #include <print.h>
-#include <symtab.h>
 #include <debug.h>
 #include <console/console.h>
 #include <arch/types.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>
 #include <ipc/sysipc.h>
 #include <ipc/irq.h>
 #include <ipc/ipc.h>
 #include <synch/spinlock.h>
 #include <mm/tlb.h>
+#include <symtab.h>
+#include <putchar.h>
 #define VECTORS_64_BUNDLE   20
 #define VECTORS_16_BUNDLE   48
 #define VECTORS_16_BUNDLE_START 0x5000
 #define VECTOR_MAX      0x7f00
 void dump_interrupted_context(istate_t *istate)
+{
     char *ifa, *iipa, *iip;
-    ifa = get_symtab_entry(istate->cr_ifa);
+    ifa = symtab_fmt_name_lookup(istate->cr_ifa);
-    iipa = get_symtab_entry(istate->cr_iipa);
+    iipa = symtab_fmt_name_lookup(istate->cr_iipa);
-    iip = get_symtab_entry(istate->cr_iip);
+    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);
     default:
         desc = "unknown";
         break;
+    }
-    fault_if_from_uspace(istate, "General Exception (%s)", desc);
+    fault_if_from_uspace(istate, "General Exception (%s).", desc);
     dump_interrupted_context(istate);
-    panic("General Exception (%s)\n", desc);
+    panic("General Exception (%s).", desc);
+}
 void disabled_fp_register(uint64_t vector, istate_t *istate)
+{
 #ifdef CONFIG_FPU_LAZY
     scheduler_fpu_lazy_request();
 #else
-    fault_if_from_uspace(istate, "Interruption: %#hx (%s)",
+    fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
         (uint16_t) vector, vector_to_string(vector));
     dump_interrupted_context(istate);
-    panic("Interruption: %#hx (%s)\n", (uint16_t) vector,
+    panic("Interruption: %#hx (%s).", (uint16_t) vector,
         vector_to_string(vector));
 #endif
+}
 void nop_handler(uint64_t vector, istate_t *istate)
         istate->in3, istate->in4, istate->in5, istate->in6);
+}
 void universal_handler(uint64_t vector, istate_t *istate)
+{
-    fault_if_from_uspace(istate, "Interruption: %#hx (%s)\n",
+    fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
         (uint16_t) vector, vector_to_string(vector));
     dump_interrupted_context(istate);
-    panic("Interruption: %#hx (%s)\n", (uint16_t) vector,
+    panic("Interruption: %#hx (%s).", (uint16_t) vector,
         vector_to_string(vector));
+}
 static void end_of_local_irq(void)
+{
 void external_interrupt(uint64_t vector, istate_t *istate)
+{
     cr_ivr_t ivr;
+    irq_t *irq;
     ivr.value = ivr_read();
     srlz_d();
-        switch (ivr.vector) {
+    switch (ivr.vector) {
-        case INTERRUPT_SPURIOUS:
+    case INTERRUPT_SPURIOUS:
 #ifdef CONFIG_DEBUG
-            printf("cpu%d: spurious interrupt\n", CPU->id);
+        printf("cpu%d: spurious interrupt\n", CPU->id);
 #endif
-            break;
+        break;
 #ifdef CONFIG_SMP
-        case VECTOR_TLB_SHOOTDOWN_IPI:
+    case VECTOR_TLB_SHOOTDOWN_IPI:
-            tlb_shootdown_ipi_recv();
+        tlb_shootdown_ipi_recv();
-            end_of_local_irq();
+        end_of_local_irq();
-            break;
+        break;
 #endif
-        case INTERRUPT_TIMER:
+    case INTERRUPT_TIMER:
-            {
-                irq_t *irq = irq_dispatch_and_lock(ivr.vector);
+        irq = irq_dispatch_and_lock(ivr.vector);
-                if (irq) {
+        if (irq) {
-                    irq->handler(irq, irq->arg);
+            irq->handler(irq);
-                    spinlock_unlock(&irq->lock);
+            spinlock_unlock(&irq->lock);
-                } else {
+        } else {
-                    panic("\nUnhandled Internal Timer Interrupt (%d)\n",ivr.vector);
+            panic("Unhandled Internal Timer Interrupt (%d).",
-                }
+                ivr.vector);
-            }
+        }
-            break;
+        break;
-        default:
+    default:
-            {
-                int ack=false;
-                irq_t *irq = irq_dispatch_and_lock(ivr.vector);
+        irq = irq_dispatch_and_lock(ivr.vector);
-                if (irq) {
+        if (irq) {
-                    /*
+            /*
-                     * The IRQ handler was found.
+             * The IRQ handler was found.
-                     */
+             */
-                    if (irq->preack) {
+            if (irq->preack) {
-                        /* Send EOI before processing the interrupt */
+                /* Send EOI before processing the interrupt */
-                        end_of_local_irq();
+                end_of_local_irq();
-                        ack=true;
-                    }
+            }
-                    irq->handler(irq, irq->arg);
+            irq->handler(irq);
+            if (!irq->preack)
+                end_of_local_irq();
-                    spinlock_unlock(&irq->lock);
+            spinlock_unlock(&irq->lock);
-                } else {
+        } else {
-                    /*
+            /*
-                     * Unhandled interrupt.
+             * Unhandled interrupt.
-                     */
+             */
-                    end_of_local_irq();
+            end_of_local_irq();
-                    ack=true;
 #ifdef CONFIG_DEBUG
-                    printf("\nUnhandled External Interrupt Vector %d\n",ivr.vector);
+            printf("\nUnhandled External Interrupt Vector %d\n",
+                ivr.vector);
 #endif
-                }
-                if(!ack) end_of_local_irq();
-            }
-            break;
+        }
+        break;
+    }
+}
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/arch/ia64/src/interrupt.c – Rev 3675 → 4377