Merge pull request #1162 from FioraAeterna/fixmerges

JIT: fix bugs with ComputeRC in branch merging patch
This commit is contained in:
skidau 2014-09-26 14:46:53 +10:00
commit 9d746b89a2

View File

@ -589,6 +589,10 @@ void Jit64::boolX(UGeckoInstruction inst)
gpr.BindToRegister(a, false, true);
MOV(32, gpr.R(a), gpr.R(s));
}
else if (inst.Rc)
{
gpr.BindToRegister(a, true, false);
}
needs_test = true;
}
else if ((inst.SUBOP10 == 476 /* nandx */) || (inst.SUBOP10 == 124 /* norx */))
@ -599,6 +603,10 @@ void Jit64::boolX(UGeckoInstruction inst)
gpr.BindToRegister(a, false, true);
MOV(32, gpr.R(a), gpr.R(s));
}
else if (inst.Rc)
{
gpr.BindToRegister(a, true, true);
}
else
{
gpr.KillImmediate(a, true, true);