xt-sys/exectos
3
5
Fork 2
Code Issues 8 Pull Requests 2 Actions Projects 1 Releases Wiki Activity

Eliminate unnecessary page map commits
All checks were successful
Builds / ExectOS (amd64, debug) (push) Successful in 29s
Details
Builds / ExectOS (i686, release) (push) Successful in 37s
Details
Builds / ExectOS (i686, debug) (push) Successful in 28s
Details
Builds / ExectOS (amd64, release) (push) Successful in 39s
Details

Browse Source
This commit is contained in:
Aiken Harris
2026-03-13 14:09:45 +01:00
parent c71d58b737
commit 368c8ee5b2
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
boot/xtldr/modules/xtos_o/xtos.cc
View File

@@ -480,7 +480,7 @@ Xtos::InitializeLoaderBlock(IN PXTBL_PAGE_MAPPING PageMap,
XtLdrProtocol->Memory.CopyMemory((PVOID)((UINT_PTR)LoaderBlock + sizeof(KERNEL_INITIALIZATION_BLOCK)), XtLdrProtocol->Memory.CopyMemory((PVOID)((UINT_PTR)LoaderBlock + sizeof(KERNEL_INITIALIZATION_BLOCK)),
Parameters->Parameters, ParametersSize); Parameters->Parameters, ParametersSize);
/* HACK: Commit page map to avoid memory leaks (AGAIN!) */ /* Commit mappings */
XtLdrProtocol->Memory.CommitPageMap(PageMap); XtLdrProtocol->Memory.CommitPageMap(PageMap);
/* Initialize system resources list */ /* Initialize system resources list */
@@ -725,14 +725,6 @@ Xtos::RunBootSequence(IN PEFI_FILE_HANDLE BootDir,
return Status; return Status;
} }
/* Commit mappings */
Status = XtLdrProtocol->Memory.CommitPageMap(&PageMap);
if(Status != STATUS_EFI_SUCCESS)
{
XtLdrProtocol->Debug.Print(L"Failed to commit hardware mappings (Pass 1)\n");
return Status;
}
/* Store virtual address of kernel initialization block for future kernel call */ /* Store virtual address of kernel initialization block for future kernel call */
KernelParameters = (PKERNEL_INITIALIZATION_BLOCK)VirtualAddress; KernelParameters = (PKERNEL_INITIALIZATION_BLOCK)VirtualAddress;
@@ -745,15 +737,6 @@ Xtos::RunBootSequence(IN PEFI_FILE_HANDLE BootDir,
return Status; return Status;
} }
/* HACK: Commit mappings again to include the kernel initialization block */
Status = XtLdrProtocol->Memory.CommitPageMap(&PageMap);
if(Status != STATUS_EFI_SUCCESS)
{
/* Failed to build page map */
XtLdrProtocol->Debug.Print(L"Failed to build page map (Status code: %zX)\n", Status);
return Status;
}
/* Get kernel entry point */ /* Get kernel entry point */
PeCoffProtocol->GetEntryPoint(ImageContext, (PVOID*)&KernelEntryPoint); PeCoffProtocol->GetEntryPoint(ImageContext, (PVOID*)&KernelEntryPoint);