ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86 shift of 0 doesn't update flags, check the value manually

This commit is contained in:
calc84maniac 2012-01-03 00:37:43 -05:00
parent 6ecae3e556
commit aa47a8c690
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -1652,10 +1652,6 @@ void Jit64::srwx(UGeckoInstruction inst)
{ {
u32 amount = (u32)gpr.R(b).offset; u32 amount = (u32)gpr.R(b).offset;
gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f))); gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f)));
if (inst.Rc)
{
ComputeRC(gpr.R(a));
}
} }
else else
{ {
@ -1672,13 +1668,14 @@ void Jit64::srwx(UGeckoInstruction inst)
XOR(32, gpr.R(a), gpr.R(a)); XOR(32, gpr.R(a), gpr.R(a));
SetJumpTarget(branch); SetJumpTarget(branch);
SHR(32, gpr.R(a), R(ECX)); SHR(32, gpr.R(a), R(ECX));
if (inst.Rc)
{
GenerateRC();
}
gpr.UnlockAll(); gpr.UnlockAll();
gpr.UnlockAllX(); gpr.UnlockAllX();
} }
// Shift of 0 doesn't update flags, so compare manually just in case
if (inst.Rc)
{
ComputeRC(gpr.R(a));
}
} }
void Jit64::slwx(UGeckoInstruction inst) void Jit64::slwx(UGeckoInstruction inst)
@ -1693,10 +1690,6 @@ void Jit64::slwx(UGeckoInstruction inst)
{ {
u32 amount = (u32)gpr.R(b).offset; u32 amount = (u32)gpr.R(b).offset;
gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount); gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount);
if (inst.Rc)
{
ComputeRC(gpr.R(a));
}
} }
else else
{ {
@ -1713,13 +1706,14 @@ void Jit64::slwx(UGeckoInstruction inst)
XOR(32, gpr.R(a), gpr.R(a)); XOR(32, gpr.R(a), gpr.R(a));
SetJumpTarget(branch); SetJumpTarget(branch);
SHL(32, gpr.R(a), R(ECX)); SHL(32, gpr.R(a), R(ECX));
if (inst.Rc)
{
GenerateRC();
}
gpr.UnlockAll(); gpr.UnlockAll();
gpr.UnlockAllX(); gpr.UnlockAllX();
} }
// Shift of 0 doesn't update flags, so compare manually just in case
if (inst.Rc)
{
ComputeRC(gpr.R(a));
}
} }
void Jit64::srawx(UGeckoInstruction inst) void Jit64::srawx(UGeckoInstruction inst)