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

Code formatting
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2022-12-13 22:37:47 +01:00
parent b2b6cd7e0f
commit 8b9c6780d5
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xtldr/i686/memory.c
View File

@ -142,7 +142,7 @@ BlEnablePaging(IN PLIST_ENTRY MemoryMappings,
} }
/* Set virtual address based on new PDPT address mapped to KSEG0 base */ /* Set virtual address based on new PDPT address mapped to KSEG0 base */
VirtualAddress = (void*)(UINT_PTR)(PDPTAddress + EFI_PAGE_SIZE + KSEG0_BASE); VirtualAddress = (PVOID)(UINT_PTR)(PDPTAddress + EFI_PAGE_SIZE + KSEG0_BASE);
/* Set base page frame number */ /* Set base page frame number */
Address = 0x100000; // MEM_TOP_DOWN ? Address = 0x100000; // MEM_TOP_DOWN ?
@ -314,8 +314,8 @@ BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
{ {
/* Find Page Directory and calculate indices from a virtual address */ /* Find Page Directory and calculate indices from a virtual address */
PageDirectory = (HARDWARE_PTE_PAE*)(((PHARDWARE_PTE_PAE)(*PtePointer))[VirtualAddress >> 30].PageFrameNumber * EFI_PAGE_SIZE); PageDirectory = (HARDWARE_PTE_PAE*)(((PHARDWARE_PTE_PAE)(*PtePointer))[VirtualAddress >> 30].PageFrameNumber * EFI_PAGE_SIZE);
PdIndex = (VirtualAddress >> 21) & 0x1ff; PdIndex = (VirtualAddress >> 21) & 0x1FF;
PtIndex = (VirtualAddress & 0x1ff000) >> 12; PtIndex = (VirtualAddress & 0x1FF000) >> 12;
/* Validate Page Directory */ /* Validate Page Directory */
if(!PageDirectory[PdIndex].Valid) { if(!PageDirectory[PdIndex].Valid) {
@ -363,7 +363,7 @@ BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
{ {
/* Calculate indices from a virtual address */ /* Calculate indices from a virtual address */
PdIndex = VirtualAddress >> 22; PdIndex = VirtualAddress >> 22;
PtIndex = (VirtualAddress & 0x3ff000) >> 12; PtIndex = (VirtualAddress & 0x3FF000) >> 12;
/* Validate Page Table */ /* Validate Page Table */
if(!((PHARDWARE_PTE)(*PtePointer))[PdIndex].Valid) if(!((PHARDWARE_PTE)(*PtePointer))[PdIndex].Valid)
@ -376,7 +376,7 @@ BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
} }
/* Fill allocated memory with zeros */ /* Fill allocated memory with zeros */
RtlZeroMemory((void*)(UINT_PTR)Address, EFI_PAGE_SIZE); RtlZeroMemory((PVOID)(UINT_PTR)Address, EFI_PAGE_SIZE);
/* Set paging entry settings */ /* Set paging entry settings */
((PHARDWARE_PTE)(*PtePointer))[PdIndex].PageFrameNumber = Address / EFI_PAGE_SIZE; ((PHARDWARE_PTE)(*PtePointer))[PdIndex].PageFrameNumber = Address / EFI_PAGE_SIZE;