X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/df61e9d0fec3d5e75820e27e7a2459d132364585..946c3fdd31300074cc78841795bd47af908ddddb:/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 862ef05..0d7c815 100644
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -5,85 +5,48 @@
 
 #ifndef __ASM__
 #include <hal/cpu.h>
+
+struct exec_param;
+
+struct regcontext
+{
+    reg32 eax;
+    reg32 ebx;
+    reg32 ecx;
+    reg32 edx;
+    reg32 edi;
+    reg32 ebp;
+    reg32 esi;
+    reg32 ds;
+    reg32 es;
+    reg32 fs;
+    reg32 gs;
+} __attribute__((packed));
+
 typedef struct
 {
-    struct
+    unsigned int depth;
+    struct regcontext registers;
+    union
     {
-        reg32 eax;
-        reg32 ebx;
-        reg32 ecx;
-        reg32 edx;
-        reg32 edi;
-        reg32 ebp;
-        reg32 esi;
-        reg32 ds;
-        reg32 es;
-        reg32 fs;
-        reg32 gs;
         reg32 esp;
-    } registers;
-
-    unsigned int vector;
-    unsigned int err_code;
-    unsigned int eip;
-    unsigned int cs;
-    unsigned int eflags;
-    unsigned int esp;
-    unsigned int ss;
+        volatile struct exec_param* execp;
+    };
 } __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);
-
-void intr_set_fallback_handler(int_subscriber);
+struct exec_param
+{
+    isr_param* saved_prev_ctx;
+    u32_t vector;
+    u32_t err_code;
+    u32_t eip;
+    u32_t cs;
+    u32_t eflags;
+    u32_t esp;
+    u32_t ss;
+} __attribute__((packed));
+
+#define ISR_PARAM_SIZE sizeof(isr_param)
 
 void
 intr_handler(isr_param* param);