diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h index 857bf5a91d..43e3b44b23 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h @@ -118,6 +118,7 @@ public: void mfcr(UGeckoInstruction inst); void mtcrf(UGeckoInstruction inst); void mcrfs(UGeckoInstruction inst); + void mffsx(UGeckoInstruction inst); // LoadStore void lXX(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp index 22a02b87f7..3815123850 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp @@ -723,3 +723,35 @@ void JitArm64::mcrfs(UGeckoInstruction inst) gpr.Unlock(WA); } + +void JitArm64::mffsx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff); + FALLBACK_IF(inst.Rc); + + ARM64Reg WA = gpr.GetReg(); + ARM64Reg XA = EncodeRegTo64(WA); + + LDR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(fpscr)); + + ARM64Reg VD = fpr.RW(inst.FD, RegType::LowerPair); + ARM64Reg WB = gpr.GetReg(); + + // FPSCR.FEX = 0; + // FPSCR.VX = (FPSCR.Hex & FPSCR_VX_ANY) != 0; + // (FEX is right next to VX, so we can set both using one BFI instruction) + MOVI2R(WB, FPSCR_VX_ANY); + TST(WA, WB); + CSET(WB, CCFlags::CC_NEQ); + BFI(WA, WB, 31 - 2, 2); + + STR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(fpscr)); + + // Vd = FPSCR.Hex | 0xFFF8'0000'0000'0000; + ORR(XA, XA, 13, 12, true); + m_float_emit.FMOV(EncodeRegToDouble(VD), XA); + + gpr.Unlock(WA); + gpr.Unlock(WB); +} diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp index 2b1fd32a9c..da8fb78682 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp @@ -315,7 +315,7 @@ constexpr std::array table63{{ {12, &JitArm64::frspx}, // frspx {64, &JitArm64::mcrfs}, // mcrfs - {583, &JitArm64::FallBackToInterpreter}, // mffsx + {583, &JitArm64::mffsx}, // mffsx {70, &JitArm64::FallBackToInterpreter}, // mtfsb0x {38, &JitArm64::FallBackToInterpreter}, // mtfsb1x {134, &JitArm64::FallBackToInterpreter}, // mtfsfix