piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1162 from FioraAeterna/fixmerges

Browse Source 
JIT: fix bugs with ComputeRC in branch merging patch
This commit is contained in:
skidau
2014-09-26 14:46:53 +10:00
parent 146725f64a f9ab25152c
commit 9d746b89a2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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