Add ability to print numbers in decimal

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

diff --git a/kernel/kernel.c b/kernel/kernel.c
index b274340cd2605ca7a905579cf06f0b32adbf8d99..16b2b404e9f009fbe4e0ed912612152c6b3aa3aa 100644 (file)
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -5,42 +5,47 @@
 #include <stdint.h>
 #include <mm/paging.h>
 
+struct abort_frame;
+struct interrupt_frame;
+struct fault_frame;
 extern void double_fault(struct abort_frame *frame);
 extern void keyb_handler(struct interrupt_frame *frame);
 extern void pf_handler(struct fault_frame *frame);
 static struct idt_descriptor idt[256] __attribute__((aligned(0x10)));
 static struct idtr idtr __attribute__((aligned(0x10)));
 
-static struct page_directory_entry page_dir[1024] __attribute__((aligned(0x1000)));
-static struct page_table_entry page_table[1024] __attribute__((aligned(0x1000)));
+struct e820_map {
+       uint64_t base;
+       uint64_t length;
+       uint32_t type;
+       uint32_t attrib;
+};
 
-void kmain(void)
+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);
+               kprintc('|', 0);
+               kprintq(mmap[i].length);
+               kprintc('|', 0);
+               kprintd(mmap[i].type);
+               kprintc('|', 0);
+               kprintd(mmap[i].attrib);
+               kprintc('|', 0);
+               kprintc('\n', 0);
+       }
+}
+
+void kmain(struct e820_map *mmap, int mmap_size)
 {
        screen_clear();
        kprint("Welcome to Nameless OS!\nRunning revision: ", 0);
        kprint(GIT_COMMIT, 0);
-       kprint("\nEnabling paging...\n", 0);
-       for (int i=0xb8; i < 0xc0; i++) {
-               page_table[i].p = 1;
-               page_table[i].rw = 0;
-               page_table[i].us = 0;
-               page_table[i].page_frame_addr = i;
-       }
-       for (int i=0x100; i < 0x102; i++) {
-               page_table[i].p = 1;
-               page_table[i].rw = 0;
-               page_table[i].us = 0;
-               page_table[i].page_frame_addr = i;
-       }
-       for (int i=0x102; i < 0x110; i++) {
-               page_table[i].p = 1;
-               page_table[i].rw = 1;
-               page_table[i].us = 0;
-               page_table[i].page_frame_addr = i;
-       }
-       page_dir[0].p = 1;
-       page_dir[0].page_table_addr = (int) &page_table >> 12;
-       enable_paging(page_dir);
+       kprint("\n", 0);
+       kprint("BIOS memory map:\n", 0);
+       print_e820(mmap, mmap_size);
        kprint("Preparing IDT...\n", 0);
        idt_set_descriptor(idt, 8, 0x8, (uint32_t) double_fault, IDT_INTERRUPT_GATE, 0x0);
        idt_set_descriptor(idt, 14, 0x8, (uint32_t) pf_handler, IDT_INTERRUPT_GATE, 0x0);
@@ -54,12 +59,9 @@ void kmain(void)
        pic_unmask(1);
        asm volatile ("sti");
        kprint("All done\n", 0);
-       struct idtr curr_idtr;
-       asm ("sidt %0": "=m" (curr_idtr));
-       kprintw(curr_idtr.limit);
-       kprintd(curr_idtr.base);
-       //kprint("Gonna force a double fault\n", 0);
-       //int test = 1/0;
-       //int test2 = *(int *) (0xa0000000);
+       kprintdec(12345);
+       kprintc('\n');
+       kprintdec(6789);
+       kprintc('\n');
        while(1);
 }