archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-10 00:41:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Resolve merge conflicts

Browse source
This commit is contained in:
Chris Spegal 2023-08-19 22:26:23 -04:00
commit 739b33f733
124 changed files with 3751 additions and 1277 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Cafe/HW/MMU/MMU.cpp
View file

@ -159,7 +159,7 @@ void MMURange::mapMem()
void MMURange::unmapMem()
{
cemu_assert_debug(false);
MemMapper::FreeMemory(memory_base + baseAddress, size, true);
m_isMapped = false;
}
@ -252,6 +252,15 @@ void memory_mapForCurrentTitle()
}
}
void memory_unmapForCurrentTitle()
{
for (auto& itr : g_mmuRanges)
{
if (itr->isMapped() && !itr->isMappedEarly())
itr->unmapMem();
}
}
void memory_logModifiedMemoryRanges()
{
auto gfxPackMappings = GraphicPack2::GetActiveRAMMappings();