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 #12442 from lioncash/hle 

Core/HLE/HLE: Remove global system accessors
This commit is contained in:
Tilka 2023-12-20 12:41:09 +00:00 committed by GitHub
parent acd76918d7 c0b7e9cd94
commit 01340d7f8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,10 +166,10 @@ void Execute(const Core::CPUThreadGuard& guard, u32 current_pc, u32 hook_index)
}
}
void ExecuteFromJIT(u32 current_pc, u32 hook_index)
void ExecuteFromJIT(u32 current_pc, u32 hook_index, Core::System& system)
{
ASSERT(Core::IsCPUThread());
Core::CPUThreadGuard guard(Core::System::GetInstance());
Core::CPUThreadGuard guard(system);
Execute(guard, current_pc, hook_index);
}
@ -200,7 +200,7 @@ HookFlag GetHookFlagsByIndex(u32 index)
return os_patches[index].flags;
}
TryReplaceFunctionResult TryReplaceFunction(u32 address)
TryReplaceFunctionResult TryReplaceFunction(u32 address, PowerPC::CoreMode mode)
{
const u32 hook_index = GetHookByFunctionAddress(address);
if (hook_index == 0)
@ -211,16 +211,16 @@ TryReplaceFunctionResult TryReplaceFunction(u32 address)
return {};
const HookFlag flags = GetHookFlagsByIndex(hook_index);
if (!IsEnabled(flags))
if (!IsEnabled(flags, mode))
return {};
return {type, hook_index};
}
bool IsEnabled(HookFlag flag)
bool IsEnabled(HookFlag flag, PowerPC::CoreMode mode)
{
return flag != HLE::HookFlag::Debug || Config::IsDebuggingEnabled() ||
Core::System::GetInstance().GetPowerPC().GetMode() == PowerPC::CoreMode::Interpreter;
mode == PowerPC::CoreMode::Interpreter;
}
u32 UnPatch(Core::System& system, std::string_view patch_name)

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

@ -13,6 +13,11 @@ class CPUThreadGuard;
class System;
} // namespace Core
namespace PowerPC
{
enum class CoreMode;
}
namespace HLE
{
using HookFunction = void (*)(const Core::CPUThreadGuard&);
@ -56,7 +61,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);
void ExecuteFromJIT(u32 current_pc, u32 hook_index, Core::System& system);
// Returns the HLE hook index of the address
u32 GetHookByAddress(u32 address);
@ -65,10 +70,10 @@ u32 GetHookByFunctionAddress(u32 address);
HookType GetHookTypeByIndex(u32 index);
HookFlag GetHookFlagsByIndex(u32 index);
bool IsEnabled(HookFlag flag);
bool IsEnabled(HookFlag flag, PowerPC::CoreMode mode);
// Performs the backend-independent preliminary checking for whether a function
// can be HLEd. If it can be, the information needed for HLEing it is returned.
TryReplaceFunctionResult TryReplaceFunction(u32 address);
TryReplaceFunctionResult TryReplaceFunction(u32 address, PowerPC::CoreMode mode);
} // namespace HLE

15
Source/Core/Core/HLE/HLE_Misc.cpp
View File

@ -5,6 +5,7 @@
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Core/Core.h"
#include "Core/GeckoCode.h"
#include "Core/HW/CPU.h"
#include "Core/Host.h"
@ -16,24 +17,24 @@ namespace HLE_Misc
{
// If you just want to kill a function, one of the three following are usually appropriate.
// According to the PPC ABI, the return value is always in r3.
void UnimplementedFunction(const Core::CPUThreadGuard&)
void UnimplementedFunction(const Core::CPUThreadGuard& guard)
{
auto& system = Core::System::GetInstance();
auto& system = guard.GetSystem();
auto& ppc_state = system.GetPPCState();
ppc_state.npc = LR(ppc_state);
}
void HBReload(const Core::CPUThreadGuard&)
void HBReload(const Core::CPUThreadGuard& guard)
{
// There isn't much we can do. Just stop cleanly.
auto& system = Core::System::GetInstance();
auto& system = guard.GetSystem();
system.GetCPU().Break();
Host_Message(HostMessageID::WMUserStop);
}
void GeckoCodeHandlerICacheFlush(const Core::CPUThreadGuard& guard)
{
auto& system = Core::System::GetInstance();
auto& system = guard.GetSystem();
auto& ppc_state = system.GetPPCState();
// Work around the codehandler not properly invalidating the icache, but
@ -62,11 +63,11 @@ void GeckoCodeHandlerICacheFlush(const Core::CPUThreadGuard& guard)
// and PC before the magic, invisible BL instruction happened.
void GeckoReturnTrampoline(const Core::CPUThreadGuard& guard)
{
auto& system = Core::System::GetInstance();
auto& system = guard.GetSystem();
auto& ppc_state = system.GetPPCState();
// Stack frame is built in GeckoCode.cpp, Gecko::RunCodeHandler.
u32 SP = ppc_state.gpr[1];
const u32 SP = ppc_state.gpr[1];
ppc_state.gpr[1] = PowerPC::MMU::HostRead_U32(guard, SP + 8);
ppc_state.npc = PowerPC::MMU::HostRead_U32(guard, SP + 12);
LR(ppc_state) = PowerPC::MMU::HostRead_U32(guard, SP + 16);

34
Source/Core/Core/HLE/HLE_OS.cpp
View File

@ -30,15 +30,13 @@ enum class ParameterType : bool
VariableArgumentList = true
};
std::string GetStringVA(Core::System& system, const Core::CPUThreadGuard& guard, u32 str_reg = 3,
ParameterType parameter_type = ParameterType::ParameterList);
void HLE_GeneralDebugPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type);
void HLE_LogDPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type);
void HLE_LogFPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type);
static std::string GetStringVA(Core::System& system, const Core::CPUThreadGuard& guard,
u32 str_reg = 3,
ParameterType parameter_type = ParameterType::ParameterList);
void HLE_OSPanic(const Core::CPUThreadGuard& guard)
{
auto& system = Core::System::GetInstance();
auto& system = guard.GetSystem();
auto& ppc_state = system.GetPPCState();
std::string error = GetStringVA(system, guard);
@ -55,10 +53,10 @@ void HLE_OSPanic(const Core::CPUThreadGuard& guard)
}
// Generalized function for printing formatted string.
void HLE_GeneralDebugPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type)
static void HLE_GeneralDebugPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type)
{
auto& system = Core::System::GetInstance();
auto& ppc_state = system.GetPPCState();
auto& system = guard.GetSystem();
const auto& ppc_state = system.GetPPCState();
std::string report_message;
@ -114,7 +112,7 @@ void HLE_GeneralDebugVPrint(const Core::CPUThreadGuard& guard)
void HLE_write_console(const Core::CPUThreadGuard& guard)
{
auto& system = guard.GetSystem();
auto& ppc_state = system.GetPPCState();
const auto& ppc_state = system.GetPPCState();
std::string report_message = GetStringVA(system, guard, 4);
if (PowerPC::MMU::HostIsRAMAddress(guard, ppc_state.gpr[5]))
@ -139,10 +137,10 @@ void HLE_write_console(const Core::CPUThreadGuard& guard)
}
// Log (v)dprintf message if fd is 1 (stdout) or 2 (stderr)
void HLE_LogDPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type)
static void HLE_LogDPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type)
{
auto& system = Core::System::GetInstance();
auto& ppc_state = system.GetPPCState();
auto& system = guard.GetSystem();
const auto& ppc_state = system.GetPPCState();
if (ppc_state.gpr[3] != 1 && ppc_state.gpr[3] != 2)
return;
@ -168,10 +166,10 @@ void HLE_LogVDPrint(const Core::CPUThreadGuard& guard)
}
// Log (v)fprintf message if FILE is stdout or stderr
void HLE_LogFPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type)
static void HLE_LogFPrint(const Core::CPUThreadGuard& guard, ParameterType parameter_type)
{
auto& system = Core::System::GetInstance();
auto& ppc_state = system.GetPPCState();
auto& system = guard.GetSystem();
const auto& ppc_state = system.GetPPCState();
// The structure FILE is implementation defined.
// Both libogc and Dolphin SDK seem to store the fd at the same address.
@ -242,8 +240,8 @@ private:
};
} // namespace
std::string GetStringVA(Core::System& system, const Core::CPUThreadGuard& guard, u32 str_reg,
ParameterType parameter_type)
static std::string GetStringVA(Core::System& system, const Core::CPUThreadGuard& guard, u32 str_reg,
ParameterType parameter_type)
{
auto& ppc_state = system.GetPPCState();

4
Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp
View File

@ -269,7 +269,9 @@ bool CachedInterpreter::CheckIdle(CachedInterpreter& cached_interpreter, u32 idl
bool CachedInterpreter::HandleFunctionHooking(u32 address)
{
const auto result = HLE::TryReplaceFunction(address);
// CachedInterpreter inherits from JitBase and is considered a JIT by relevant code.
// (see JitInterface and how m_mode is set within PowerPC.cpp)
const auto result = HLE::TryReplaceFunction(address, PowerPC::CoreMode::JIT);
if (!result)
return false;

2
Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View File

@ -106,7 +106,7 @@ void Interpreter::Trace(const UGeckoInstruction& inst)
bool Interpreter::HandleFunctionHooking(u32 address)
{
const auto result = HLE::TryReplaceFunction(address);
const auto result = HLE::TryReplaceFunction(address, PowerPC::CoreMode::Interpreter);
if (!result)
return false;

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

@ -396,7 +396,7 @@ void Jit64::HLEFunction(u32 hook_index)
gpr.Flush();
fpr.Flush();
ABI_PushRegistersAndAdjustStack({}, 0);
ABI_CallFunctionCC(HLE::ExecuteFromJIT, js.compilerPC, hook_index);
ABI_CallFunctionCCP(HLE::ExecuteFromJIT, js.compilerPC, hook_index, &m_system);
ABI_PopRegistersAndAdjustStack({}, 0);
}
@ -1274,7 +1274,7 @@ void Jit64::IntializeSpeculativeConstants()
bool Jit64::HandleFunctionHooking(u32 address)
{
const auto result = HLE::TryReplaceFunction(address);
const auto result = HLE::TryReplaceFunction(address, PowerPC::CoreMode::JIT);
if (!result)
return false;

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

@ -248,7 +248,7 @@ void JitArm64::HLEFunction(u32 hook_index)
gpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
fpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
ABI_CallFunction(&HLE::ExecuteFromJIT, js.compilerPC, hook_index);
ABI_CallFunction(&HLE::ExecuteFromJIT, js.compilerPC, hook_index, &m_system);
}
void JitArm64::DoNothing(UGeckoInstruction inst)
@ -781,7 +781,7 @@ void JitArm64::WriteConditionalExceptionExit(int exception, ARM64Reg temp_gpr, A
bool JitArm64::HandleFunctionHooking(u32 address)
{
const auto result = HLE::TryReplaceFunction(address);
const auto result = HLE::TryReplaceFunction(address, PowerPC::CoreMode::JIT);
if (!result)
return false;

3
Source/Core/Core/PowerPC/PPCAnalyst.cpp
View File

@ -998,7 +998,8 @@ u32 PPCAnalyzer::Analyze(u32 address, CodeBlock* block, CodeBuffer* buffer,
crDiscardable = BitSet8{};
}
const bool hle = !!HLE::TryReplaceFunction(op.address);
const auto ppc_mode = Core::System::GetInstance().GetPowerPC().GetMode();
const bool hle = !!HLE::TryReplaceFunction(op.address, ppc_mode);
const bool may_exit_block = hle || op.canEndBlock || op.canCauseException;
const bool opWantsFPRF = op.wantsFPRF;