fix usermode interrupts. add ability to define custom interrupt handlersmain

2 files changed, 27 insertions, 0 deletions

diff --git a/include/arch/x86_64/idt.h b/include/arch/x86_64/idt.h
index 4ca820f..fe544cb 100644
--- a/include/arch/x86_64/idt.h
+++ b/include/arch/x86_64/idt.h
@@ -11,6 +11,28 @@ typedef struct jove_IVTState
     uint64_t rip, cs, rflags, rsp, ss;
 } ivt_state_t;
 
+enum
+{
+    EXCEPTION_DIVISION = 0,
+    EXCEPTION_DEBUG,
+    EXCEPTION_NMI,
+    EXCEPTION_BREAKPOINT,
+    EXCEPTION_OVERFLOW,
+    EXCEPTION_BRE,
+    EXCEPTION_INVLOP,
+    EXCEPTION_DEVNA,
+    EXCEPTION_DOUBLE,
+    EXCEPTION_CSO,
+    EXCEPTION_INVALID_TSS,
+    EXCEPTION_SEG_MISSING,
+    EXCEPTION_SS,
+    EXCEPTION_GPF,
+    EXCEPTION_PF
+};
+
+typedef void (*kernel_isr_handler_t)(ivt_state_t*);
+extern kernel_isr_handler_t kernel_isr_handles[256];
+
 void kpanic_state(ivt_state_t *state, const char *fmt, ...);
 
 void ivt_setup(void);
diff --git a/include/arch/x86_64/processor.h b/include/arch/x86_64/processor.h
index 7363c41..5e878b9 100644
--- a/include/arch/x86_64/processor.h
+++ b/include/arch/x86_64/processor.h
@@ -51,6 +51,7 @@ enum
 
 #define GDT_OFFSET_KERNEL_CODE (GDT_ENTRY_KERNEL_CODE * sizeof(segment_descriptor_t))
 #define GDT_OFFSET_KERNEL_DATA (GDT_ENTRY_KERNEL_DATA * sizeof(segment_descriptor_t))
+#define GDT_OFFSET_USER_NULL (GDT_ENTRY_USER_NULL * sizeof(segment_descriptor_t))
 #define GDT_OFFSET_USER_DATA (GDT_ENTRY_USER_DATA * sizeof(segment_descriptor_t))
 #define GDT_OFFSET_USER_CODE (GDT_ENTRY_USER_CODE * sizeof(segment_descriptor_t))
 #define GDT_OFFSET_TSS (GDT_ENTRY_TSS_LOW * sizeof(segment_descriptor_t))
@@ -60,7 +61,9 @@ typedef struct jove_Processor
     physptr_t pdir;
     struct jove_ObjectDirectory *odir;
 
+    __attribute__((aligned(0x10)))
     segment_descriptor_t gdt[GDT_ENTRY_COUNT];
+
     struct {
         uint16_t length;
         uint64_t base;
@@ -70,7 +73,9 @@ typedef struct jove_Processor
         uint64_t base;
     } __attribute__((packed)) idtr;
 
+    __attribute__((aligned(0x10)))
     tss_t tss;
+
     tcb_t *tcb;
 } processor_t;