Changeset 80 for trunk/hal/x86_64/core/hal_init.c

Timestamp:

Jun 27, 2017, 5:24:02 PM (7 years ago)

Author:

max@…

Message:

add the timer vector, for now it double-faults

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_init.c

@@ -184 +184 @@
         kernel_init(&btinfo);
         x86_printf("[+] kernel_init called\n");
+
+
+        sti();
+        while (1);
 
         int m = 0;
@@ -288 +292 @@
 static void idt_create()
 {
-        extern uint64_t x86_traps[], x86_intrs[];
+        extern uint64_t x86_traps[], x86_intrs[], x86_rsvd;
         struct idt_seg *idt;
         size_t i;
 
         idt = (struct idt_seg *)&idtstore;
+
+        /* First, put a dead entry */
+        for (i = 0; i < NIDT; i++) {
+                idt_set_seg(&idt[i], (void *)&x86_rsvd, 0,
+                    SDT_SYS386IGT, SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
+        }
 
         /* General exceptions */