From fd9bfddde75317df645740a8698a65f8cc18e3c9 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 2 Jun 2014 13:26:31 +0200 Subject: [PATCH] RegCache64: devirtualize RegCache::Start --- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 4 ++-- Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp | 12 +----------- Source/Core/Core/PowerPC/Jit64/JitRegCache.h | 4 +--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 6cd5082dc6..bf18f33b24 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -468,8 +468,8 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc // Start up the register allocators // They use the information in gpa/fpa to preload commonly used registers. - gpr.Start(js.gpa); - fpr.Start(js.fpa); + gpr.Start(); + fpr.Start(); js.downcountAmount = 0; if (!Core::g_CoreStartupParameter.bEnableDebugging) diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp index a8f7e82ddc..d121a9d808 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp @@ -13,7 +13,7 @@ RegCache::RegCache() : emit(nullptr) { } -void RegCache::Start(PPCAnalyst::BlockRegStats &stats) +void RegCache::Start() { for (auto& xreg : xregs) { @@ -163,16 +163,6 @@ void GPRRegCache::SetImmediate32(int preg, u32 immValue) regs[preg].location = Imm32(immValue); } -void GPRRegCache::Start(PPCAnalyst::BlockRegStats &stats) -{ - RegCache::Start(stats); -} - -void FPURegCache::Start(PPCAnalyst::BlockRegStats &stats) -{ - RegCache::Start(stats); -} - const int *GPRRegCache::GetAllocationOrder(int &count) { static const int allocationOrder[] = diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h index 534867d2bc..674b72bcd8 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h @@ -48,7 +48,7 @@ public: RegCache(); virtual ~RegCache() {} - virtual void Start(PPCAnalyst::BlockRegStats &stats) = 0; + void Start(); void DiscardRegContentsIfCached(int preg); void SetEmitter(XEmitter *emitter) {emit = emitter;} @@ -106,7 +106,6 @@ public: class GPRRegCache : public RegCache { public: - void Start(PPCAnalyst::BlockRegStats &stats) override; void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override; void StoreFromRegister(int preg) override; OpArg GetDefaultLocation(int reg) const override; @@ -118,7 +117,6 @@ public: class FPURegCache : public RegCache { public: - void Start(PPCAnalyst::BlockRegStats &stats) override; void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override; void StoreFromRegister(int preg) override; const int *GetAllocationOrder(int &count) override;