The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 16:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

JitArm64: Fix and improve the cmpXX instructions.

Browse Source
This commit is contained in:
Markus Wick 2017-08-11 19:13:19 +02:00
parent 0a8e1bd864
commit 7d4c14feba
1 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,18 +409,27 @@ void JitArm64::cmp(UGeckoInstruction inst)
int crf = inst.CRFD; int crf = inst.CRFD;
u32 a = inst.RA, b = inst.RB; u32 a = inst.RA, b = inst.RB;
gpr.BindCRToRegister(crf, false);
ARM64Reg CR = gpr.CR(crf);
if (gpr.IsImm(a) && gpr.IsImm(b)) if (gpr.IsImm(a) && gpr.IsImm(b))
{ {
ComputeRC((s32)gpr.GetImm(a) - (s32)gpr.GetImm(b), crf); s64 A = static_cast<s32>(gpr.GetImm(a));
s64 B = static_cast<s32>(gpr.GetImm(b));
MOVI2R(CR, A - B);
return;
}
if (gpr.IsImm(b) && !gpr.GetImm(b))
{
SXTW(CR, gpr.R(a));
return; return;
} }
gpr.BindCRToRegister(crf, false);
ARM64Reg WA = gpr.GetReg(); ARM64Reg WA = gpr.GetReg();
ARM64Reg XA = EncodeRegTo64(WA); ARM64Reg XA = EncodeRegTo64(WA);
ARM64Reg RA = gpr.R(a); ARM64Reg RA = gpr.R(a);
ARM64Reg RB = gpr.R(b); ARM64Reg RB = gpr.R(b);
ARM64Reg CR = gpr.CR(crf);
SXTW(XA, RA); SXTW(XA, RA);
SXTW(CR, RB); SXTW(CR, RB);
@ -437,18 +446,23 @@ void JitArm64::cmpl(UGeckoInstruction inst)
int crf = inst.CRFD; int crf = inst.CRFD;
u32 a = inst.RA, b = inst.RB; u32 a = inst.RA, b = inst.RB;
gpr.BindCRToRegister(crf, false);
ARM64Reg CR = gpr.CR(crf);
if (gpr.IsImm(a) && gpr.IsImm(b)) if (gpr.IsImm(a) && gpr.IsImm(b))
{ {
ComputeRC(static_cast<u64>(gpr.GetImm(a)) - static_cast<u64>(gpr.GetImm(b)), crf, false); u64 A = gpr.GetImm(a);
return; u64 B = gpr.GetImm(b);
} MOVI2R(CR, A - B);
else if (gpr.IsImm(b) && !gpr.GetImm(b)) return;
{ }
ComputeRC(gpr.R(a), crf, false);
if (gpr.IsImm(b) && !gpr.GetImm(b))
{
MOV(DecodeReg(CR), gpr.R(a));
return; return;
} }
gpr.BindCRToRegister(crf, false);
SUB(gpr.CR(crf), EncodeRegTo64(gpr.R(a)), EncodeRegTo64(gpr.R(b))); SUB(gpr.CR(crf), EncodeRegTo64(gpr.R(a)), EncodeRegTo64(gpr.R(b)));
} }
@ -458,45 +472,54 @@ void JitArm64::cmpi(UGeckoInstruction inst)
JITDISABLE(bJITIntegerOff); JITDISABLE(bJITIntegerOff);
u32 a = inst.RA; u32 a = inst.RA;
s64 B = inst.SIMM_16;
int crf = inst.CRFD; int crf = inst.CRFD;
gpr.BindCRToRegister(crf, false);
ARM64Reg CR = gpr.CR(crf);
if (gpr.IsImm(a)) if (gpr.IsImm(a))
{ {
ComputeRC((s32)gpr.GetImm(a) - inst.SIMM_16, crf); s64 A = static_cast<s32>(gpr.GetImm(a));
MOVI2R(CR, A - B);
return; return;
} }
SXTW(CR, gpr.R(a));
if (B != 0)
{
ARM64Reg WA = gpr.GetReg(); ARM64Reg WA = gpr.GetReg();
SUBI2R(CR, CR, B, EncodeRegTo64(WA));
SUBI2R(WA, gpr.R(a), inst.SIMM_16, WA);
ComputeRC(WA, crf);
gpr.Unlock(WA); gpr.Unlock(WA);
} }
}
void JitArm64::cmpli(UGeckoInstruction inst) void JitArm64::cmpli(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITIntegerOff); JITDISABLE(bJITIntegerOff);
u32 a = inst.RA; u32 a = inst.RA;
u64 B = inst.UIMM;
int crf = inst.CRFD; int crf = inst.CRFD;
gpr.BindCRToRegister(crf, false);
ARM64Reg CR = gpr.CR(crf);
if (gpr.IsImm(a)) if (gpr.IsImm(a))
{ {
ComputeRC((u64)gpr.GetImm(a) - inst.UIMM, crf, false); u64 A = gpr.GetImm(a);
MOVI2R(CR, A - B);
return; return;
} }
if (!inst.UIMM) if (!B)
{ {
ComputeRC(gpr.R(a), crf, false); MOV(DecodeReg(CR), gpr.R(a));
return; return;
} }
gpr.BindCRToRegister(crf, false); SUBI2R(CR, EncodeRegTo64(gpr.R(a)), B, CR);
ARM64Reg XA = gpr.CR(crf);
SUBI2R(XA, EncodeRegTo64(gpr.R(a)), inst.UIMM, XA);
} }
void JitArm64::rlwinmx(UGeckoInstruction inst) void JitArm64::rlwinmx(UGeckoInstruction inst)