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 #2915 from degasus/arm 

JitArm64: Implement rlwnmx
This commit is contained in:
Ryan Houdek 2015-08-26 15:52:37 -05:00
parent 54f882704a e516d4ef59
commit 6d25c469cf
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/PowerPC/JitArm64/Jit.h
View File

@ -90,6 +90,7 @@ public:
void cmpi(UGeckoInstruction inst);
void cmpli(UGeckoInstruction inst);
void rlwinmx(UGeckoInstruction inst);
void rlwnmx(UGeckoInstruction inst);
void srawix(UGeckoInstruction inst);
void mullwx(UGeckoInstruction inst);
void addic(UGeckoInstruction inst);

37
Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
View File

@ -533,6 +533,43 @@ void JitArm64::rlwinmx(UGeckoInstruction inst)
ComputeRC(gpr.R(a), 0);
}
void JitArm64::rlwnmx(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITIntegerOff);
u32 a = inst.RA, b = inst.RB, s = inst.RS;
u32 mask = Helper_Mask(inst.MB, inst.ME);
if (gpr.IsImm(b) && gpr.IsImm(s))
{
gpr.SetImmediate(a, _rotl(gpr.GetImm(s), gpr.GetImm(b) & 0x1F) & mask);
if (inst.Rc)
ComputeRC(gpr.GetImm(a), 0);
}
else if (gpr.IsImm(b))
{
gpr.BindToRegister(a, a == s);
ARM64Reg WA = gpr.GetReg();
ArithOption Shift(gpr.R(s), ST_ROR, 32 - (gpr.GetImm(b) & 0x1f));
MOVI2R(WA, mask);
AND(gpr.R(a), WA, gpr.R(s), Shift);
gpr.Unlock(WA);
if (inst.Rc)
ComputeRC(gpr.R(a), 0);
}
else
{
gpr.BindToRegister(a, a == s || a == b);
ARM64Reg WA = gpr.GetReg();
NEG(WA, gpr.R(b));
RORV(gpr.R(a), gpr.R(s), WA);
ANDI2R(gpr.R(a), gpr.R(a), mask, WA);
gpr.Unlock(WA);
if (inst.Rc)
ComputeRC(gpr.R(a), 0);
}
}
void JitArm64::srawix(UGeckoInstruction inst)
{
INSTRUCTION_START

2
Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
View File

@ -54,7 +54,7 @@ static GekkoOPTemplate primarytable[] =
{20, &JitArm64::rlwimix}, // rlwimix
{21, &JitArm64::rlwinmx}, // rlwinmx
{23, &JitArm64::FallBackToInterpreter}, // rlwnmx
{23, &JitArm64::rlwnmx}, // rlwnmx
{24, &JitArm64::arith_imm}, // ori
{25, &JitArm64::arith_imm}, // oris