diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 4fe96f5bfc..97ca0af716 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -87,7 +87,7 @@ public: // Use to extract bytes from a register using the regcache. offset is in bytes. Gen::OpArg ExtractFromReg(int reg, int offset); void AndWithMask(Gen::X64Reg reg, u32 mask); - bool CheckMergedBranch(int crf); + bool CheckMergedBranch(u32 crf); void DoMergedBranch(); void DoMergedBranchCondition(); void DoMergedBranchImmediate(s64 val); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 63ac8ff7d5..12da80f64a 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -486,7 +486,7 @@ void Jit64::FloatCompare(UGeckoInstruction inst, bool upper) // bool ordered = !!(inst.SUBOP10 & 32); int a = inst.FA; int b = inst.FB; - int crf = inst.CRFD; + u32 crf = inst.CRFD; int output[4] = {CR_SO, CR_EQ, CR_GT, CR_LT}; // Merge neighboring fcmp and cror (the primary use of cror). diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 5f25fd5d22..2ff5e1bffe 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -339,7 +339,7 @@ void Jit64::reg_imm(UGeckoInstruction inst) } } -bool Jit64::CheckMergedBranch(int crf) +bool Jit64::CheckMergedBranch(u32 crf) { if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_BRANCH_MERGE)) return false; @@ -473,7 +473,7 @@ void Jit64::cmpXX(UGeckoInstruction inst) JITDISABLE(bJITIntegerOff); int a = inst.RA; int b = inst.RB; - int crf = inst.CRFD; + u32 crf = inst.CRFD; bool merge_branch = CheckMergedBranch(crf); OpArg comparand;