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

Merge pull request #5558 from Tilka/fix_warnings 

Interpreter: simplify srawx/srawix
This commit is contained in:
shuffle2 2017-06-06 03:28:19 -07:00 committed by GitHub
parent 3d6c278892 7702771d61
commit 3c0bdd7473
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
View File

@ -356,21 +356,10 @@ void Interpreter::srawx(UGeckoInstruction inst)
else else
{ {
int amount = rb & 0x1f; int amount = rb & 0x1f;
if (amount == 0)
{
rGPR[inst.RA] = rGPR[inst.RS];
SetCarry(0);
}
else
{
s32 rrs = rGPR[inst.RS]; s32 rrs = rGPR[inst.RS];
rGPR[inst.RA] = rrs >> amount; rGPR[inst.RA] = rrs >> amount;
if ((rrs < 0) && (rrs << (32 - amount))) SetCarry(rrs < 0 && (u32(rrs) << (32 - amount)) != 0);
SetCarry(1);
else
SetCarry(0);
}
} }
if (inst.Rc) if (inst.Rc)
@ -381,21 +370,10 @@ void Interpreter::srawix(UGeckoInstruction inst)
{ {
int amount = inst.SH; int amount = inst.SH;
if (amount != 0)
{
s32 rrs = rGPR[inst.RS]; s32 rrs = rGPR[inst.RS];
rGPR[inst.RA] = rrs >> amount; rGPR[inst.RA] = rrs >> amount;
if ((rrs < 0) && (rrs << (32 - amount))) SetCarry(rrs < 0 && (u32(rrs) << (32 - amount)) != 0);
SetCarry(1);
else
SetCarry(0);
}
else
{
SetCarry(0);
rGPR[inst.RA] = rGPR[inst.RS];
}
if (inst.Rc) if (inst.Rc)
Helper_UpdateCR0(rGPR[inst.RA]); Helper_UpdateCR0(rGPR[inst.RA]);