summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2017-03-21 13:45:18 -0400
committerLioncash <mathew1800@gmail.com>2017-03-21 13:45:18 -0400
commitf98211bfcf3473b7e57b108e0515c17bbdc58ba0 (patch)
tree0f58aa12d9acbb7182e0c551a05a0b5bce7b48cf /Source/Core
parentf03fa54bcbe5b47b22d3731a2f5dab3d9a7bf3f9 (diff)
JitBase: Make MergeAllowedNextInstructions a const member function
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/PowerPC/JitCommon/JitBase.cpp2
-rw-r--r--Source/Core/Core/PowerPC/JitCommon/JitBase.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
index 9b0c837610..c00724795c 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
@@ -27,7 +27,7 @@ JitBase::JitBase() = default;
JitBase::~JitBase() = default;
-bool JitBase::MergeAllowedNextInstructions(int count)
+bool JitBase::MergeAllowedNextInstructions(int count) const
{
if (CPU::GetState() == CPU::CPU_STEPPING || js.instructionsLeft < count)
return false;
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
index f62776d6c3..0bd2044be5 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
@@ -104,7 +104,7 @@ protected:
PPCAnalyst::CodeBlock code_block;
PPCAnalyst::PPCAnalyzer analyzer;
- bool MergeAllowedNextInstructions(int count);
+ bool MergeAllowedNextInstructions(int count) const;
void UpdateMemoryOptions();