Remove some debug output
This commit is contained in:
parent
d707d222f1
commit
1edb0f47b0
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@ -10,5 +10,6 @@
|
|||||||
"**/*.d": true,
|
"**/*.d": true,
|
||||||
},
|
},
|
||||||
|
|
||||||
"C_Cpp.default.includePath": ["src/kernel/include"]
|
"C_Cpp.default.includePath": ["src/kernel/include"],
|
||||||
|
"C_Cpp.default.cStandard": "c2x",
|
||||||
}
|
}
|
@ -29,10 +29,6 @@ void kmain(uint64_t multiboot_magic, void *multiboot_data)
|
|||||||
|
|
||||||
debug_info("Boot complete\n");
|
debug_info("Boot complete\n");
|
||||||
|
|
||||||
debug_info("Mallocing\n");
|
|
||||||
void *a = malloc(100);
|
|
||||||
debug_info("Malloced %x\n", a);
|
|
||||||
|
|
||||||
PANIC("End of kernel function!");
|
PANIC("End of kernel function!");
|
||||||
|
|
||||||
debug_info("Broke out of panic");
|
debug_info("Broke out of panic");
|
||||||
|
@ -109,7 +109,6 @@ int multiboot_page_used(uintptr_t page)
|
|||||||
within_page(kernel_boot_data.mmap, kernel_boot_data.mmap_size) ||
|
within_page(kernel_boot_data.mmap, kernel_boot_data.mmap_size) ||
|
||||||
within_page(fb_start, fb_size) ||
|
within_page(fb_start, fb_size) ||
|
||||||
0) {
|
0) {
|
||||||
debug("Page %x used\n", page);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#include <multiboot.h>
|
#include <multiboot.h>
|
||||||
#include <musl-glue.h>
|
#include <musl-glue.h>
|
||||||
|
|
||||||
|
|
||||||
uint64_t kernel_P4;
|
uint64_t kernel_P4;
|
||||||
|
|
||||||
void memory_init()
|
void memory_init()
|
||||||
@ -13,11 +12,8 @@ void memory_init()
|
|||||||
|
|
||||||
uint64_t start, end;
|
uint64_t start, end;
|
||||||
uint32_t type, i = 0;
|
uint32_t type, i = 0;
|
||||||
debug_info("Parsing memory map\n");
|
|
||||||
while(!multiboot_get_memory_area(i++, &start, &end, &type))
|
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)
|
for(uint64_t p = start; p < end; p += PAGE_SIZE)
|
||||||
{
|
{
|
||||||
uint64_t vaddr = (uint64_t)P2V(p);
|
uint64_t vaddr = (uint64_t)P2V(p);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user