ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1085 from ergo720/contiguous_clean 

Clean memory.bin during boot and quick reboots
This commit is contained in:
Luke Usher 2018-04-22 18:28:41 +01:00 committed by GitHub
parent cbf68f1470 42873e36f0
commit ae9181903c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CxbxKrnl/VMManager.cpp
View File

@ -136,6 +136,11 @@ dashboard from non-retail xbe?");
// Set up the pfn database // Set up the pfn database
if ((QuickReboot & BOOT_QUICK_REBOOT) == 0) { if ((QuickReboot & BOOT_QUICK_REBOOT) == 0) {
// Quote from LukeUsher "Yeah, known issue. Contiguous memory persists more than it should so the framebuffer doesn't get cleared.
// The memory manager needs updating to only persist areas of memory marked with MmPersistContiguousMemory and discard the rest.
// But right now it persists the whole block". So we also clear the entire mapped memory.bin since we are not quick rebooting
xboxkrnl::RtlFillMemoryUlong((void*)CONTIGUOUS_MEMORY_BASE, g_SystemMaxMemory, 0);
xboxkrnl::RtlFillMemoryUlong((void*)PAGE_TABLES_BASE, PAGE_TABLES_SIZE, 0); xboxkrnl::RtlFillMemoryUlong((void*)PAGE_TABLES_BASE, PAGE_TABLES_SIZE, 0);
InitializePfnDatabase(); InitializePfnDatabase();
} }
@ -685,6 +690,9 @@ void VMManager::RestorePersistentMemory()
RemoveFree(1, &pfn, 0, PointerPte->Hardware.PFN, PointerPte->Hardware.PFN); RemoveFree(1, &pfn, 0, PointerPte->Hardware.PFN, PointerPte->Hardware.PFN);
} }
else { else {
// Clear also the page. We could use RtlFillMemoryULong, but that will fill up the kernel log quite quickly, so we just
// use memset instead
memset((void*)(GetVAddrMappedByPte(PointerPte)), 0, PAGE_SIZE);
WRITE_ZERO_PTE(PointerPte); WRITE_ZERO_PTE(PointerPte);
} }
PointerPte++; PointerPte++;