Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / includes / arch / x86 / interrupts.h

diff --git a/lunaix-os/includes/arch/x86/interrupts.h b/lunaix-os/includes/arch/x86/interrupts.h
index 862ef05bc46bbb4d64f0b4b698e577a222e0b343..f1684a8ad1398d52919a4a28d41c01457ecfb886 100644 (file)
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -5,8 +5,12 @@
 
 #ifndef __ASM__
 #include <hal/cpu.h>
+
+struct exec_param;
+
 typedef struct
 {
+    unsigned int depth;
     struct
     {
         reg32 eax;
@@ -20,9 +24,18 @@ typedef struct
         reg32 es;
         reg32 fs;
         reg32 gs;
+    } __attribute__((packed)) registers;
+
+    union
+    {
         reg32 esp;
-    } registers;
+        volatile struct exec_param* execp;
+    };
+} __attribute__((packed)) isr_param;
 
+struct exec_param
+{
+    isr_param saved_prev_ctx;
     unsigned int vector;
     unsigned int err_code;
     unsigned int eip;
@@ -30,60 +43,9 @@ typedef struct
     unsigned int eflags;
     unsigned int esp;
     unsigned int ss;
-} __attribute__((packed)) isr_param;
-
-typedef void (*int_subscriber)(isr_param*);
-
-#pragma region ISR_DECLARATION
-
-#define ISR(iv) void _asm_isr##iv();
-
-ISR(0)
-ISR(1)
-ISR(2)
-ISR(3)
-ISR(4)
-ISR(5)
-ISR(6)
-ISR(7)
-ISR(8)
-ISR(9)
-ISR(10)
-ISR(11)
-ISR(12)
-ISR(13)
-ISR(14)
-ISR(15)
-ISR(16)
-ISR(17)
-ISR(18)
-ISR(19)
-ISR(20)
-ISR(21)
-
-ISR(32)
-ISR(33)
-
-ISR(201)
-ISR(202)
-
-ISR(210)
-
-ISR(250)
-ISR(251)
-ISR(252)
-ISR(253)
-ISR(254)
-
-#pragma endregion
-
-void
-intr_subscribe(const uint8_t vector, int_subscriber);
-
-void
-intr_unsubscribe(const uint8_t vector, int_subscriber);
+} __attribute__((packed));
 
-void intr_set_fallback_handler(int_subscriber);
+#define ISR_PARAM_SIZE sizeof(isr_param)
 
 void
 intr_handler(isr_param* param);