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 #1889 from magumagu/remove-hle-end 

Remove HLE_HOOK_END.
This commit is contained in:
Ryan Houdek 2015-01-19 18:16:47 -06:00
parent 0d0f7ec662 e92e1e5873
commit 38cb9bbfae
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/HLE/HLE.h
View File

@ -13,9 +13,8 @@ namespace HLE
enum enum
{ {
HLE_HOOK_START = 0, // Hook the beginning of the function and execute the function afterwards HLE_HOOK_START = 0, // Hook the beginning of the function and execute the function afterwards
HLE_HOOK_END = 1, // Hook the end of the function, executing the function first before the hook HLE_HOOK_REPLACE = 1, // Replace the function with the HLE version
HLE_HOOK_REPLACE = 2, // Replace the function with the HLE version HLE_HOOK_NONE = 2, // Do not hook the function
HLE_HOOK_NONE = 3, // Do not hook the function
}; };
enum enum

15
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -851,21 +851,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.skipInstructions = 0; js.skipInstructions = 0;
} }
u32 function = HLE::GetFunctionIndex(js.blockStart);
if (function != 0)
{
int type = HLE::GetFunctionTypeByIndex(function);
if (type == HLE::HLE_HOOK_END)
{
int flags = HLE::GetFunctionFlagsByIndex(function);
if (HLE::IsEnabled(flags))
{
HLEFunction(function);
}
}
}
if (code_block.m_broken) if (code_block.m_broken)
{ {
gpr.Flush(); gpr.Flush();

14
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -668,20 +668,6 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
} }
} }
u32 function = HLE::GetFunctionIndex(jit->js.blockStart);
if (function != 0)
{
int type = HLE::GetFunctionTypeByIndex(function);
if (type == HLE::HLE_HOOK_END)
{
int flags = HLE::GetFunctionFlagsByIndex(function);
if (HLE::IsEnabled(flags))
{
HLEFunction(function);
}
}
}
// Perform actual code generation // Perform actual code generation
WriteCode(nextPC); WriteCode(nextPC);