diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2018-02-19 15:28:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 15:28:06 +0100 |
| commit | a2d2a0a356cd9ef66077033b553fd09ba7423f9a (patch) | |
| tree | 6a6765a47374c80105bc495f6425cc7767b256c2 /Source | |
| parent | be1a7366a4ef30a6289dde3fa7ffc541134e1bca (diff) | |
| parent | caf721fb3f3ab30b200a0ed403368df84d42d21f (diff) | |
Merge pull request #6384 from jeffythedragonslayer/master
Jit64: fixed some signed to unsigned integer warnings
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 12da80f64a..0edf485055 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -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++; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 2ff5e1bffe..15f4965e63 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -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() |