WebSVN – HelenOS-historic – Path Comparison – / – /kernel/trunk/arch/ia64/ Rev 1594 and /kernel/trunk/arch/ia64/ Rev 1595

Ignore whitespace Rev 1594 → Rev 1595

 /kernel/trunk/arch/ia64/include/interrupt.h
 ,6 → 113,17
     istate->cr_ipsr.ri = 0;     /* return to instruction slot #0 */
 }
+static inline __native istate_get_pc(istate_t *istate)
+{
+    return istate->cr_iip;
+}
+#include <panic.h>
+static inline int istate_from_uspace(istate_t *istate)
+{
+    panic("TODO: istate_from_uspace not yet implemented");
+    return 0;
+}
 extern void *ivt;
 extern void general_exception(__u64 vector, istate_t *istate);

 /kernel/trunk/arch/ia64/src/interrupt.c
 ,6 → 46,7
 #include <ipc/sysipc.h>
 #include <ipc/irq.h>
 #include <ipc/ipc.h>
+#include <interrupt.h>
 #define VECTORS_64_BUNDLE   20
 ,8 → 151,6
 {
     char *desc = "";
-    dump_interrupted_context(istate);
     switch (istate->cr_isr.ge_code) {
         case GE_ILLEGALOP:
         desc = "Illegal Operation fault";
 ,6 → 175,9
         break;
     }
+    fault_if_from_uspace(istate, "General Exception (%s)", desc);
+    dump_interrupted_context(istate);
     panic("General Exception (%s)\n", desc);
 }
 ,6 → 188,7
 #ifdef CONFIG_FPU_LAZY
     scheduler_fpu_lazy_request();
 #else
+    fault_if_from_uspace(istate, "Interruption: %#hx (%s)", (__u16) vector, vector_to_string(vector));
     dump_interrupted_context(istate);
     panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
 #endif
 ,6 → 270,3
     panic("not implemented\n");
     /* TODO */
 }