Small changes to double fault handler

[nameless-os.git] / kernel / kernel.c

diff --git a/kernel/kernel.c b/kernel/kernel.c
index 5a6a82d1d75b816e9efdee7eb3c7d3e151d4bdcf..adfdd3f58021c698a9cba474d7870680e5dbf696 100644 (file)
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -5,6 +5,7 @@
 #include <irq/i8259a.h>
 #include <stdint.h>
 #include <mm/paging.h>
+#include <panic.h>
 
 struct idt_descriptor idt[256] __attribute__((aligned(0x10)));
 struct idtr idtr __attribute__((aligned(0x10)));
@@ -34,6 +35,43 @@ void print_e820(struct e820_map *mmap, int mmap_size)
        }
 }
 
+/* Small handler for double faults. Will be put elsewhere eventually. */
+int double_fault_handler(struct interrupt_frame *frame)
+{
+       kprint("Double fault occurred!\n", VGA_COLOR_BRIGHT_RED);
+       kprint("EAX: ", 0);
+       kprintd(frame->eax);
+       kprintc(' ', 0);
+       kprint("EBX: ", 0);
+       kprintd(frame->ebx);
+       kprintc(' ', 0);
+       kprint("ECX: ", 0);
+       kprintd(frame->ecx);
+       kprintc(' ', 0);
+       kprint("EDX: ", 0);
+       kprintd(frame->edx);
+       kprintc('\n', 0);
+       kprint("EBP: ", 0);
+       kprintd(frame->ebp);
+       kprintc(' ', 0);
+       kprint("ESP: ", 0);
+       kprintd(frame->esp);
+       kprintc('\n', 0);
+       kprint("ESI: ", 0);
+       kprintd(frame->esi);
+       kprintc(' ', 0);
+       kprint("EDI: ", 0);
+       kprintd(frame->edi);
+       kprintc('\n', 0);
+       kprint("EIP: ", 0);
+       kprintd(frame->eip);
+       kprintc(' ', 0);
+       kprint("EFLAGS: ", 0);
+       kprintd(frame->eflags);
+       kprintc('\n', 0);
+       PANIC("double fault");
+}
+
 void kmain(struct e820_map *mmap, int mmap_size)
 {
        screen_clear();
@@ -50,6 +88,7 @@ void kmain(struct e820_map *mmap, int mmap_size)
        populate_idtr(&idtr, idt);
        load_idt(idtr);
        kprint("Setting up interrupts...\n", 0);
+       register_interrupt(8, &double_fault_handler);
        pic_init(0x20, 0x28);
        pic_mask_all();
        asm volatile ("sti");