fix: previous interrupt context lost after a nested interrupt

[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 fb4eb79a96b004ea92abae1c3d8187b36248edb8..f1684a8ad1398d52919a4a28d41c01457ecfb886 100644 (file)
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -1,19 +1,58 @@
 #ifndef __LUNAIX_INTERRUPTS_H
 #define __LUNAIX_INTERRUPTS_H
 
-typedef struct {
+#include "vectors.h"
+
+#ifndef __ASM__
+#include <hal/cpu.h>
+
+struct exec_param;
+
+typedef struct
+{
+    unsigned int depth;
+    struct
+    {
+        reg32 eax;
+        reg32 ebx;
+        reg32 ecx;
+        reg32 edx;
+        reg32 edi;
+        reg32 ebp;
+        reg32 esi;
+        reg32 ds;
+        reg32 es;
+        reg32 fs;
+        reg32 gs;
+    } __attribute__((packed)) registers;
+
+    union
+    {
+        reg32 esp;
+        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;
     unsigned int cs;
     unsigned int eflags;
-} __attribute__((packed)) isr_param;
+    unsigned int esp;
+    unsigned int ss;
+} __attribute__((packed));
+
+#define ISR_PARAM_SIZE sizeof(isr_param)
 
 void
-_asm_isr0();
+intr_handler(isr_param* param);
 
 void
-interrupt_handler(isr_param* param);
+intr_routine_init();
 
+#endif
 
 #endif /* __LUNAIX_INTERRUPTS_H */