X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmboot.c;h=7403f387236ad246a2255041d5d6c85a8678b8a5;hb=8c23fb908ad7ad37472ed83e0753bdfbab19ae13;hp=897c9bbbb770218541b8c65d7d1e97c91d19c9b9;hpb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/arch/x86/mboot.c b/KernelLand/Kernel/arch/x86/mboot.c index 897c9bbb..7403f387 100644 --- a/KernelLand/Kernel/arch/x86/mboot.c +++ b/KernelLand/Kernel/arch/x86/mboot.c @@ -30,6 +30,7 @@ int Multiboot_LoadMemoryMap(tMBoot_Info *MBInfo, tVAddr MapOffset, tPMemMapEnt * if( !MM_GetPhysAddr(ent) ) Log_KernelPanic("MBoot", "MBoot Map entry %i addres bad (%p)", nPMemMapEnts, ent); + LOG("%llx+%llx", ent->Base, ent->Length); nent->Start = ent->Base; nent->Length = ent->Length; @@ -68,15 +69,18 @@ int Multiboot_LoadMemoryMap(tMBoot_Info *MBInfo, tVAddr MapOffset, tPMemMapEnt * } // Ensure it's valid + LOG("Validating"); nPMemMapEnts = PMemMap_ValidateMap(Map, nPMemMapEnts, MapSize); // TODO: Error handling // Replace kernel with PMEMTYPE_USED + LOG("Marking kernel"); nPMemMapEnts = PMemMap_MarkRangeUsed( Map, nPMemMapEnts, MapSize, KStart, KEnd - KStart ); + LOG("Dumping"); PMemMap_DumpBlocks(Map, nPMemMapEnts); // Check if boot modules were passed