piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

HLE: Improve naming

Browse Source 
Replace 'function' with 'hook' when appropriate
This commit is contained in:
Sepalani
2020-08-28 20:29:05 +04:00
parent 17ad2ac719
commit 4c75b96254
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Core/HLE/HLE.cpp
View File

@ -21,19 +21,9 @@
namespace HLE
{
using HookFunction = void (*)();
// Map addresses to the HLE hook function id
// Map addresses to the HLE hook index
static std::map<u32, u32> s_hooked_addresses;
struct Hook
{
char name[128];
HookFunction function;
HookType type;
HookFlag flags;
};
// clang-format off
constexpr std::array<Hook, 23> os_patches{{
// Placeholder, os_patches[0] is the "non-existent function" index
@ -148,16 +138,16 @@ void Reload()
PatchFunctions();
}
void Execute(u32 current_pc, u32 instruction)
void Execute(u32 current_pc, u32 hook_index)
{
const unsigned int function_index = instruction & 0xFFFFF;
if (function_index > 0 && function_index < os_patches.size())
hook_index &= 0xFFFFF;
if (hook_index > 0 && hook_index < os_patches.size())
{
os_patches[function_index].function();
os_patches[hook_index].function();
}
else
{
PanicAlert("HLE system tried to call an undefined HLE function %i.", function_index);
PanicAlert("HLE system tried to call an undefined HLE function %i.", hook_index);
}
}
@ -178,12 +168,12 @@ u32 GetHookByFunctionAddress(u32 address)
return (symbol && symbol->address == address) ? index : 0;
}
HookType GetFunctionTypeByIndex(u32 index)
HookType GetHookTypeByIndex(u32 index)
{
return os_patches[index].type;
}
HookFlag GetFunctionFlagsByIndex(u32 index)
HookFlag GetHookFlagsByIndex(u32 index)
{
return os_patches[index].flags;
}