fix usermode interrupts. add ability to define custom interrupt handlersmain

1 files changed, 5 insertions, 11 deletions

diff --git a/arch/x86_64/gdt.c b/arch/x86_64/gdt.c
index 3756d21..9c172d2 100644
--- a/arch/x86_64/gdt.c
+++ b/arch/x86_64/gdt.c
@@ -57,9 +57,7 @@ static segment_descriptor_t s_gdt[] = {
         .limit_0_15 = 0,
         .base_0_15 = 0,
         .base_16_23 = 0,
-        .type_flags = GDT_SEGMENT_TYPE_TSS_AVAIL |
-                      GDT_SEGMENT_FLAG_DPL(0) |
-                      GDT_SEGMENT_FLAG_P,
+        .type_flags = 0x89,
         .limit_16_19_avlx = 0,
         .base_24_31 = 0
     },
@@ -71,29 +69,25 @@ void
 gdt_setup(processor_t *processor)
 {
     size_t gdtw = GDT_ENTRY_COUNT * sizeof(segment_descriptor_t);
-    klogf("%X\n", gdtw);
     memcpy(processor->gdt, &s_gdt, gdtw);
 
-    processor->gdtr.base = (uintptr_t)&s_gdt;
+    processor->gdtr.base = (uintptr_t)&processor->gdt;
     processor->gdtr.length = gdtw - 1;
 
     segment_descriptor_t *tss_lo = &processor->gdt[GDT_ENTRY_TSS_LOW];
     segment_descriptor_t *tss_hi = &processor->gdt[GDT_ENTRY_TSS_HIGH];
 
     uintptr_t tssb = (uintptr_t)&processor->tss;
-    size_t tssl = sizeof(tss_t);
+    size_t tssl = sizeof(tss_t) - 1;
 
     tss_lo->limit_0_15 = tssl & 0xFF;
     tss_lo->base_0_15 = tssb & 0xFFFF;
     tss_lo->base_16_23 = (tssb >> 16) & 0xFF;
     tss_lo->base_24_31 = (tssb >> 24) & 0xFF;
-    tss_hi->limit_0_15 = (tssb >> 32) & 0xFFFF;
-    tss_hi->base_0_15 = (tssb >> 48) & 0xFFFF;
-
-    tss_lo->limit_16_19_avlx = (tssl >> 16) & 0xF;
+    *(uint32_t*)tss_hi = (tssb >> 32) & 0xFFFFFFFF;
 
     processor->tss.iopb = tssl;
-    
+
     extern void gdt_load(void*);
     gdt_load(&processor->gdtr);