Changeset 292 for trunk/hal

Timestamp:

Jul 31, 2017, 10:16:33 AM (7 years ago)

Author:

max@…

Message:

Use different stacks for NMIs and Double Faults.

File:

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

trunk/hal/x86_64/core/hal_init.c

@@ -555 +555 @@
         struct idt_seg *idt;
         size_t i;
+        int ist;
 
         memset(&idt_bitmap, 0, sizeof(idt_bitmap));
@@ -567 +568 @@
         /* General exceptions */
         for (i = CPUVEC_MIN; i < CPUVEC_MAX; i++) {
+                if (i == 2) { /* NMI */
+                        ist = 3;
+                } else if (i == 8) { /* Double Fault */
+                        ist = 2;
+                } else {
+                        ist = 0;
+                }
                 idt_set_seg(&idt[i], (void *)x86_traps[i - CPUVEC_MIN], 0,
                     SDT_SYS386IGT, SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
+
                 idt_bitmap.busy[i] = true;
         }