git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chore: fix almost *ALL* warnings.
[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 d25fbe3b68d9e931b7062d559b7f9cbf6ad411ed..6d3c4b1183f1b8bec5be4d5f981b9f15338ac106 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>
#ifndef __ASM__
#include <hal/cpu.h>
+
+struct exec_param;
+
typedef struct
{
typedef struct
{
+ unsigned int depth;
struct
{
reg32 eax;
struct
{
reg32 eax;
@@
-20,18
+24,29
@@
typedef struct
reg32 es;
reg32 fs;
reg32 gs;
reg32 es;
reg32 fs;
reg32 gs;
- reg32 esp;
} __attribute__((packed)) registers;
} __attribute__((packed)) registers;
- unsigned int vector;
- unsigned int err_code;
- unsigned int eip;
- unsigned int cs;
- unsigned int eflags;
- unsigned int esp;
- unsigned int ss;
+ union
+ {
+ reg32 esp;
+ volatile struct exec_param* execp;
+ };
} __attribute__((packed)) isr_param;
} __attribute__((packed)) isr_param;
+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);
void
intr_handler(isr_param* param);