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

JitArm64: Merge PS stuff into fp_logic.

This commit is contained in:
degasus 2016-02-11 00:28:05 +01:00
parent 52f9912c46
commit 2d8e1bc34d
4 changed files with 37 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,17 +145,13 @@ public:
void fctiwzx(UGeckoInstruction inst); void fctiwzx(UGeckoInstruction inst);
// Paired // Paired
void ps_abs(UGeckoInstruction inst);
void ps_madd(UGeckoInstruction inst); void ps_madd(UGeckoInstruction inst);
void ps_maddsX(UGeckoInstruction inst); void ps_maddsX(UGeckoInstruction inst);
void ps_mergeXX(UGeckoInstruction inst); void ps_mergeXX(UGeckoInstruction inst);
void ps_mr(UGeckoInstruction inst);
void ps_msub(UGeckoInstruction inst); void ps_msub(UGeckoInstruction inst);
void ps_mulsX(UGeckoInstruction inst); void ps_mulsX(UGeckoInstruction inst);
void ps_nabs(UGeckoInstruction inst);
void ps_nmadd(UGeckoInstruction inst); void ps_nmadd(UGeckoInstruction inst);
void ps_nmsub(UGeckoInstruction inst); void ps_nmsub(UGeckoInstruction inst);
void ps_neg(UGeckoInstruction inst);
void ps_res(UGeckoInstruction inst); void ps_res(UGeckoInstruction inst);
void ps_sel(UGeckoInstruction inst); void ps_sel(UGeckoInstruction inst);
void ps_sum0(UGeckoInstruction inst); void ps_sum0(UGeckoInstruction inst);

43
Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
View File

@ -87,20 +87,43 @@ void JitArm64::fp_logic(UGeckoInstruction inst)
FALLBACK_IF(inst.Rc); FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD; u32 b = inst.FB, d = inst.FD;
u32 op10 = inst.SUBOP10; u32 op10 = inst.SUBOP10;
ARM64Reg VB = fpr.R(b, REG_IS_LOADED); bool packed = inst.OPCD == 4;
ARM64Reg VD = fpr.RW(d);
switch (op10) // MR with source === dest => no-op
if (op10 == 72 && b == d)
return;
if (packed)
{ {
case 40: m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); break; ARM64Reg VB = fpr.R(b, REG_REG);
case 72: m_float_emit.INS(64, VD, 0, VB, 0); break; ARM64Reg VD = fpr.RW(d, REG_REG);
case 136: m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB));
m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VD)); break; switch (op10)
case 264: m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); break; {
default: _assert_msg_(DYNA_REC, 0, "fp_logic WTF!!!"); case 40: m_float_emit.FNEG(64, VD, VB); break;
case 72: m_float_emit.ORR(VD, VB, VB); break;
case 136: m_float_emit.FABS(64, VD, VB);
m_float_emit.FNEG(64, VD, VD); break;
case 264: m_float_emit.FABS(64, VD, VB); break;
default: _assert_msg_(DYNA_REC, 0, "fp_logic"); break;
}
}
else
{
ARM64Reg VB = fpr.R(b, REG_IS_LOADED);
ARM64Reg VD = fpr.RW(d);
switch (op10)
{
case 40: m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); break;
case 72: m_float_emit.INS(64, VD, 0, VB, 0); break;
case 136: m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB));
m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VD)); break;
case 264: m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); break;
default: _assert_msg_(DYNA_REC, 0, "fp_logic"); break;
}
} }
} }

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

@ -17,20 +17,6 @@
using namespace Arm64Gen; using namespace Arm64Gen;
void JitArm64::ps_abs(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITPairedOff);
FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_REG);
ARM64Reg VD = fpr.RW(d, REG_REG);
m_float_emit.FABS(64, VD, VB);
}
void JitArm64::ps_madd(UGeckoInstruction inst) void JitArm64::ps_madd(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
@ -123,23 +109,6 @@ void JitArm64::ps_mergeXX(UGeckoInstruction inst)
} }
} }
void JitArm64::ps_mr(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITPairedOff);
FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD;
if (d == b)
return;
ARM64Reg VB = fpr.R(b, REG_REG);
ARM64Reg VD = fpr.RW(d, REG_REG);
m_float_emit.ORR(VD, VB, VB);
}
void JitArm64::ps_mulsX(UGeckoInstruction inst) void JitArm64::ps_mulsX(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
@ -184,35 +153,6 @@ void JitArm64::ps_msub(UGeckoInstruction inst)
fpr.Unlock(V0); fpr.Unlock(V0);
} }
void JitArm64::ps_nabs(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITPairedOff);
FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_REG);
ARM64Reg VD = fpr.RW(d, REG_REG);
m_float_emit.FABS(64, VD, VB);
m_float_emit.FNEG(64, VD, VD);
}
void JitArm64::ps_neg(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITPairedOff);
FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_REG);
ARM64Reg VD = fpr.RW(d, REG_REG);
m_float_emit.FNEG(64, VD, VB);
}
void JitArm64::ps_nmadd(UGeckoInstruction inst) void JitArm64::ps_nmadd(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START

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

@ -104,11 +104,11 @@ static GekkoOPTemplate table4[] =
{ //SUBOP10 { //SUBOP10
{0, &JitArm64::FallBackToInterpreter}, // ps_cmpu0 {0, &JitArm64::FallBackToInterpreter}, // ps_cmpu0
{32, &JitArm64::FallBackToInterpreter}, // ps_cmpo0 {32, &JitArm64::FallBackToInterpreter}, // ps_cmpo0
{40, &JitArm64::ps_neg}, // ps_neg {40, &JitArm64::fp_logic}, // ps_neg
{136, &JitArm64::ps_nabs}, // ps_nabs {136, &JitArm64::fp_logic}, // ps_nabs
{264, &JitArm64::ps_abs}, // ps_abs {264, &JitArm64::fp_logic}, // ps_abs
{64, &JitArm64::FallBackToInterpreter}, // ps_cmpu1 {64, &JitArm64::FallBackToInterpreter}, // ps_cmpu1
{72, &JitArm64::ps_mr}, // ps_mr {72, &JitArm64::fp_logic}, // ps_mr
{96, &JitArm64::FallBackToInterpreter}, // ps_cmpo1 {96, &JitArm64::FallBackToInterpreter}, // ps_cmpo1
{528, &JitArm64::ps_mergeXX}, // ps_merge00 {528, &JitArm64::ps_mergeXX}, // ps_merge00
{560, &JitArm64::ps_mergeXX}, // ps_merge01 {560, &JitArm64::ps_mergeXX}, // ps_merge01