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

ArmJit64: Merge FP two operant instructions.

This commit is contained in:
degasus 2016-02-10 16:00:20 +01:00
parent 157404fd1e
commit 52f9912c46
3 changed files with 16 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,10 +138,7 @@ public:
// Floating point // Floating point
void fp_arith(UGeckoInstruction inst); void fp_arith(UGeckoInstruction inst);
void fabsx(UGeckoInstruction inst); void fp_logic(UGeckoInstruction inst);
void fmrx(UGeckoInstruction inst);
void fnabsx(UGeckoInstruction inst);
void fnegx(UGeckoInstruction inst);
void fselx(UGeckoInstruction inst); void fselx(UGeckoInstruction inst);
void fcmpX(UGeckoInstruction inst); void fcmpX(UGeckoInstruction inst);
void frspx(UGeckoInstruction inst); void frspx(UGeckoInstruction inst);

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

@ -17,19 +17,6 @@
using namespace Arm64Gen; using namespace Arm64Gen;
void JitArm64::fabsx(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITFloatingPointOff);
FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_IS_LOADED);
ARM64Reg VD = fpr.RW(d);
m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB));
}
void JitArm64::fp_arith(UGeckoInstruction inst) void JitArm64::fp_arith(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
@ -93,7 +80,7 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
fpr.FixSinglePrecision(d); fpr.FixSinglePrecision(d);
} }
void JitArm64::fmrx(UGeckoInstruction inst) void JitArm64::fp_logic(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITFloatingPointOff); JITDISABLE(bJITFloatingPointOff);
@ -101,39 +88,20 @@ void JitArm64::fmrx(UGeckoInstruction inst)
u32 b = inst.FB, d = inst.FD; u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_IS_LOADED); u32 op10 = inst.SUBOP10;
ARM64Reg VD = fpr.RW(d);
m_float_emit.INS(64, VD, 0, VB, 0);
}
void JitArm64::fnabsx(UGeckoInstruction inst)
{
INSTRUCTION_START
JITDISABLE(bJITFloatingPointOff);
FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_IS_LOADED); ARM64Reg VB = fpr.R(b, REG_IS_LOADED);
ARM64Reg VD = fpr.RW(d); ARM64Reg VD = fpr.RW(d);
m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); switch (op10)
m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VD)); {
} case 40: m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); break;
case 72: m_float_emit.INS(64, VD, 0, VB, 0); break;
void JitArm64::fnegx(UGeckoInstruction inst) case 136: m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB));
{ m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VD)); break;
INSTRUCTION_START case 264: m_float_emit.FABS(EncodeRegToDouble(VD), EncodeRegToDouble(VB)); break;
JITDISABLE(bJITFloatingPointOff); default: _assert_msg_(DYNA_REC, 0, "fp_logic WTF!!!");
FALLBACK_IF(inst.Rc); }
u32 b = inst.FB, d = inst.FD;
ARM64Reg VB = fpr.R(b, REG_IS_LOADED);
ARM64Reg VD = fpr.RW(d);
m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VB));
} }
void JitArm64::fselx(UGeckoInstruction inst) void JitArm64::fselx(UGeckoInstruction inst)

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

@ -326,14 +326,14 @@ static GekkoOPTemplate table59[] =
static GekkoOPTemplate table63[] = static GekkoOPTemplate table63[] =
{ {
{264, &JitArm64::fabsx}, // fabsx {264, &JitArm64::fp_logic}, // fabsx
{32, &JitArm64::fcmpX}, // fcmpo {32, &JitArm64::fcmpX}, // fcmpo
{0, &JitArm64::fcmpX}, // fcmpu {0, &JitArm64::fcmpX}, // fcmpu
{14, &JitArm64::FallBackToInterpreter}, // fctiwx {14, &JitArm64::FallBackToInterpreter}, // fctiwx
{15, &JitArm64::fctiwzx}, // fctiwzx {15, &JitArm64::fctiwzx}, // fctiwzx
{72, &JitArm64::fmrx}, // fmrx {72, &JitArm64::fp_logic}, // fmrx
{136, &JitArm64::fnabsx}, // fnabsx {136, &JitArm64::fp_logic}, // fnabsx
{40, &JitArm64::fnegx}, // fnegx {40, &JitArm64::fp_logic}, // fnegx
{12, &JitArm64::frspx}, // frspx {12, &JitArm64::frspx}, // frspx
{64, &JitArm64::FallBackToInterpreter}, // mcrfs {64, &JitArm64::FallBackToInterpreter}, // mcrfs