diff --git a/.vscode/settings.json b/.vscode/settings.json index 87f2609..e99af7d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,6 @@ "**/*.d": true, }, - "C_Cpp.default.includePath": ["src/kernel/include"] + "C_Cpp.default.includePath": ["src/kernel/include"], + "C_Cpp.default.cStandard": "c2x", } \ No newline at end of file diff --git a/src/kernel/boot/kmain.c b/src/kernel/boot/kmain.c index 010ae1c..aee9a24 100644 --- a/src/kernel/boot/kmain.c +++ b/src/kernel/boot/kmain.c @@ -29,10 +29,6 @@ void kmain(uint64_t multiboot_magic, void *multiboot_data) debug_info("Boot complete\n"); - debug_info("Mallocing\n"); - void *a = malloc(100); - debug_info("Malloced %x\n", a); - PANIC("End of kernel function!"); debug_info("Broke out of panic"); diff --git a/src/kernel/boot/multiboot.c b/src/kernel/boot/multiboot.c index f2a05af..e781e18 100644 --- a/src/kernel/boot/multiboot.c +++ b/src/kernel/boot/multiboot.c @@ -109,7 +109,6 @@ int multiboot_page_used(uintptr_t page) within_page(kernel_boot_data.mmap, kernel_boot_data.mmap_size) || within_page(fb_start, fb_size) || 0) { - debug("Page %x used\n", page); return 1; } return 0; diff --git a/src/kernel/memory/memory.c b/src/kernel/memory/memory.c index 5e15ac4..b0c0eaa 100644 --- a/src/kernel/memory/memory.c +++ b/src/kernel/memory/memory.c @@ -4,7 +4,6 @@ #include #include - uint64_t kernel_P4; void memory_init() @@ -13,11 +12,8 @@ void memory_init() uint64_t start, end; uint32_t type, i = 0; - debug_info("Parsing memory map\n"); while(!multiboot_get_memory_area(i++, &start, &end, &type)) { - debug("0x%016x-0x%016x (%d)\n", start, end, type); - for(uint64_t p = start; p < end; p += PAGE_SIZE) { uint64_t vaddr = (uint64_t)P2V(p);