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

JitArm64: Implement addmex/subfmex

This commit is contained in:
JosJuice 2021-06-17 15:17:17 +02:00
parent cfcc994f6c
commit fc60e62622
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -966,11 +966,12 @@ void JitArm64::subfex(UGeckoInstruction inst)
JITDISABLE(bJITIntegerOff); JITDISABLE(bJITIntegerOff);
FALLBACK_IF(inst.OE); FALLBACK_IF(inst.OE);
bool mex = inst.SUBOP10 & 32;
int a = inst.RA, b = inst.RB, d = inst.RD; int a = inst.RA, b = inst.RB, d = inst.RD;
if (gpr.IsImm(a) && gpr.IsImm(b)) if (gpr.IsImm(a) && (mex || gpr.IsImm(b)))
{ {
u32 i = gpr.GetImm(a), j = gpr.GetImm(b); u32 i = gpr.GetImm(a), j = mex ? -1 : gpr.GetImm(b);
gpr.BindToRegister(d, false); gpr.BindToRegister(d, false);
@ -1023,18 +1024,23 @@ void JitArm64::subfex(UGeckoInstruction inst)
else else
{ {
gpr.BindToRegister(d, d == a || d == b); gpr.BindToRegister(d, d == a || d == b);
ARM64Reg RB = mex ? gpr.GetReg() : gpr.R(b);
if (mex)
MOVI2R(RB, -1);
if (js.carryFlag == CarryFlag::ConstantTrue) if (js.carryFlag == CarryFlag::ConstantTrue)
{ {
CARRY_IF_NEEDED(SUB, SUBS, gpr.R(d), gpr.R(b), gpr.R(a)); CARRY_IF_NEEDED(SUB, SUBS, gpr.R(d), RB, gpr.R(a));
} }
else else
{ {
LoadCarry(); LoadCarry();
CARRY_IF_NEEDED(SBC, SBCS, gpr.R(d), gpr.R(b), gpr.R(a)); CARRY_IF_NEEDED(SBC, SBCS, gpr.R(d), RB, gpr.R(a));
} }
ComputeCarry(); ComputeCarry();
if (mex)
gpr.Unlock(RB);
} }
if (inst.Rc) if (inst.Rc)
@ -1154,11 +1160,12 @@ void JitArm64::addex(UGeckoInstruction inst)
JITDISABLE(bJITIntegerOff); JITDISABLE(bJITIntegerOff);
FALLBACK_IF(inst.OE); FALLBACK_IF(inst.OE);
bool mex = inst.SUBOP10 & 32;
int a = inst.RA, b = inst.RB, d = inst.RD; int a = inst.RA, b = inst.RB, d = inst.RD;
if (gpr.IsImm(a) && gpr.IsImm(b)) if (gpr.IsImm(a) && (mex || gpr.IsImm(b)))
{ {
u32 i = gpr.GetImm(a), j = gpr.GetImm(b); u32 i = gpr.GetImm(a), j = mex ? -1 : gpr.GetImm(b);
gpr.BindToRegister(d, false); gpr.BindToRegister(d, false);
@ -1211,18 +1218,23 @@ void JitArm64::addex(UGeckoInstruction inst)
else else
{ {
gpr.BindToRegister(d, d == a || d == b); gpr.BindToRegister(d, d == a || d == b);
ARM64Reg RB = mex ? gpr.GetReg() : gpr.R(b);
if (mex)
MOVI2R(RB, -1);
if (js.carryFlag == CarryFlag::ConstantFalse) if (js.carryFlag == CarryFlag::ConstantFalse)
{ {
CARRY_IF_NEEDED(ADD, ADDS, gpr.R(d), gpr.R(a), gpr.R(b)); CARRY_IF_NEEDED(ADD, ADDS, gpr.R(d), gpr.R(a), RB);
} }
else else
{ {
LoadCarry(); LoadCarry();
CARRY_IF_NEEDED(ADC, ADCS, gpr.R(d), gpr.R(a), gpr.R(b)); CARRY_IF_NEEDED(ADC, ADCS, gpr.R(d), gpr.R(a), RB);
} }
ComputeCarry(); ComputeCarry();
if (mex)
gpr.Unlock(RB);
} }
if (inst.Rc) if (inst.Rc)

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

@ -150,36 +150,36 @@ constexpr std::array<GekkoOPTemplate, 13> table19{{
}}; }};
constexpr std::array<GekkoOPTemplate, 107> table31{{ constexpr std::array<GekkoOPTemplate, 107> table31{{
{266, &JitArm64::addx}, // addx {266, &JitArm64::addx}, // addx
{778, &JitArm64::addx}, // addox {778, &JitArm64::addx}, // addox
{10, &JitArm64::addcx}, // addcx {10, &JitArm64::addcx}, // addcx
{522, &JitArm64::addcx}, // addcox {522, &JitArm64::addcx}, // addcox
{138, &JitArm64::addex}, // addex {138, &JitArm64::addex}, // addex
{650, &JitArm64::addex}, // addeox {650, &JitArm64::addex}, // addeox
{234, &JitArm64::FallBackToInterpreter}, // addmex {234, &JitArm64::addex}, // addmex
{746, &JitArm64::FallBackToInterpreter}, // addmeox {746, &JitArm64::addex}, // addmeox
{202, &JitArm64::addzex}, // addzex {202, &JitArm64::addzex}, // addzex
{714, &JitArm64::addzex}, // addzeox {714, &JitArm64::addzex}, // addzeox
{491, &JitArm64::divwx}, // divwx {491, &JitArm64::divwx}, // divwx
{1003, &JitArm64::divwx}, // divwox {1003, &JitArm64::divwx}, // divwox
{459, &JitArm64::divwux}, // divwux {459, &JitArm64::divwux}, // divwux
{971, &JitArm64::divwux}, // divwuox {971, &JitArm64::divwux}, // divwuox
{75, &JitArm64::mulhwx}, // mulhwx {75, &JitArm64::mulhwx}, // mulhwx
{11, &JitArm64::mulhwux}, // mulhwux {11, &JitArm64::mulhwux}, // mulhwux
{235, &JitArm64::mullwx}, // mullwx {235, &JitArm64::mullwx}, // mullwx
{747, &JitArm64::mullwx}, // mullwox {747, &JitArm64::mullwx}, // mullwox
{104, &JitArm64::negx}, // negx {104, &JitArm64::negx}, // negx
{616, &JitArm64::negx}, // negox {616, &JitArm64::negx}, // negox
{40, &JitArm64::subfx}, // subfx {40, &JitArm64::subfx}, // subfx
{552, &JitArm64::subfx}, // subfox {552, &JitArm64::subfx}, // subfox
{8, &JitArm64::subfcx}, // subfcx {8, &JitArm64::subfcx}, // subfcx
{520, &JitArm64::subfcx}, // subfcox {520, &JitArm64::subfcx}, // subfcox
{136, &JitArm64::subfex}, // subfex {136, &JitArm64::subfex}, // subfex
{648, &JitArm64::subfex}, // subfeox {648, &JitArm64::subfex}, // subfeox
{232, &JitArm64::FallBackToInterpreter}, // subfmex {232, &JitArm64::subfex}, // subfmex
{744, &JitArm64::FallBackToInterpreter}, // subfmeox {744, &JitArm64::subfex}, // subfmeox
{200, &JitArm64::subfzex}, // subfzex {200, &JitArm64::subfzex}, // subfzex
{712, &JitArm64::subfzex}, // subfzeox {712, &JitArm64::subfzex}, // subfzeox
{28, &JitArm64::boolX}, // andx {28, &JitArm64::boolX}, // andx
{60, &JitArm64::boolX}, // andcx {60, &JitArm64::boolX}, // andcx