The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 15:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable FakeVMem in Wii mode.

Browse Source 
I'm assuming nobody thought of this when FakeVMem was turned on by
default; FakeVMem doesn't make any sense in Wii mode.
This commit is contained in:
magumagu 2015-03-08 17:33:17 -07:00
parent 4b7748f3c0
commit ff6ae8a677
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,16 +38,8 @@
namespace Memory namespace Memory
{ {
// (See comment below describing memory map.)
// =================================
// LOCAL SETTINGS
// ----------------
// Enable the Translation Lookaside Buffer functions.
bool bFakeVMEM = false; bool bFakeVMEM = false;
static bool bMMU = false;
// ==============
// ================================= // =================================
// Init() declarations // Init() declarations
@ -106,10 +98,10 @@ bool IsInitialized()
// Dolphin allocates memory to represent four regions: // Dolphin allocates memory to represent four regions:
// - 32MB RAM (actually 24MB on hardware), available on Gamecube and Wii // - 32MB RAM (actually 24MB on hardware), available on Gamecube and Wii
// - 64MB "EXRAM", RAM only available on Wii // - 64MB "EXRAM", RAM only available on Wii
// - 32MB FakeVMem, allocated when MMU support is turned off. This is used // - 32MB FakeVMem, allocated in GameCube mode when MMU support is turned off.
// to approximate the behavior of a common library which pages memory to // This is used to approximate the behavior of a common library which pages
// and from the DSP's dedicated RAM, which isn't directly addressable on // memory to and from the DSP's dedicated RAM. The DSP's RAM (ARAM) isn't
// GameCube. // directly addressable on GameCube.
// - 256KB Locked L1, to represent cache lines allocated out of the L1 data // - 256KB Locked L1, to represent cache lines allocated out of the L1 data
// cache in Locked L1 mode. Dolphin does not emulate this hardware feature // cache in Locked L1 mode. Dolphin does not emulate this hardware feature
// accurately; it just pretends there is extra memory at 0xE0000000. // accurately; it just pretends there is extra memory at 0xE0000000.
@ -176,11 +168,12 @@ static const int num_views = sizeof(views) / sizeof(MemoryView);
void Init() void Init()
{ {
bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU; bool bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
#ifndef _ARCH_32 #ifndef _ARCH_32
// The fake VMEM hack's address space is above the memory space that we allocate on 32bit targets // If MMU is turned off in GameCube mode, turn on fake VMEM hack.
// Disable it entirely on 32bit targets. // The fake VMEM hack's address space is above the memory space that we
bFakeVMEM = !bMMU; // allocate on 32bit targets, so disable it there.
bFakeVMEM = !wii && !bMMU;
#endif #endif
u32 flags = 0; u32 flags = 0;

2
Source/Core/Core/State.cpp
View File

@ -64,7 +64,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 41; static const u32 STATE_VERSION = 42; // Last changed in PR2193
enum enum
{ {