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

Merge pull request #12079 from JosJuice/blr-no-fastmem

Browse Source 
Jit: Allow BLR optimization without fastmem
This commit is contained in:
JMC47
2023-09-02 12:45:39 -04:00
committed by GitHub
parent 6beaee078b 4131dffae9
commit bd57d17dee
4 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/Core.cpp
View File

@ -391,9 +391,10 @@ static void CpuThread(const std::optional<std::string>& savestate_path, bool del
static_cast<void>(IDCache::GetEnvForThread());
#endif
const bool fastmem_enabled = Config::Get(Config::MAIN_FASTMEM);
if (fastmem_enabled)
EMM::InstallExceptionHandler(); // Let's run under memory watch
// The JIT need to be able to intercept faults, both for fastmem and for the BLR optimization.
const bool exception_handler = EMM::IsExceptionHandlerSupported();
if (exception_handler)
EMM::InstallExceptionHandler();
#ifdef USE_MEMORYWATCHER
s_memory_watcher = std::make_unique<MemoryWatcher>();
@ -441,7 +442,7 @@ static void CpuThread(const std::optional<std::string>& savestate_path, bool del
s_is_started = false;
if (fastmem_enabled)
if (exception_handler)
EMM::UninstallExceptionHandler();
if (GDBStub::IsActive())

21
Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
View File

@ -18,6 +18,7 @@
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/CPU.h"
#include "Core/MemTools.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/System.h"
@ -132,7 +133,8 @@ void JitBase::RefreshConfig()
analyzer.SetDivByZeroExceptionsEnabled(m_enable_div_by_zero_exceptions);
bool any_watchpoints = m_system.GetPowerPC().GetMemChecks().HasAny();
jo.fastmem = m_fastmem_enabled && jo.fastmem_arena && (m_ppc_state.msr.DR || !any_watchpoints);
jo.fastmem = m_fastmem_enabled && jo.fastmem_arena && (m_ppc_state.msr.DR || !any_watchpoints) &&
EMM::IsExceptionHandlerSupported();
jo.memcheck = m_system.IsMMUMode() || m_system.IsPauseOnPanicMode() || any_watchpoints;
jo.fp_exceptions = m_enable_float_exceptions;
jo.div_by_zero_exceptions = m_enable_div_by_zero_exceptions;
@ -140,7 +142,8 @@ void JitBase::RefreshConfig()
void JitBase::InitBLROptimization()
{
m_enable_blr_optimization = jo.enableBlocklink && m_fastmem_enabled && !m_enable_debugging;
m_enable_blr_optimization =
jo.enableBlocklink && !m_enable_debugging && EMM::IsExceptionHandlerSupported();
m_cleanup_after_stackfault = false;
}
@ -151,7 +154,12 @@ void JitBase::ProtectStack()
#ifdef _WIN32
ULONG reserveSize = SAFE_STACK_SIZE;
SetThreadStackGuarantee(&reserveSize);
if (!SetThreadStackGuarantee(&reserveSize))
{
PanicAlertFmt("Failed to set thread stack guarantee");
m_enable_blr_optimization = false;
return;
}
#else
auto [stack_addr, stack_size] = Common::GetCurrentThreadStack();
@ -184,7 +192,12 @@ void JitBase::ProtectStack()
}
m_stack_guard = reinterpret_cast<u8*>(stack_guard_addr);
Common::ReadProtectMemory(m_stack_guard, GUARD_SIZE);
if (!Common::ReadProtectMemory(m_stack_guard, GUARD_SIZE))
{
m_stack_guard = nullptr;
m_enable_blr_optimization = false;
return;
}
#endif
}