From d43a3388a976a74ae109c5b8b5a31f82a16b45db Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Sat, 26 Nov 2022 00:22:10 +0100 Subject: fixing issues 1) main.c: order of init (multiboot.c must be after heap & paging because it uses heap to allocate pages for framebuffer) 2) paging.c: zeroing new pages allocated via heap 3) multiboot2.c: invalid pointer arithmetic 4) libk/string.c: check for null pointers in memcpy 5) paging: only page_lvl2 should have FLAG_HUGE 6) keyboard.c: kfree(print_buff) --- kernel/src/main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'kernel/src/main.c') diff --git a/kernel/src/main.c b/kernel/src/main.c index 7424f56..ae2e0ee 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -20,16 +21,18 @@ int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic); int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic) { init_serial(); +// serial is enabled from this point init_gdt(); init_paging(); - init_timer(TICKS_PER_SECOND); - init_idt(); init_heap(); - init_tss(); read_mb2(multiboot_bootinfo, multiboot_magic); +// framebuffer is enabled from this point + init_timer(TICKS_PER_SECOND); + init_idt(); disc_init(); ext2_init(); ls(path_to_inode("/")); + init_tss(); jump_userspace(); for(;;) { -- cgit v1.2.3