Changeset 45 for trunk/hal/x86_64/hal_init.c

Timestamp:

Jun 23, 2017, 11:55:08 AM (7 years ago)

Author:

max@…

Message:

Add some code for LAPIC; far from complete, but a good start.

File:

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

trunk/hal/x86_64/hal_init.c

@@ -24 +24 @@
 #include <hal_multiboot.h>
 #include <hal_segmentation.h>
+#include <hal_acpi.h>
+#include <hal_lapic.h>
 #include <hal_internal.h>
 
@@ -98 +100 @@
         hal_acpi_init();
         x86_printf("[+] hal_acpi_init called\n");
+
+        hal_gpt_bootstrap_reset();
+        x86_printf("[+] hal_gpt_bootstrap_reset called\n");
+
+        hal_init_lapic();
+        x86_printf("[+] hal_init_lapic called\n");
 
         x86_printf("-> mytest = %z\n", mytest);
@@ -207 +215 @@
 static void idt_create()
 {
-        extern uint64_t x86_traps[];
+        extern uint64_t x86_traps[], x86_intrs[];
         struct idt_seg *idt;
         size_t i;
 
         idt = (struct idt_seg *)&idtstore;
-        for (i = 0; i < NCPUIDT; i++) {
-                idt_set_seg(&idt[i], (void *)x86_traps[i], 0, SDT_SYS386IGT,
-                    SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
+
+        /* General exceptions */
+        for (i = CPUVEC_MIN; i < CPUVEC_MAX; i++) {
+                idt_set_seg(&idt[i], (void *)x86_traps[i - CPUVEC_MIN], 0,
+                    SDT_SYS386IGT, SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
         }
+
+        /* LAPIC interrupts */
+        for (i = LAPICVEC_MIN; i < LAPICVEC_MAX; i++) {
+                idt_set_seg(&idt[i], (void *)x86_intrs[i - LAPICVEC_MIN], 0,
+                    SDT_SYS386IGT, SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
+        }
+
 }