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 #11561 from AdmiralCurtiss/hle-execute-fix 

JIT: Fix calls to HLE::Execute.
This commit is contained in:
JosJuice 2023-02-13 12:09:36 +01:00 committed by GitHub
parent 1fc5d37fd2 e1dbea3658
commit 9d139ea84e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@
#include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/GeckoCode.h"
#include "Core/HLE/HLE_Misc.h"
#include "Core/HLE/HLE_OS.h"
@ -165,6 +166,13 @@ void Execute(const Core::CPUThreadGuard& guard, u32 current_pc, u32 hook_index)
}
}
void ExecuteFromJIT(u32 current_pc, u32 hook_index)
{
ASSERT(Core::IsCPUThread());
Core::CPUThreadGuard guard;
Execute(guard, current_pc, hook_index);
}
u32 GetHookByAddress(u32 address)
{
auto iter = s_hooked_addresses.find(address);

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

@ -48,6 +48,7 @@ void Patch(Core::System& system, u32 pc, std::string_view func_name);
u32 UnPatch(Core::System& system, std::string_view patch_name);
u32 UnpatchRange(Core::System& system, u32 start_addr, u32 end_addr);
void Execute(const Core::CPUThreadGuard& guard, u32 current_pc, u32 hook_index);
void ExecuteFromJIT(u32 current_pc, u32 hook_index);
// Returns the HLE hook index of the address
u32 GetHookByAddress(u32 address);

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

@ -483,7 +483,7 @@ void Jit64::HLEFunction(u32 hook_index)
gpr.Flush();
fpr.Flush();
ABI_PushRegistersAndAdjustStack({}, 0);
ABI_CallFunctionCC(HLE::Execute, js.compilerPC, hook_index);
ABI_CallFunctionCC(HLE::ExecuteFromJIT, js.compilerPC, hook_index);
ABI_PopRegistersAndAdjustStack({}, 0);
}

2
Source/Core/Core/PowerPC/JitArm64/Jit.cpp
View File

@ -254,7 +254,7 @@ void JitArm64::HLEFunction(u32 hook_index)
gpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
fpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
MOVP2R(ARM64Reg::X8, &HLE::Execute);
MOVP2R(ARM64Reg::X8, &HLE::ExecuteFromJIT);
MOVI2R(ARM64Reg::W0, js.compilerPC);
MOVI2R(ARM64Reg::W1, hook_index);
BLR(ARM64Reg::X8);