piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

JitBase: Rename MergeAllowedNextInstructions to CanMergeNextInstructions

Browse Source 
This is more indicative that it's checking for something
This commit is contained in:
Lioncash
2017-03-21 13:49:56 -04:00
parent f98211bfcf
commit 0d1bc53e55
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
View File

@ -27,7 +27,7 @@ JitBase::JitBase() = default;
JitBase::~JitBase() = default;
bool JitBase::MergeAllowedNextInstructions(int count) const
bool JitBase::CanMergeNextInstructions(int count) const
{
if (CPU::GetState() == CPU::CPU_STEPPING || js.instructionsLeft < count)
return false;

2
Source/Core/Core/PowerPC/JitCommon/JitBase.h
View File

@ -104,7 +104,7 @@ protected:
PPCAnalyst::CodeBlock code_block;
PPCAnalyst::PPCAnalyzer analyzer;
bool MergeAllowedNextInstructions(int count) const;
bool CanMergeNextInstructions(int count) const;
void UpdateMemoryOptions();