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 395cfe27ee0d599638bf287c36cc62309d3dabc2..f1684a8ad1398d52919a4a28d41c01457ecfb886 100644 (file)
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -6,19 +6,11 @@
 #ifndef __ASM__
 #include <hal/cpu.h>
 
 #ifndef __ASM__
 #include <hal/cpu.h>
 

-struct exec_param
-{
-    unsigned int vector;
-    unsigned int err_code;
-    unsigned int eip;
-    unsigned int cs;
-    unsigned int eflags;
-    unsigned int esp;
-    unsigned int ss;
-} __attribute__((packed));
+struct exec_param;

 
 typedef struct
 {
 
 typedef struct
 {

+    unsigned int depth;

     struct
     {
         reg32 eax;
     struct
     {
         reg32 eax;


@@ -32,16 +24,29 @@ typedef struct
         reg32 es;
         reg32 fs;
         reg32 gs;
         reg32 es;
         reg32 fs;
         reg32 gs;

-        // reg32 esp;

     } __attribute__((packed)) registers;
 
     union
     {
         reg32 esp;
     } __attribute__((packed)) registers;
 
     union
     {
         reg32 esp;

-        struct exec_param* execp;
+        volatile struct exec_param* execp;

     };
 } __attribute__((packed)) isr_param;
 
     };
 } __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;
+    unsigned int esp;
+    unsigned int ss;
+} __attribute__((packed));
+
+#define ISR_PARAM_SIZE sizeof(isr_param)
+

 void
 intr_handler(isr_param* param);
 
 void
 intr_handler(isr_param* param);