From e9517cfea2f6ce0f20a1fa966f79b0aca8968da4 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 10 Aug 2026 12:02:59 +0200 Subject: [PATCH] JitRegCache: Init emitter in constructor --- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 3 --- Source/Core/Core/PowerPC/Jit64/Jit.h | 4 ++-- .../Core/Core/PowerPC/Jit64/RegCache/FPURegCache.cpp | 6 +++--- Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.h | 2 +- .../Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.cpp | 10 +++++----- Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.h | 2 +- .../Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp | 7 +------ Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h | 6 +++--- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index d602400d04..418c022dcb 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -275,9 +275,6 @@ bool Jit64::Init() js.fastmemLoadStore = false; js.compilerPC = 0; - gpr.SetEmitter(this); - fpr.SetEmitter(this); - const size_t routines_size = asm_routines.CODE_SIZE; const size_t trampolines_size = jo.memcheck ? TRAMPOLINE_CODE_SIZE_MMU : TRAMPOLINE_CODE_SIZE; const size_t farcode_size = jo.memcheck ? FARCODE_SIZE_MMU : FARCODE_SIZE; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 69b6e279fe..c062605908 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -286,8 +286,8 @@ private: JitBlockCache blocks{*this}; TrampolineCache trampolines{*this}; - GPRRegCache gpr{*this}; - FPURegCache fpr{*this}; + GPRRegCache gpr{*this, *this}; + FPURegCache fpr{*this, *this}; JitCommon::ConstantPropagation m_constant_propagation; diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.cpp b/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.cpp index 703a74bb74..3900ec332a 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.cpp @@ -9,7 +9,7 @@ using namespace Gen; -FPURegCache::FPURegCache(Jit64& jit) : RegCache{jit} +FPURegCache::FPURegCache(Jit64& jit, XEmitter& emitter) : RegCache{jit, emitter} { } @@ -48,7 +48,7 @@ void FPURegCache::StoreRegister(preg_t preg, const OpArg& new_loc, { if (m_regs[preg].IsInHostRegister()) { - m_emitter->MOVAPD(new_loc, m_regs[preg].GetHostRegister()); + m_emitter.MOVAPD(new_loc, m_regs[preg].GetHostRegister()); } else { @@ -60,7 +60,7 @@ void FPURegCache::StoreRegister(preg_t preg, const OpArg& new_loc, void FPURegCache::LoadRegister(preg_t preg, X64Reg new_loc) { ASSERT_MSG(DYNA_REC, m_regs[preg].IsInPPCState(), "FPR {} not in PPCState", preg); - m_emitter->MOVAPD(new_loc, GetPPCStateLocation(preg)); + m_emitter.MOVAPD(new_loc, GetPPCStateLocation(preg)); } void FPURegCache::DiscardImm(preg_t preg) diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.h b/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.h index b8f4ba0798..5d037195a8 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/FPURegCache.h @@ -10,7 +10,7 @@ class Jit64; class FPURegCache final : public RegCache { public: - explicit FPURegCache(Jit64& jit); + explicit FPURegCache(Jit64& jit, Gen::XEmitter& emitter); bool IsImm(preg_t preg) const override; u32 Imm32(preg_t preg) const override; diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.cpp index 8e67a60c9a..2af131c70a 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.cpp @@ -9,7 +9,7 @@ using namespace Gen; -GPRRegCache::GPRRegCache(Jit64& jit) : RegCache{jit} +GPRRegCache::GPRRegCache(Jit64& jit, XEmitter& emitter) : RegCache{jit, emitter} { } @@ -52,11 +52,11 @@ void GPRRegCache::StoreRegister(preg_t preg, const OpArg& new_loc, { if (m_regs[preg].IsInHostRegister()) { - m_emitter->MOV(32, new_loc, ::Gen::R(m_regs[preg].GetHostRegister())); + m_emitter.MOV(32, new_loc, ::Gen::R(m_regs[preg].GetHostRegister())); } else if (m_jit.GetConstantPropagation().HasGPR(preg)) { - m_emitter->MOV(32, new_loc, ::Gen::Imm32(m_jit.GetConstantPropagation().GetGPR(preg))); + m_emitter.MOV(32, new_loc, ::Gen::Imm32(m_jit.GetConstantPropagation().GetGPR(preg))); } else { @@ -70,12 +70,12 @@ void GPRRegCache::LoadRegister(preg_t preg, X64Reg new_loc) const JitCommon::ConstantPropagation& constant_propagation = m_jit.GetConstantPropagation(); if (constant_propagation.HasGPR(preg)) { - m_emitter->MOV(32, ::Gen::R(new_loc), ::Gen::Imm32(constant_propagation.GetGPR(preg))); + m_emitter.MOV(32, ::Gen::R(new_loc), ::Gen::Imm32(constant_propagation.GetGPR(preg))); } else { ASSERT_MSG(DYNA_REC, m_regs[preg].IsInPPCState(), "GPR {} not in PPCState", preg); - m_emitter->MOV(32, ::Gen::R(new_loc), GetPPCStateLocation(preg)); + m_emitter.MOV(32, ::Gen::R(new_loc), GetPPCStateLocation(preg)); } } diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.h b/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.h index d784234b48..a11f9ff29c 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/GPRRegCache.h @@ -10,7 +10,7 @@ class Jit64; class GPRRegCache final : public RegCache { public: - explicit GPRRegCache(Jit64& jit); + explicit GPRRegCache(Jit64& jit, Gen::XEmitter& emitter); bool IsImm(preg_t preg) const override; u32 Imm32(preg_t preg) const override; diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp index 8d43588061..ffeabb7050 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp @@ -231,7 +231,7 @@ void RCForkGuard::EndFork() rc = nullptr; } -RegCache::RegCache(Jit64& jit) : m_jit{jit} +RegCache::RegCache(Jit64& jit, XEmitter& emitter) : m_jit{jit}, m_emitter(emitter) { } @@ -242,11 +242,6 @@ void RegCache::Start() m_constraints.fill({}); } -void RegCache::SetEmitter(XEmitter* emitter) -{ - m_emitter = emitter; -} - bool RegCache::SanityCheck() const { for (size_t i = 0; i < m_regs.size(); i++) diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h index 97bf222404..c0596c0a61 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h @@ -134,11 +134,10 @@ public: Yes, }; - explicit RegCache(Jit64& jit); + explicit RegCache(Jit64& jit, Gen::XEmitter& emitter); virtual ~RegCache() = default; void Start(); - void SetEmitter(Gen::XEmitter* emitter); bool SanityCheck() const; template @@ -230,8 +229,9 @@ protected: bool IsAnyConstraintActive() const; Jit64& m_jit; + Gen::XEmitter& m_emitter; + std::array m_regs; std::array m_xregs; std::array m_constraints; - Gen::XEmitter* m_emitter = nullptr; };