mirrors/Panda3DS
0
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-08-30 14:17:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More memory fixes

Browse source
This commit is contained in:
wheremyfoodat 2025-08-06 00:05:05 +03:00
commit d26235cf8b
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/memory.hpp
View file

@ -186,6 +186,8 @@ class Memory {
// perms |= Common::MemoryPermission::Execute; // perms |= Common::MemoryPermission::Execute;
} }
// If anything is mapped at the place we're trying to map, unmap it. Then, create our mapping.
arena->Unmap(guestVaddr, size, false);
arena->Map(guestVaddr, arenaOffset, size, perms, false); arena->Map(guestVaddr, arenaOffset, size, perms, false);
} }
} }

2
src/core/loader/ncsd.cpp
View file

@ -40,7 +40,7 @@ bool Memory::mapCXI(NCSD& ncsd, NCCH& cxi) {
// Total memory to allocate for loading // Total memory to allocate for loading
u32 totalSize = (cxi.text.pageCount + cxi.rodata.pageCount + cxi.data.pageCount) * pageSize + bssSize; u32 totalSize = (cxi.text.pageCount + cxi.rodata.pageCount + cxi.data.pageCount) * pageSize + bssSize;
if (code.size() < totalSize) { if (code.size() + bssSize < totalSize) {
Helpers::panic("Total code size as reported by the exheader is larger than the .code file"); Helpers::panic("Total code size as reported by the exheader is larger than the .code file");
return false; return false;
} }