kernel: tty: Use recursion in byte/word printing

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

diff --git a/kernel/kernel.c b/kernel/kernel.c
index 5a6a82d1d75b816e9efdee7eb3c7d3e151d4bdcf..cd3e228a0867ddf370fdabd48acdd6c9af223cf8 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)));
@@ -22,18 +23,55 @@ void print_e820(struct e820_map *mmap, int mmap_size)
        kprint("       Base       |      Length      |   Type   |  Attrib  |\n", 0);
        kprint("------------------------------------------------------------\n", 0);
        for (int i=0; i<mmap_size; i++) {
-               kprintq(mmap[i].base);
+               kprintq(mmap[i].base, 1);
                kprintc('|', 0);
-               kprintq(mmap[i].length);
+               kprintq(mmap[i].length, 1);
                kprintc('|', 0);
-               kprintd(mmap[i].type);
+               kprintd(mmap[i].type, 1);
                kprintc('|', 0);
-               kprintd(mmap[i].attrib);
+               kprintd(mmap[i].attrib, 1);
                kprintc('|', 0);
                kprintc('\n', 0);
        }
 }
 
+/* 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, 1);
+       kprintc(' ', 0);
+       kprint("EBX: ", 0);
+       kprintd(frame->ebx, 1);
+       kprintc(' ', 0);
+       kprint("ECX: ", 0);
+       kprintd(frame->ecx, 1);
+       kprintc(' ', 0);
+       kprint("EDX: ", 0);
+       kprintd(frame->edx, 1);
+       kprintc('\n', 0);
+       kprint("EBP: ", 0);
+       kprintd(frame->ebp, 1);
+       kprintc(' ', 0);
+       kprint("ESP: ", 0);
+       kprintd(frame->esp, 1);
+       kprintc('\n', 0);
+       kprint("ESI: ", 0);
+       kprintd(frame->esi, 1);
+       kprintc(' ', 0);
+       kprint("EDI: ", 0);
+       kprintd(frame->edi, 1);
+       kprintc('\n', 0);
+       kprint("EIP: ", 0);
+       kprintd(frame->eip, 1);
+       kprintc(' ', 0);
+       kprint("EFLAGS: ", 0);
+       kprintd(frame->eflags, 1);
+       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");