From 85281e76ee24f2aec68b23d8a89359a71a5cf5de Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 10 Apr 2022 11:32:33 +0200 Subject: [PATCH] Jit: Remove unnecessary member variables --- Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 2 +- Source/Core/Core/PowerPC/JitCommon/JitBase.cpp | 4 +--- Source/Core/Core/PowerPC/JitCommon/JitBase.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index 99d5da4b6f..feda149107 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -49,7 +49,7 @@ void JitArm64::Init() { RefreshConfig(); - const size_t child_code_size = m_mmu_enabled ? FARCODE_SIZE_MMU : FARCODE_SIZE; + const size_t child_code_size = jo.memcheck ? FARCODE_SIZE_MMU : FARCODE_SIZE; AllocCodeSpace(CODE_SIZE + child_code_size); AddChildCodeSpace(&m_far_code, child_code_size); diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp index 58d61499dc..7c9c707fbc 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp @@ -119,8 +119,6 @@ void JitBase::RefreshConfig() for (const auto& [member, config_info] : JIT_SETTINGS) this->*member = Config::Get(*config_info); - m_mmu_enabled = m_system.IsMMUMode(); - m_pause_on_panic_enabled = m_system.IsPauseOnPanicMode(); if (m_accurate_cpu_cache_enabled) { m_fastmem_enabled = false; @@ -135,7 +133,7 @@ void JitBase::RefreshConfig() bool any_watchpoints = m_system.GetPowerPC().GetMemChecks().HasAny(); jo.fastmem = m_fastmem_enabled && jo.fastmem_arena && (m_ppc_state.msr.DR || !any_watchpoints); - jo.memcheck = m_mmu_enabled || m_pause_on_panic_enabled || any_watchpoints; + 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; } diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index 2846938cf4..6c95559438 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -155,8 +155,6 @@ protected: bool m_fprf = false; bool m_accurate_nans = false; bool m_fastmem_enabled = false; - bool m_mmu_enabled = false; - bool m_pause_on_panic_enabled = false; bool m_accurate_cpu_cache_enabled = false; bool m_enable_blr_optimization = false;