diff --git a/core/main.c b/core/main.c index 84b7ba3..d80cb44 100644 --- a/core/main.c +++ b/core/main.c @@ -86,11 +86,10 @@ void kmain(unsigned long magic, unsigned long addr) if (CHECK_FLAG(mbi->flags, 6)) { struct multiboot_mmap_entry *mmap = (struct multiboot_mmap_entry *)mbi->mmap_addr; uint size = mbi->mmap_length / sizeof(struct multiboot_mmap_entry); - printf("mmap buffer at %d size %d %d\n", mbi->mmap_addr, mbi->mmap_length, + pr_devel("mmap buffer at %d size %d %d\n", mbi->mmap_addr, mbi->mmap_length, sizeof(multiboot_memory_map_t)); for (uint i = 0; i < size; i++) { - printf("base_addr_high = 0x%x, base_addr_low = 0x%x, " - "length_high = 0x%x, length_low = 0x%x, type = 0x%x\n", + printf("base_addr 0x%x 0x%x, length = 0x%x 0x%x, type = 0x%x\n", (unsigned)(mmap[i].addr >> 32), (unsigned)(mmap[i].addr & 0xffffffff), (unsigned)(mmap[i].len >> 32), (unsigned)(mmap[i].len & 0xffffffff), (uint32_t)mmap[i].type); diff --git a/core/mem.c b/core/mem.c index 55fad47..cd8c32d 100644 --- a/core/mem.c +++ b/core/mem.c @@ -16,7 +16,8 @@ int memSetup(paddr_t upperMem, paddr_t *lastUsedOut) // Align upper mem (in kB) on page size even if it does loose a page upperMem = ALIGN_DOWN(upperMem, PAGE_SIZE / 1024); - printf("Available Mem from %d to %d \n", &__ld_kernel_end, upperMem * 1024); + printf("Available Mem from 0x%x to 0x%x: %dMB \n", &__ld_kernel_end, upperMem * 1024, + (upperMem * 1024 - (uint32_t)&__ld_kernel_end) / (1024*1024)); // Memory description is stored after the kernel. We need some place to store it unsigned long memdesc_end = (unsigned long)page_desc +