diff --git a/src/Cafe/HW/Espresso/Recompiler/BackendX64/BackendX64FPU.cpp b/src/Cafe/HW/Espresso/Recompiler/BackendX64/BackendX64FPU.cpp index 0faf8cc8..b085755d 100644 --- a/src/Cafe/HW/Espresso/Recompiler/BackendX64/BackendX64FPU.cpp +++ b/src/Cafe/HW/Espresso/Recompiler/BackendX64/BackendX64FPU.cpp @@ -140,6 +140,57 @@ bool PPCRecompilerX64Gen_imlInstruction_fpr_load(PPCRecFunction_t* PPCRecFunctio return true; } +// stfs truncates instead of rounding, so preserve tiny values explicitly +static void PPCRecompilerX64Gen_fprConvertToSingleBits(x64GenContext_t* x64GenContext, sint32 realRegisterXMM) +{ + // doubling removes the sign, so one comparison covers exponents 874-896 + x64Gen_pextrw_reg32_xmmReg(x64GenContext, REG_RESV_TEMP, realRegisterXMM, 3); + x64Gen_lea_reg32_scaledIndex(x64GenContext, REG_RESV_TEMP, REG_RESV_TEMP, 1, -(874 << 5)); + x64Gen_cmp_reg16_imm16(x64GenContext, REG_RESV_TEMP, 23 << 5); + const sint32 denormalJump = x64GenContext->emitter->GetWriteIndex(); + x64Gen_jmpc_far(x64GenContext, X86_CONDITION_UNSIGNED_BELOW, 0); + + x64Gen_movq_reg64_xmmReg(x64GenContext, REG_RESV_TEMP, realRegisterXMM); + if (g_CPUFeatures.x86.fastPext) + { + x64Gen_pext_reg64_reg64_mem64Reg64(x64GenContext, REG_RESV_TEMP, REG_RESV_TEMP, + REG_RESV_RECDATA, offsetof(PPCRecompilerInstanceData_t, _x64_pextSingleMask)); + } + else + { + // rotate the unwanted exponent bits into the low byte, then shift them out + x64Gen_rol_reg64_imm8(x64GenContext, REG_RESV_TEMP, 5); + x64Gen_shr_reg8_imm8(x64GenContext, REG_RESV_TEMP, 3); + x64Gen_rol_reg64_imm8(x64GenContext, REG_RESV_TEMP, 30); + } + const sint32 resume = x64GenContext->emitter->GetWriteIndex(); + const bool avx = g_CPUFeatures.x86.avx; + x64GenContext->m_coldCode.emplace_back([denormalJump, resume, realRegisterXMM, avx](x64GenContext_t* x64GenContext) + { + PPCRecompilerX64Gen_redirectRelativeJump(x64GenContext, denormalJump, x64GenContext->emitter->GetWriteIndex()); + // scale denormals before extracting the mantissa + if (avx) + x64Gen_avx_VMULSD_xmm_xmm_mem64Reg64(x64GenContext, REG_RESV_FPR_TEMP, realRegisterXMM, + REG_RESV_RECDATA, offsetof(PPCRecompilerInstanceData_t, _x64XMM_constDouble2p149)); + else + { + x64Gen_movsd_xmmReg_memReg64(x64GenContext, REG_RESV_FPR_TEMP, REG_RESV_RECDATA, + offsetof(PPCRecompilerInstanceData_t, _x64XMM_constDouble2p149)); + x64Gen_mulsd_xmmReg_xmmReg(x64GenContext, REG_RESV_FPR_TEMP, realRegisterXMM); + } + x64Gen_cvttsd2si_reg64Low_xmmReg(x64GenContext, REG_RESV_TEMP, REG_RESV_FPR_TEMP); + x64Gen_test_reg64Low32_reg64Low32(x64GenContext, REG_RESV_TEMP, REG_RESV_TEMP); + const sint32 positiveJump = x64GenContext->emitter->GetWriteIndex(); + x64Gen_jmpc_far(x64GenContext, X86_CONDITION_NOT_SIGN, 0); + PPCRecompilerX64Gen_redirectRelativeJump(x64GenContext, positiveJump, resume); + x64Gen_neg_reg64Low32(x64GenContext, REG_RESV_TEMP); + x64Gen_or_reg64Low32_imm32(x64GenContext, REG_RESV_TEMP, 0x80000000u); + const sint32 doneJump = x64GenContext->emitter->GetWriteIndex(); + x64Gen_jmpc_far(x64GenContext, X86_CONDITION_NONE, 0); + PPCRecompilerX64Gen_redirectRelativeJump(x64GenContext, doneJump, resume); + }); +} + // store to memory bool PPCRecompilerX64Gen_imlInstruction_fpr_store(PPCRecFunction_t* PPCRecFunction, ppcImlGenContext_t* ppcImlGenContext, x64GenContext_t* x64GenContext, IMLInstruction* imlInstruction, bool indexed) { @@ -156,11 +207,15 @@ bool PPCRecompilerX64Gen_imlInstruction_fpr_store(PPCRecFunction_t* PPCRecFuncti // value is already in single format x64Gen_movd_reg64Low32_xmmReg(x64GenContext, REG_RESV_TEMP, realRegisterXMM); } - else + else if (mode == PPCREC_FPR_ST_MODE_SINGLE_FTZ) { x64Gen_cvtsd2ss_xmmReg_xmmReg(x64GenContext, REG_RESV_FPR_TEMP, realRegisterXMM); x64Gen_movd_reg64Low32_xmmReg(x64GenContext, REG_RESV_TEMP, REG_RESV_FPR_TEMP); } + else + { + PPCRecompilerX64Gen_fprConvertToSingleBits(x64GenContext, realRegisterXMM); + } if(g_CPUFeatures.x86.movbe == false ) x64Gen_bswap_reg64Lower32bit(x64GenContext, REG_RESV_TEMP); if( indexed ) diff --git a/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.cpp b/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.cpp index fae51279..7cd9db6f 100644 --- a/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.cpp +++ b/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.cpp @@ -628,8 +628,8 @@ void PPCRecompiler_initPlatform() ppcRecompilerInstanceData->_x64XMM_andFloatAbsMaskBottom[1] = 0xFFFFFFFF; ppcRecompilerInstanceData->_x64XMM_andFloatAbsMaskBottom[2] = 0xFFFFFFFF; ppcRecompilerInstanceData->_x64XMM_andFloatAbsMaskBottom[3] = 0xFFFFFFFF; - ppcRecompilerInstanceData->_x64XMM_singleWordMask[0] = 0xFFFFFFFFULL; - ppcRecompilerInstanceData->_x64XMM_singleWordMask[1] = 0ULL; + ppcRecompilerInstanceData->_x64XMM_constDouble2p149[0] = 0x1p149; + ppcRecompilerInstanceData->_x64XMM_constDouble2p149[1] = 0.0; ppcRecompilerInstanceData->_x64XMM_constDouble1_1[0] = 1.0; ppcRecompilerInstanceData->_x64XMM_constDouble1_1[1] = 1.0; ppcRecompilerInstanceData->_x64XMM_constDouble0_0[0] = 0.0; @@ -652,6 +652,7 @@ void PPCRecompiler_initPlatform() // mxcsr ppcRecompilerInstanceData->_x64XMM_mxCsr_ftzOn = 0x1F80 | 0x8000; ppcRecompilerInstanceData->_x64XMM_mxCsr_ftzOff = 0x1F80; + ppcRecompilerInstanceData->_x64_pextSingleMask = 0xC7FFFFFFE0000000ULL; // sign, exponent bit 62, then bits 58-29 } #else void PPCRecompiler_initPlatform() diff --git a/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.h b/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.h index fc864076..7e5be9fd 100644 --- a/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.h +++ b/src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.h @@ -137,7 +137,7 @@ typedef struct alignas(16) uint64 _x64XMM_andAbsMaskBottom[2]; alignas(16) uint64 _x64XMM_andAbsMaskPair[2]; alignas(16) uint32 _x64XMM_andFloatAbsMaskBottom[4]; - alignas(16) uint64 _x64XMM_singleWordMask[2]; + alignas(16) double _x64XMM_constDouble2p149[2]; alignas(16) double _x64XMM_constDouble1_1[2]; alignas(16) double _x64XMM_constDouble0_0[2]; alignas(16) float _x64XMM_constFloat0_0[2]; @@ -148,6 +148,8 @@ typedef struct // MXCSR uint32 _x64XMM_mxCsr_ftzOn; uint32 _x64XMM_mxCsr_ftzOff; + // GPR masks + uint64 _x64_pextSingleMask; }PPCRecompilerInstanceData_t; extern PPCRecompilerInstanceData_t* ppcRecompilerInstanceData;