From ddc90ee550567302c85fa3ee13a7c776f6cc9dbc Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 8 Nov 2014 09:39:55 -0800 Subject: [PATCH] x86jit: Implement vfad and vavg. --- Core/MIPS/x86/CompVFPU.cpp | 39 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/Core/MIPS/x86/CompVFPU.cpp b/Core/MIPS/x86/CompVFPU.cpp index e8044eeac4..bd1f4f664a 100644 --- a/Core/MIPS/x86/CompVFPU.cpp +++ b/Core/MIPS/x86/CompVFPU.cpp @@ -2226,16 +2226,51 @@ void Jit::Comp_Vi2x(MIPSOpcode op) { DISABLE; } +static const float MEMORY_ALIGNED16( vavg_table[4] ) = {1.0f, 1.0f / 2.0f, 1.0f / 3.0f, 1.0f / 4.0f}; + void Jit::Comp_Vhoriz(MIPSOpcode op) { - DISABLE; + CONDITIONAL_DISABLE; + + if (js.HasUnknownPrefix()) + DISABLE; + + VectorSize sz = GetVecSize(op); + int n = GetNumVectorElements(sz); + + u8 sregs[4], dregs[1]; + GetVectorRegsPrefixS(sregs, sz, _VS); + GetVectorRegsPrefixD(dregs, V_Single, _VD); + + X64Reg reg = XMM0; + if (IsOverlapSafeAllowS(dregs[0], 0, n, sregs)) { + fpr.MapRegV(dregs[0], (dregs[0] == sregs[0] ? 0 : MAP_NOINIT) | MAP_DIRTY); + fpr.SpillLockV(dregs[0]); + reg = fpr.VX(dregs[0]); + } + + // We use a temp reg in case of overlap. + if (!fpr.V(sregs[0]).IsSimpleReg(reg)) { + MOVSS(reg, fpr.V(sregs[0])); + } + for (int i = 1; i < n; ++i) { + ADDSS(reg, fpr.V(sregs[i])); + } - // Do any games use these a noticable amount? switch ((op >> 16) & 31) { case 6: // vfad break; case 7: // vavg + MOVSS(XMM1, M(&vavg_table[n])); + MULSS(reg, R(XMM1)); break; } + + if (reg == XMM0) { + MOVSS(fpr.V(dregs[0]), XMM0); + } + + ApplyPrefixD(dregs, V_Single); + fpr.ReleaseSpillLocks(); } void Jit::Comp_Viim(MIPSOpcode op) {