Changes in kernel/arch/ia64/include/interrupt.h [598f90e:21941ac] in mainline

File:

• kernel/arch/ia64/include/interrupt.h (modified) (3 diffs)

kernel/arch/ia64/include/interrupt.h

@@ -36 +36 @@
 #define KERN_ia64_INTERRUPT_H_
 
-#include <typedefs.h>
-#include <arch/istate.h>
+#include <arch/types.h>
+#include <arch/register.h>
 
 /** ia64 has 256 INRs. */
@@ -61 +61 @@
 #define IRQ_KBD    (0x01 + LEGACY_INTERRUPT_BASE)
 #define IRQ_MOUSE  (0x0c + LEGACY_INTERRUPT_BASE)
-#define IRQ_DP8390 (0x09 + LEGACY_INTERRUPT_BASE)
 
 /** General Exception codes. */
@@ -73 +72 @@
 #define EOI  0  /**< The actual value doesn't matter. */
 
+typedef struct istate {
+        uint128_t f2;
+        uint128_t f3;
+        uint128_t f4;
+        uint128_t f5;
+        uint128_t f6;
+        uint128_t f7;
+        uint128_t f8;
+        uint128_t f9;
+        uint128_t f10;
+        uint128_t f11;
+        uint128_t f12;
+        uint128_t f13;
+        uint128_t f14;
+        uint128_t f15;
+        uint128_t f16;
+        uint128_t f17;
+        uint128_t f18;
+        uint128_t f19;
+        uint128_t f20;
+        uint128_t f21;
+        uint128_t f22;
+        uint128_t f23;
+        uint128_t f24;
+        uint128_t f25;
+        uint128_t f26;
+        uint128_t f27;
+        uint128_t f28;
+        uint128_t f29;
+        uint128_t f30;
+        uint128_t f31;
+        
+        uintptr_t ar_bsp;
+        uintptr_t ar_bspstore;
+        uintptr_t ar_bspstore_new;
+        uint64_t ar_rnat;
+        uint64_t ar_ifs;
+        uint64_t ar_pfs;
+        uint64_t ar_rsc;
+        uintptr_t cr_ifa;
+        cr_isr_t cr_isr;
+        uintptr_t cr_iipa;
+        psr_t cr_ipsr;
+        uintptr_t cr_iip;
+        uint64_t pr;
+        uintptr_t sp;
+        
+        /*
+         * The following variables are defined only for break_instruction
+         * handler.
+         */
+        uint64_t in0;
+        uint64_t in1;
+        uint64_t in2;
+        uint64_t in3;
+        uint64_t in4;
+        uint64_t in5;
+        uint64_t in6;
+} istate_t;
+
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
+{
+        istate->cr_iip = retaddr;
+        istate->cr_ipsr.ri = 0;    /* return to instruction slot #0 */
+}
+
+static inline unative_t istate_get_pc(istate_t *istate)
+{
+        return istate->cr_iip;
+}
+
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* FIXME */
+}
+
+static inline int istate_from_uspace(istate_t *istate)
+{
+        return (istate->cr_iip) < 0xe000000000000000ULL;
+}
+
 extern void *ivt;
 
-extern void general_exception(uint64_t, istate_t *);
-extern int break_instruction(uint64_t, istate_t *);
-extern void universal_handler(uint64_t, istate_t *);
-extern void nop_handler(uint64_t, istate_t *);
-extern void external_interrupt(uint64_t, istate_t *);
-extern void disabled_fp_register(uint64_t, istate_t *);
+extern void general_exception(uint64_t vector, istate_t *istate);
+extern int break_instruction(uint64_t vector, istate_t *istate);
+extern void universal_handler(uint64_t vector, istate_t *istate);
+extern void nop_handler(uint64_t vector, istate_t *istate);
+extern void external_interrupt(uint64_t vector, istate_t *istate);
+extern void disabled_fp_register(uint64_t vector, istate_t *istate);
 
-extern void trap_virtual_enable_irqs(uint16_t);
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
 
 #endif