From a4e5f4785c6dcaec58e46be41415f6464d28f799 Mon Sep 17 00:00:00 2001 From: EnderIce2 Date: Mon, 7 Apr 2025 05:37:45 +0000 Subject: [PATCH] refactor(kernel): clean up KPrint formatting and fix memory reporting --- Kernel/kernel.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Kernel/kernel.cpp b/Kernel/kernel.cpp index 07dbe9bd..cfd4830b 100644 --- a/Kernel/kernel.cpp +++ b/Kernel/kernel.cpp @@ -191,19 +191,14 @@ EXTERNC NIF cold void Main() KPrint("COM8 is present."); KPrint("Display: %dx%d %d bpp R:%d %d G:%d %d B:%d %d", - Display->GetFramebufferStruct().Width, - Display->GetFramebufferStruct().Height, + Display->GetFramebufferStruct().Width, Display->GetFramebufferStruct().Height, Display->GetFramebufferStruct().BitsPerPixel, - Display->GetFramebufferStruct().RedMaskSize, - Display->GetFramebufferStruct().RedMaskShift, - Display->GetFramebufferStruct().GreenMaskSize, - Display->GetFramebufferStruct().GreenMaskShift, - Display->GetFramebufferStruct().BlueMaskSize, - Display->GetFramebufferStruct().BlueMaskShift); + Display->GetFramebufferStruct().RedMaskSize, Display->GetFramebufferStruct().RedMaskShift, + Display->GetFramebufferStruct().GreenMaskSize, Display->GetFramebufferStruct().GreenMaskShift, + Display->GetFramebufferStruct().BlueMaskSize, Display->GetFramebufferStruct().BlueMaskShift); - KPrint("%lld MiB / %lld MiB (%lld MiB reserved)", - TO_MiB(KernelAllocator.GetUsedMemory()), - TO_MiB(KernelAllocator.GetTotalMemory()), + KPrint("%lld MiB / %lld MiB (%lld MiB reserved)", TO_MiB(KernelAllocator.GetUsedMemory()), + TO_MiB(KernelAllocator.GetTotalMemory() - KernelAllocator.GetReservedMemory()), TO_MiB(KernelAllocator.GetReservedMemory())); #endif @@ -219,8 +214,7 @@ EXTERNC NIF cold void Main() Interrupts::Initialize(0); KPrint("Loading Kernel Symbols"); - KernelSymbolTable = - new SymbolResolver::Symbols((uintptr_t)bInfo.Kernel.FileBase); + KernelSymbolTable = new SymbolResolver::Symbols((uintptr_t)bInfo.Kernel.FileBase); if (!KernelSymbolTable->SymTableExists) KernelSymbolTable->AddSymbolInfoFromGRUB(bInfo.Kernel.Symbols.Num,