Added paging and fixed several bugs

1 files changed, 8 insertions, 5 deletions

diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 383966d..013f7d5 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -4,26 +4,29 @@
 #include "interrupts/interrupts.h"
 #include "input/input.h"
 #include "timer/timer.h"
+#include "paging/paging.h"
+#include "paging/kheap.h"
 
 void init() {
     gdt_install();
     idt_install();
     isrs_install();
     irq_install();
-    asm volatile ("sti");
+    init_kheap();
+    page_init();
     timer_install();
-    terminal_initialize();
+    // terminal_initialize();
     keyboard_install();
     // mouse_install();
+    asm volatile ("sti");
 }
 
 void kernel_main(void) {
     // vbe_set_mode(0x11B);
-    // set_optimal_resolution();
+    set_optimal_resolution();
     init();
-    keyboard_install();
 
-    terminal_write_string("Melvix loaded successfully!\n");
+    // terminal_write_string("Melvix loaded successfully!\n");
 
     // __asm__  ("div %0" :: "r"(0)); // Exception testing x/0
     for (;;);