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

Memory: Fix double reset for FCRAM manager

Browse source 
Fix minor bug with permission tracking
This commit is contained in:
PSI-Rockin 2024-05-09 17:38:24 -04:00
parent 352799b1a7
commit 1161703ed6
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/kernel/fcram.cpp
View file

@ -7,6 +7,7 @@ void KFcram::Region::reset(u32 start, size_t size) {
freePages = pages; freePages = pages;
Block initialBlock(pages, 0); Block initialBlock(pages, 0);
blocks.clear();
blocks.push_back(initialBlock); blocks.push_back(initialBlock);
} }

3
src/core/kernel/kernel.cpp
View file

@ -140,9 +140,6 @@ void Kernel::reset() {
threadCount = 0; threadCount = 0;
aliveThreadCount = 0; aliveThreadCount = 0;
// TODO: These values should be derived from the memory type in an app's exheader
fcramManager.reset(Memory::FCRAM_SIZE, Memory::FCRAM_APPLICATION_SIZE, Memory::FCRAM_SYSTEM_SIZE, Memory::FCRAM_BASE_SIZE);
for (auto& t : threads) { for (auto& t : threads) {
t.status = ThreadStatus::Dead; t.status = ThreadStatus::Dead;
t.waitList.clear(); t.waitList.clear();

5
src/core/memory.cpp
View file

@ -306,6 +306,7 @@ void Memory::changeMemoryState(u32 vaddr, s32 pages, const Operation& op) {
// Now that the block has been found, fill it with the necessary info // Now that the block has been found, fill it with the necessary info
auto oldState = it->state; auto oldState = it->state;
u32 oldPerms = it->perms;
it->baseAddr = reqStart; it->baseAddr = reqStart;
it->pages = pages; it->pages = pages;
if (op.changePerms) it->perms = (op.r ? PERMISSION_R : 0) | (op.w ? PERMISSION_W : 0) | (op.x ? PERMISSION_X : 0); if (op.changePerms) it->perms = (op.r ? PERMISSION_R : 0) | (op.w ? PERMISSION_W : 0) | (op.x ? PERMISSION_X : 0);
@ -313,13 +314,13 @@ void Memory::changeMemoryState(u32 vaddr, s32 pages, const Operation& op) {
// If the requested memory region is smaller than the block found, the block must be split // If the requested memory region is smaller than the block found, the block must be split
if (blockStart < reqStart) { if (blockStart < reqStart) {
MemoryInfo startBlock(blockStart, (reqStart - blockStart) >> 12, 0, oldState); MemoryInfo startBlock(blockStart, (reqStart - blockStart) >> 12, oldPerms, oldState);
memoryInfo.insert(it, startBlock); memoryInfo.insert(it, startBlock);
} }
if (reqEnd < blockEnd) { if (reqEnd < blockEnd) {
auto itAfter = std::next(it); auto itAfter = std::next(it);
MemoryInfo endBlock(reqEnd, (blockEnd - reqEnd) >> 12, 0, oldState); MemoryInfo endBlock(reqEnd, (blockEnd - reqEnd) >> 12, oldPerms, oldState);
memoryInfo.insert(itAfter, endBlock); memoryInfo.insert(itAfter, endBlock);
} }