Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-06-08 12:01:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

RO: Unmap CROs when unloaded

Browse source 
Thanks @noumidev
This commit is contained in:
PSI-Rockin 2024-05-10 21:23:18 -04:00
parent 6c4c20fe3e
commit 546be9b6f9
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/services/ldr_ro.cpp
View file

@ -22,6 +22,7 @@ namespace CROHeader {
NameOffset = 0x084, NameOffset = 0x084,
NextCRO = 0x088, NextCRO = 0x088,
PrevCRO = 0x08C, PrevCRO = 0x08C,
FileSize = 0x090,
OnUnresolved = 0x0AC, OnUnresolved = 0x0AC,
CodeOffset = 0x0B0, CodeOffset = 0x0B0,
DataOffset = 0x0B8, DataOffset = 0x0B8,
@ -177,6 +178,10 @@ public:
mem.write32(croPointer + CROHeader::PrevCRO, prevCRO); mem.write32(croPointer + CROHeader::PrevCRO, prevCRO);
} }
u32 getSize() {
return mem.read32(croPointer + CROHeader::FileSize);
}
void write32(u32 addr, u32 value) { void write32(u32 addr, u32 value) {
// Note: some games export symbols to the static module, which doesn't contain any segments. // Note: some games export symbols to the static module, which doesn't contain any segments.
// Instead, its segments point to ROM segments. We need this special write handler for writes to .text, which // Instead, its segments point to ROM segments. We need this special write handler for writes to .text, which
@ -1400,7 +1405,12 @@ void LDRService::unloadCRO(u32 messagePointer) {
Helpers::panic("Failed to unrebase CRO"); Helpers::panic("Failed to unrebase CRO");
} }
// TODO: unmap the CRO from the pagetable u32 size = cro.getSize();
bool succeeded = mem.mapVirtualMemory(mapVaddr, croPointer, size >> 12, false, false, false,
MemoryState::Locked, MemoryState::AliasCode, MemoryState::Free, MemoryState::Private);
if (!succeeded) {
Helpers::panic("Failed to unmap CRO");
}
kernel.clearInstructionCache(); kernel.clearInstructionCache();