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

Merge pull request #1356 from Sonicadvance1/fix-32bit 

Disable the fake vmem hack on 32bit targets.
This commit is contained in:
skidau 2014-10-22 00:02:51 +11:00
parent 080883ad9e a22fcf152d
commit ec1d6c4de5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/Memmap.cpp
View File

@ -143,7 +143,11 @@ void Init()
{ {
bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU; bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
#ifndef _ARCH_32
// The fake VMEM hack's address space is above the memory space that we allocate on 32bit targets
// Disable it entirely on 32bit targets.
bFakeVMEM = !bMMU; bFakeVMEM = !bMMU;
#endif
u32 flags = 0; u32 flags = 0;
if (wii) flags |= MV_WII_ONLY; if (wii) flags |= MV_WII_ONLY;