ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6384 from jeffythedragonslayer/master 

Jit64: fixed some signed to unsigned integer warnings
This commit is contained in:
Markus Wick 2018-02-19 15:28:06 +01:00 committed by GitHub
parent be1a7366a4 caf721fb3f
commit a2d2a0a356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
View File

@ -493,7 +493,8 @@ void Jit64::FloatCompare(UGeckoInstruction inst, bool upper)
UGeckoInstruction next = js.op[1].inst;
if (analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CROR_MERGE) &&
CanMergeNextInstructions(1) && next.OPCD == 19 && next.SUBOP10 == 449 &&
(next.CRBA >> 2) == crf && (next.CRBB >> 2) == crf && (next.CRBD >> 2) == crf)
static_cast<u32>(next.CRBA >> 2) == crf && static_cast<u32>(next.CRBB >> 2) == crf &&
static_cast<u32>(next.CRBD >> 2) == crf)
{
js.skipInstructions = 1;
js.downcountAmount++;

2
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -352,7 +352,7 @@ bool Jit64::CheckMergedBranch(u32 crf)
((next.OPCD == 19) && (next.SUBOP10 == 528) /* bcctrx */) ||
((next.OPCD == 19) && (next.SUBOP10 == 16) /* bclrx */)) &&
(next.BO & BO_DONT_DECREMENT_FLAG) && !(next.BO & BO_DONT_CHECK_CONDITION) &&
(next.BI >> 2) == crf);
static_cast<u32>(next.BI >> 2) == crf);
}
void Jit64::DoMergedBranch()