HLE: Add PatchFixedFunctions() function

This commit is contained in:
Sepalani 2017-04-06 15:39:52 +01:00
parent 61b36d1f9a
commit 20a9c5b12d
3 changed files with 21 additions and 15 deletions

View File

@ -21,7 +21,6 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/GeckoCode.h"
#include "Core/HLE/HLE.h" #include "Core/HLE/HLE.h"
#include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/DVD/DVDInterface.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h" #include "Core/HW/EXI/EXI_DeviceIPL.h"
@ -479,19 +478,6 @@ bool CBoot::BootUp()
} }
} }
// HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code HLE::PatchFixedFunctions();
// handler
if (!SConfig::GetInstance().bEnableCheats)
{
HLE::Patch(0x80001800, "HBReload");
Memory::CopyToEmu(0x00001804, "STUBHAXX", 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(Gecko::ENTRY_POINT, "GeckoCodehandler");
// This has to always be installed even if cheats are not enabled because of the possiblity of
// loading a savestate where PC is inside the code handler while cheats are disabled.
HLE::Patch(Gecko::HLE_TRAMPOLINE_ADDRESS, "GeckoHandlerReturnTrampoline");
return true; return true;
} }

View File

@ -10,6 +10,7 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/GeckoCode.h"
#include "Core/HLE/HLE.h" #include "Core/HLE/HLE.h"
#include "Core/HLE/HLE_Misc.h" #include "Core/HLE/HLE_Misc.h"
#include "Core/HLE/HLE_OS.h" #include "Core/HLE/HLE_OS.h"
@ -88,6 +89,24 @@ void Patch(u32 addr, const char* hle_func_name)
} }
} }
void PatchFixedFunctions()
{
// HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code
// handler
if (!SConfig::GetInstance().bEnableCheats)
{
Patch(0x80001800, "HBReload");
Memory::CopyToEmu(0x00001804, "STUBHAXX", 8);
}
// Not part of the binary itself, but either we or Gecko OS might insert
// this, and it doesn't clear the icache properly.
Patch(Gecko::ENTRY_POINT, "GeckoCodehandler");
// This has to always be installed even if cheats are not enabled because of the possiblity of
// loading a savestate where PC is inside the code handler while cheats are disabled.
Patch(Gecko::HLE_TRAMPOLINE_ADDRESS, "GeckoHandlerReturnTrampoline");
}
void PatchFunctions() void PatchFunctions()
{ {
// Remove all hooks that aren't fixed address hooks // Remove all hooks that aren't fixed address hooks

View File

@ -24,6 +24,7 @@ enum HookFlag
HLE_TYPE_FIXED = 2, // An arbitrary hook mapped to a fixed address instead of a symbol HLE_TYPE_FIXED = 2, // An arbitrary hook mapped to a fixed address instead of a symbol
}; };
void PatchFixedFunctions();
void PatchFunctions(); void PatchFunctions();
void Clear(); void Clear();