From 9c4106027ce7ff4847b2e06d25a4cadf30e27faf Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 17:34:07 -0500 Subject: [PATCH] Erp, some changes were not committed --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index bf57681295..c2726fc7de 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1422,6 +1422,10 @@ void Jit64::rlwinmx(UGeckoInstruction inst) result = _rotl(result, inst.SH); result &= Helper_Mask(inst.MB, inst.ME); gpr.SetImmediate32(a, result); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { @@ -1435,10 +1439,18 @@ void Jit64::rlwinmx(UGeckoInstruction inst) if (inst.MB == 0 && inst.ME==31-inst.SH) { SHL(32, gpr.R(a), Imm8(inst.SH)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.ME == 31 && inst.MB == 32 - inst.SH) { SHR(32, gpr.R(a), Imm8(inst.MB)); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -1452,16 +1464,19 @@ void Jit64::rlwinmx(UGeckoInstruction inst) { written = true; AND(32, gpr.R(a), Imm32(Helper_Mask(inst.MB, inst.ME))); + if (inst.Rc) + { + GenerateRC(); + } + } + else if (inst.Rc) + { + ComputeRC(gpr.R(a)); } _assert_msg_(DYNA_REC, written, "W T F!!!"); } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } @@ -1488,7 +1503,7 @@ void Jit64::rlwimix(UGeckoInstruction inst) u32 mask = Helper_Mask(inst.MB, inst.ME); if (mask == 0 || (a == s && inst.SH == 0)) { - if (inst.RC) + if (inst.Rc) { ComputeRC(gpr.R(a)); }