From e92e1e58738ff7f6967dd88d180e20f33c0e8df8 Mon Sep 17 00:00:00 2001 From: magumagu Date: Thu, 15 Jan 2015 11:54:20 -0800 Subject: [PATCH] Remove HLE_HOOK_END. It isn't used, it isn't implemented in interpreter, and the implementation in JIT is wrong. --- Source/Core/Core/HLE/HLE.h | 5 ++--- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 15 --------------- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 14 -------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/Source/Core/Core/HLE/HLE.h b/Source/Core/Core/HLE/HLE.h index e44a0ee054..8a78507996 100644 --- a/Source/Core/Core/HLE/HLE.h +++ b/Source/Core/Core/HLE/HLE.h @@ -13,9 +13,8 @@ namespace HLE enum { 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 = 2, // Replace the function with the HLE version - HLE_HOOK_NONE = 3, // Do not hook the function + HLE_HOOK_REPLACE = 1, // Replace the function with the HLE version + HLE_HOOK_NONE = 2, // Do not hook the function }; enum diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index dc992a0129..4e2824515f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -851,21 +851,6 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc 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) { gpr.Flush(); diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index 49863e0104..d762d9e7c1 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -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 WriteCode(nextPC);