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

Jit64: Merge subfx and subfcx 

Again, logic and optimizations are mostly the same so it makes sense.
This commit is contained in:
Sintendo 2021-09-21 23:09:25 +02:00
parent a725eb80ff
commit da9546cb2f
3 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,6 @@ public:
void subfic(UGeckoInstruction inst); void subfic(UGeckoInstruction inst);
void subfx(UGeckoInstruction inst); void subfx(UGeckoInstruction inst);
void subfcx(UGeckoInstruction inst);
void twX(UGeckoInstruction inst); void twX(UGeckoInstruction inst);

4
Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
View File

@ -170,8 +170,8 @@ constexpr std::array<GekkoOPTemplate, 107> s_table31{{
{616, &Jit64::negx}, // negox {616, &Jit64::negx}, // negox
{40, &Jit64::subfx}, // subfx {40, &Jit64::subfx}, // subfx
{552, &Jit64::subfx}, // subfox {552, &Jit64::subfx}, // subfox
{8, &Jit64::subfcx}, // subfcx {8, &Jit64::subfx}, // subfcx
{520, &Jit64::subfcx}, // subfcox {520, &Jit64::subfx}, // subfcox
{136, &Jit64::arithXex}, // subfex {136, &Jit64::arithXex}, // subfex
{648, &Jit64::arithXex}, // subfeox {648, &Jit64::arithXex}, // subfeox
{232, &Jit64::arithXex}, // subfmex {232, &Jit64::arithXex}, // subfmex

57
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -938,10 +938,13 @@ void Jit64::subfx(UGeckoInstruction inst)
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITIntegerOff); JITDISABLE(bJITIntegerOff);
int a = inst.RA, b = inst.RB, d = inst.RD; int a = inst.RA, b = inst.RB, d = inst.RD;
const bool carry = !(inst.SUBOP10 & (1 << 5));
if (a == b) if (a == b)
{ {
gpr.SetImmediate32(d, 0); gpr.SetImmediate32(d, 0);
if (carry)
FinalizeCarry(true);
if (inst.OE) if (inst.OE)
GenerateConstantOverflow(false); GenerateConstantOverflow(false);
} }
@ -949,6 +952,8 @@ void Jit64::subfx(UGeckoInstruction inst)
{ {
s32 i = gpr.SImm32(b), j = gpr.SImm32(a); s32 i = gpr.SImm32(b), j = gpr.SImm32(a);
gpr.SetImmediate32(d, i - j); gpr.SetImmediate32(d, i - j);
if (carry)
FinalizeCarry(j == 0 || Interpreter::Helper_Carry((u32)i, 0u - (u32)j));
if (inst.OE) if (inst.OE)
GenerateConstantOverflow((s64)i - (s64)j); GenerateConstantOverflow((s64)i - (s64)j);
} }
@ -963,16 +968,20 @@ void Jit64::subfx(UGeckoInstruction inst)
{ {
if (d != b) if (d != b)
MOV(32, Rd, Rb); MOV(32, Rd, Rb);
if (carry)
FinalizeCarry(true);
if (inst.OE) if (inst.OE)
GenerateConstantOverflow(false); GenerateConstantOverflow(false);
} }
else if (d == b) else if (d == b)
{ {
SUB(32, Rd, Imm32(j)); SUB(32, Rd, Imm32(j));
if (carry)
FinalizeCarry(CC_NC);
if (inst.OE) if (inst.OE)
GenerateOverflow(); GenerateOverflow();
} }
else if (Rb.IsSimpleReg() && !inst.OE) else if (Rb.IsSimpleReg() && !carry && !inst.OE)
{ {
LEA(32, Rd, MDisp(Rb.GetSimpleReg(), -j)); LEA(32, Rd, MDisp(Rb.GetSimpleReg(), -j));
} }
@ -980,6 +989,8 @@ void Jit64::subfx(UGeckoInstruction inst)
{ {
MOV(32, Rd, Rb); MOV(32, Rd, Rb);
SUB(32, Rd, Imm32(j)); SUB(32, Rd, Imm32(j));
if (carry)
FinalizeCarry(CC_NC);
if (inst.OE) if (inst.OE)
GenerateOverflow(); GenerateOverflow();
} }
@ -993,6 +1004,8 @@ void Jit64::subfx(UGeckoInstruction inst)
if (d != a) if (d != a)
MOV(32, Rd, Ra); MOV(32, Rd, Ra);
NEG(32, Rd); NEG(32, Rd);
if (carry)
FinalizeCarry(CC_NC);
if (inst.OE) if (inst.OE)
GenerateOverflow(); GenerateOverflow();
} }
@ -1003,21 +1016,21 @@ void Jit64::subfx(UGeckoInstruction inst)
RCX64Reg Rd = gpr.Bind(d, RCMode::Write); RCX64Reg Rd = gpr.Bind(d, RCMode::Write);
RegCache::Realize(Ra, Rb, Rd); RegCache::Realize(Ra, Rb, Rd);
if (d == b) if (d == a && d != b)
{
SUB(32, Rd, Ra);
}
else if (d == a)
{ {
// special case, because sub isn't reversible
MOV(32, R(RSCRATCH), Ra); MOV(32, R(RSCRATCH), Ra);
MOV(32, Rd, Rb); MOV(32, Rd, Rb);
SUB(32, Rd, R(RSCRATCH)); SUB(32, Rd, R(RSCRATCH));
} }
else else
{ {
if (d != b)
MOV(32, Rd, Rb); MOV(32, Rd, Rb);
SUB(32, Rd, Ra); SUB(32, Rd, Ra);
} }
if (carry)
FinalizeCarry(CC_NC);
if (inst.OE) if (inst.OE)
GenerateOverflow(); GenerateOverflow();
} }
@ -1818,38 +1831,6 @@ void Jit64::arithXex(UGeckoInstruction inst)
ComputeRC(d); ComputeRC(d);
} }
void Jit64::subfcx(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITIntegerOff);
int a = inst.RA, b = inst.RB, d = inst.RD;
{
RCOpArg Ra = gpr.Use(a, RCMode::Read);
RCOpArg Rb = gpr.Use(b, RCMode::Read);
RCX64Reg Rd = gpr.Bind(d, RCMode::Write);
RegCache::Realize(Ra, Rb, Rd);
if (d == a && d != b)
{
// special case, because sub isn't reversible
MOV(32, R(RSCRATCH), Ra);
MOV(32, Rd, Rb);
SUB(32, Rd, R(RSCRATCH));
}
else
{
if (d != b)
MOV(32, Rd, Rb);
SUB(32, Rd, Ra);
}
}
FinalizeCarryOverflow(inst.OE, true);
if (inst.Rc)
ComputeRC(d);
}
void Jit64::rlwinmx(UGeckoInstruction inst) void Jit64::rlwinmx(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START