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

Fix placement of HLE::Patch to not get overwritten by HLE::PatchFunctions. 

(This applies to the existing HBReload hook, which would be erased in
various circumstances depending on the type of file loaded.)
This commit is contained in:
comex 2013-09-12 00:03:37 -04:00
parent a316e2f182
commit e6cd3b3283
1 changed files with 13 additions and 12 deletions
Source/Core/Core/Src/Boot
Boot.cpp

25
Source/Core/Core/Src/Boot/Boot.cpp
View File

@ -184,18 +184,6 @@ bool CBoot::BootUp()
NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str()); NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str());
// HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code handler
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
{
HLE::Patch(0x80001800, "HBReload");
const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' };
Memory::WriteBigEData(stubstr, 0x80001804, 8);
}
// Not part of the binary itself, but either we or Gecko OS might insert
// this, and it doesn't clear the icache properly.
HLE::Patch(0x800018a8, "GeckoCodehandler");
g_symbolDB.Clear(); g_symbolDB.Clear();
VideoInterface::Preset(_StartupPara.bNTSC); VideoInterface::Preset(_StartupPara.bNTSC);
switch (_StartupPara.m_BootType) switch (_StartupPara.m_BootType)
@ -419,6 +407,19 @@ bool CBoot::BootUp()
return false; return false;
} }
} }
// HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code handler
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
{
HLE::Patch(0x80001800, "HBReload");
const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' };
Memory::WriteBigEData(stubstr, 0x80001804, 8);
}
// Not part of the binary itself, but either we or Gecko OS might insert
// this, and it doesn't clear the icache properly.
HLE::Patch(0x800018a8, "GeckoCodehandler");
Host_UpdateLogDisplay(); Host_UpdateLogDisplay();
return true; return true;
} }