Merge branch 'vfs-dev'

[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 6265720f0fd5dced88f0d9109045639024af69ee..3643a9ef668a92f2ae4b8f1b81d4a15ba431f67b 100644 (file)
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -1,30 +1,28 @@
 #ifndef __LUNAIX_INTERRUPTS_H
 #define __LUNAIX_INTERRUPTS_H
 
-#define FAULT_DIVISION_ERROR            0x0
-#define FAULT_TRAP_DEBUG_EXCEPTION      0x1
-#define INT_NMI                         0x2
-#define TRAP_BREAKPOINT                 0x3
-#define TRAP_OVERFLOW                   0x4
-#define FAULT_BOUND_EXCEED              0x5
-#define FAULT_INVALID_OPCODE            0x6
-#define FAULT_NO_MATH_PROCESSOR         0x7
-#define ABORT_DOUBLE_FAULT              0x8
-#define FAULT_RESERVED_0                0x9
-#define FAULT_INVALID_TSS               0xa
-#define FAULT_SEG_NOT_PRESENT           0xb
-#define FAULT_STACK_SEG_FAULT           0xc
-#define FAULT_GENERAL_PROTECTION        0xd
-#define FAULT_PAGE_FAULT                0xe
-#define FAULT_RESERVED_1                0xf
-#define FAULT_X87_FAULT                 0x10
-#define FAULT_ALIGNMENT_CHECK           0x11
-#define ABORT_MACHINE_CHECK             0x12
-#define FAULT_SIMD_FP_EXCEPTION         0x13
-#define FAULT_VIRTUALIZATION_EXCEPTION  0x14
-#define FAULT_CONTROL_PROTECTION        0x15
-
-typedef struct {
+#include "vectors.h"
+
+#ifndef __ASM__
+#include <hal/cpu.h>
+typedef struct
+{
+    struct
+    {
+        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;
@@ -34,13 +32,66 @@ typedef struct {
     unsigned int ss;
 } __attribute__((packed)) isr_param;
 
+typedef void (*int_subscriber)(const 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(34)
+
+ISR(201)
+ISR(202)
+
+ISR(210)
+
+ISR(250)
+ISR(251)
+ISR(252)
+ISR(253)
+ISR(254)
+
+#pragma endregion
+
 void
-_asm_isr0();
+intr_subscribe(const uint8_t vector, int_subscriber);
 
 void
-_asm_isr13();
+intr_unsubscribe(const uint8_t vector, int_subscriber);
+
+void intr_set_fallback_handler(int_subscriber);
 
 void
-interrupt_handler(isr_param* param);
+intr_handler(isr_param* param);
+
+void
+intr_routine_init();
+
+#endif
 
 #endif /* __LUNAIX_INTERRUPTS_H */