From d9e2b3ed98af601aba3fef2389a020299276ea07 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sun, 30 Sep 2018 14:27:32 +0100 Subject: [PATCH] JitRegCache: Make {Store,Load}Register protected No reason for them to be public --- Source/Core/Core/PowerPC/Jit64/FPURegCache.h | 3 ++- Source/Core/Core/PowerPC/Jit64/GPRRegCache.h | 5 +++-- Source/Core/Core/PowerPC/Jit64/JitRegCache.h | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/FPURegCache.h b/Source/Core/Core/PowerPC/Jit64/FPURegCache.h index eef93cec1b..99ffc78887 100644 --- a/Source/Core/Core/PowerPC/Jit64/FPURegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/FPURegCache.h @@ -12,11 +12,12 @@ class FPURegCache final : public RegCache { public: explicit FPURegCache(Jit64& jit); + Gen::OpArg GetDefaultLocation(size_t reg) const override; +protected: void StoreRegister(size_t preg, const Gen::OpArg& newLoc) override; void LoadRegister(size_t preg, Gen::X64Reg newLoc) override; const Gen::X64Reg* GetAllocationOrder(size_t* count) const override; - Gen::OpArg GetDefaultLocation(size_t reg) const override; BitSet32 GetRegUtilization() const override; BitSet32 CountRegsIn(size_t preg, u32 lookahead) const override; }; diff --git a/Source/Core/Core/PowerPC/Jit64/GPRRegCache.h b/Source/Core/Core/PowerPC/Jit64/GPRRegCache.h index e16bb28972..911fa96651 100644 --- a/Source/Core/Core/PowerPC/Jit64/GPRRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/GPRRegCache.h @@ -12,12 +12,13 @@ class GPRRegCache final : public RegCache { public: explicit GPRRegCache(Jit64& jit); + Gen::OpArg GetDefaultLocation(size_t reg) const override; + void SetImmediate32(size_t preg, u32 imm_value, bool dirty = true); +protected: void StoreRegister(size_t preg, const Gen::OpArg& new_loc) override; void LoadRegister(size_t preg, Gen::X64Reg new_loc) override; - Gen::OpArg GetDefaultLocation(size_t reg) const override; const Gen::X64Reg* GetAllocationOrder(size_t* count) const override; - void SetImmediate32(size_t preg, u32 imm_value, bool dirty = true); BitSet32 GetRegUtilization() const override; BitSet32 CountRegsIn(size_t preg, u32 lookahead) const override; }; diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h index e32e42ae47..c53c080873 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h @@ -133,8 +133,6 @@ public: explicit RegCache(Jit64& jit); virtual ~RegCache() = default; - virtual void StoreRegister(size_t preg, const Gen::OpArg& new_loc) = 0; - virtual void LoadRegister(size_t preg, Gen::X64Reg new_loc) = 0; virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0; void Start(); @@ -211,6 +209,9 @@ public: int NumFreeRegisters() const; protected: + virtual void StoreRegister(size_t preg, const Gen::OpArg& new_loc) = 0; + virtual void LoadRegister(size_t preg, Gen::X64Reg new_loc) = 0; + virtual const Gen::X64Reg* GetAllocationOrder(size_t* count) const = 0; virtual BitSet32 GetRegUtilization() const = 0;