From d9e1bf139f4d01e320055bd5c21d653b076d0f55 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 4 Jun 2015 20:40:36 -0400 Subject: [PATCH 1/3] JitArm64_RegCache: Make some functions const --- .../Core/PowerPC/JitArm64/JitArm64_RegCache.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h index 2e09cf8ee9d7..d4abffb523a0 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h @@ -46,16 +46,16 @@ class OpArg { } - RegType GetType() + RegType GetType() const { return m_type; } - ARM64Reg GetReg() + ARM64Reg GetReg() const { return m_reg; } - u32 GetImm() + u32 GetImm() const { return m_value; } @@ -81,12 +81,12 @@ class OpArg m_last_used = 0xFFFF; } - u32 GetLastUsed() { return m_last_used; } + u32 GetLastUsed() const { return m_last_used; } void ResetLastUsed() { m_last_used = 0; } void IncrementLastUsed() { ++m_last_used; } void SetDirty(bool dirty) { m_dirty = dirty; } - bool IsDirty() { return m_dirty; } + bool IsDirty() const { return m_dirty; } private: // For REG_REG @@ -106,10 +106,10 @@ class HostReg public: HostReg() : m_reg(INVALID_REG), m_locked(false) {} HostReg(ARM64Reg reg) : m_reg(reg), m_locked(false) {} - bool IsLocked() { return m_locked; } + bool IsLocked() const { return m_locked; } void Lock() { m_locked = true; } void Unlock() { m_locked = false; } - ARM64Reg GetReg() { return m_reg; } + ARM64Reg GetReg() const { return m_reg; } bool operator==(const ARM64Reg& reg) { @@ -233,10 +233,10 @@ class Arm64GPRCache : public Arm64RegCache void SetImmediate(u32 preg, u32 imm); // Returns if a register is set as an immediate - bool IsImm(u32 reg) { return m_guest_registers[reg].GetType() == REG_IMM; } + bool IsImm(u32 reg) const { return m_guest_registers[reg].GetType() == REG_IMM; } // Gets the immediate that a register is set to - u32 GetImm(u32 reg) { return m_guest_registers[reg].GetImm(); } + u32 GetImm(u32 reg) const { return m_guest_registers[reg].GetImm(); } void BindToRegister(u32 preg, bool do_load); From 4f276ede0f6f4682a3d956d04c0d1db73fb43c58 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 4 Jun 2015 20:43:22 -0400 Subject: [PATCH 2/3] Arm64Emitter: Make GetReg() const --- Source/Core/Common/Arm64Emitter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index 98dad6c5204b..7281970889ad 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -276,7 +276,7 @@ class ArithOption { return m_type; } - ARM64Reg GetReg() + ARM64Reg GetReg() const { return m_destReg; } From fe77505d4ddd23614d9ea9fe8081df92b86aa07b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 4 Jun 2015 20:52:53 -0400 Subject: [PATCH 3/3] Jit: Make IsInCodeSpace() const --- Source/Core/Common/CodeBlock.h | 2 +- Source/Core/Core/PowerPC/JitArm64/Jit.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h index c982245912fe..ed1f464904d8 100644 --- a/Source/Core/Common/CodeBlock.h +++ b/Source/Core/Common/CodeBlock.h @@ -51,7 +51,7 @@ template class CodeBlock : public T, NonCopyable region_size = 0; } - bool IsInSpace(u8 *ptr) + bool IsInSpace(u8 *ptr) const { return (ptr >= region) && (ptr < (region + region_size)); } diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h index e0ee7c5a8387..18463b669e8e 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h @@ -35,7 +35,7 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock JitBaseBlockCache *GetBlockCache() { return &blocks; } - bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } + bool IsInCodeSpace(u8 *ptr) const { return IsInSpace(ptr); } bool HandleFault(uintptr_t access_address, SContext* ctx) override;