Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JitArm64: fix addzex #2839

Merged
merged 2 commits into from Aug 13, 2015
Merged

JitArm64: fix addzex #2839

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7fa22a
JitArm64: fix addzex
degasus Aug 13, 2015
4ef2962
JitArm64: optimize addzex
degasus Aug 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 15 additions & 10 deletions Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
View file
Open in desktop
Expand Up @@ -678,18 +678,23 @@ void JitArm64::addzex(UGeckoInstruction inst)
JITDISABLE(bJITIntegerOff);
FALLBACK_IF(inst.OE);

// breaks Kirby
FALLBACK_IF(1);

int a = inst.RA, d = inst.RD;

gpr.BindToRegister(d, d == a);
ARM64Reg WA = gpr.GetReg();
LDRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
CMP(WA, 0);
CSINC(gpr.R(d), gpr.R(a), gpr.R(a), CC_EQ);
CMP(gpr.R(d), 0);
gpr.Unlock(WA);
if (d == a)
{
gpr.BindToRegister(d, true);
ARM64Reg WA = gpr.GetReg();
LDRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
ADDS(gpr.R(d), gpr.R(a), WA);
gpr.Unlock(WA);
}
else
{
gpr.BindToRegister(d, false);
LDRB(INDEX_UNSIGNED, gpr.R(d), X29, PPCSTATE_OFF(xer_ca));
ADDS(gpr.R(d), gpr.R(a), gpr.R(d));
}

ComputeCarry();
if (inst.Rc)
ComputeRC(gpr.R(d), 0);
Expand Down