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

x86emitter: Make SSE_MXCSR not dependent on emitter

This commit is contained in:
Stenzek 2023-12-26 18:20:41 +10:00 committed by Connor McLaughlin
parent f461bc9176
commit 86edc0dbe2
5 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/emitter/simd.cpp
View File

@ -64,11 +64,6 @@ SSE_MXCSR& SSE_MXCSR::DisableExceptions()
return *this; return *this;
} }
SSE_MXCSR::operator x86Emitter::xIndirect32() const
{
return x86Emitter::ptr32[&bitmask];
}
namespace x86Emitter namespace x86Emitter
{ {

9
common/emitter/tools.h
View File

@ -17,13 +17,6 @@ enum SSE_RoundMode
ImplementEnumOperators(SSE_RoundMode); ImplementEnumOperators(SSE_RoundMode);
// Predeclaration for xIndirect32
namespace x86Emitter
{
template <typename T>
class xIndirect;
typedef xIndirect<u32> xIndirect32;
} // namespace x86Emitter
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// SSE_MXCSR - Control/Status Register (bitfield) // SSE_MXCSR - Control/Status Register (bitfield)
@ -79,6 +72,4 @@ union SSE_MXCSR
{ {
return bitmask != right.bitmask; return bitmask != right.bitmask;
} }
operator x86Emitter::xIndirect32() const;
}; };

10
pcsx2/x86/iFPU.cpp
View File

@ -1111,7 +1111,7 @@ void recDIV_S_xmm(int info)
roundmode_neg = g_sseMXCSR; roundmode_neg = g_sseMXCSR;
roundmode_neg.SetRoundMode(SSEround_NegInf); roundmode_neg.SetRoundMode(SSEround_NegInf);
xLDMXCSR(roundmode_neg); xLDMXCSR(ptr32[&roundmode_neg.bitmask]);
roundmodeFlag = true; roundmodeFlag = true;
} }
} }
@ -1124,7 +1124,7 @@ void recDIV_S_xmm(int info)
roundmode_nearest = g_sseMXCSR; roundmode_nearest = g_sseMXCSR;
roundmode_nearest.SetRoundMode(SSEround_Nearest); roundmode_nearest.SetRoundMode(SSEround_Nearest);
xLDMXCSR(roundmode_nearest); xLDMXCSR(ptr32[&roundmode_nearest.bitmask]);
roundmodeFlag = true; roundmodeFlag = true;
} }
} }
@ -1191,7 +1191,7 @@ void recDIV_S_xmm(int info)
break; break;
} }
if (roundmodeFlag) if (roundmodeFlag)
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR.bitmask]);
_freeXMMreg(t0reg); _freeXMMreg(t0reg);
} }
@ -1774,7 +1774,7 @@ void recSQRT_S_xmm(int info)
//Console.WriteLn("sqrt to nearest"); //Console.WriteLn("sqrt to nearest");
roundmode_nearest = g_sseMXCSR; roundmode_nearest = g_sseMXCSR;
roundmode_nearest.SetRoundMode(SSEround_Nearest); roundmode_nearest.SetRoundMode(SSEround_Nearest);
xLDMXCSR(roundmode_nearest); xLDMXCSR(ptr32[&roundmode_nearest.bitmask]);
roundmodeFlag = true; roundmodeFlag = true;
} }
@ -1805,7 +1805,7 @@ void recSQRT_S_xmm(int info)
ClampValues(EEREC_D); ClampValues(EEREC_D);
if (roundmodeFlag) if (roundmodeFlag)
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR.bitmask]);
} }
FPURECOMPILE_CONSTCODE(SQRT_S, XMMINFO_WRITED | XMMINFO_READT); FPURECOMPILE_CONSTCODE(SQRT_S, XMMINFO_WRITED | XMMINFO_READT);

14
pcsx2/x86/iFPUd.cpp
View File

@ -669,7 +669,7 @@ void recDIV_S_xmm(int info)
roundmode_neg = g_sseMXCSR; roundmode_neg = g_sseMXCSR;
roundmode_neg.SetRoundMode(SSEround_NegInf); roundmode_neg.SetRoundMode(SSEround_NegInf);
xLDMXCSR(roundmode_neg); xLDMXCSR(ptr32[&roundmode_neg.bitmask]);
roundmodeFlag = true; roundmodeFlag = true;
} }
} }
@ -682,7 +682,7 @@ void recDIV_S_xmm(int info)
roundmode_nearest = g_sseMXCSR; roundmode_nearest = g_sseMXCSR;
roundmode_nearest.SetRoundMode(SSEround_Nearest); roundmode_nearest.SetRoundMode(SSEround_Nearest);
xLDMXCSR(roundmode_nearest); xLDMXCSR(ptr32[&roundmode_nearest.bitmask]);
roundmodeFlag = true; roundmodeFlag = true;
} }
} }
@ -699,7 +699,7 @@ void recDIV_S_xmm(int info)
xMOVSS(xRegisterSSE(EEREC_D), xRegisterSSE(sreg)); xMOVSS(xRegisterSSE(EEREC_D), xRegisterSSE(sreg));
if (roundmodeFlag) if (roundmodeFlag)
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR]);
_freeXMMreg(sreg); _freeXMMreg(treg); _freeXMMreg(sreg); _freeXMMreg(treg);
} }
@ -958,7 +958,7 @@ void recSQRT_S_xmm(int info)
//Console.WriteLn("sqrt to nearest"); //Console.WriteLn("sqrt to nearest");
roundmode_nearest = g_sseMXCSR; roundmode_nearest = g_sseMXCSR;
roundmode_nearest.SetRoundMode(SSEround_Nearest); roundmode_nearest.SetRoundMode(SSEround_Nearest);
xLDMXCSR(roundmode_nearest); xLDMXCSR(ptr32[&roundmode_nearest.bitmask]);
roundmodeFlag = 1; roundmodeFlag = 1;
} }
@ -989,7 +989,7 @@ void recSQRT_S_xmm(int info)
ToPS2FPU(EEREC_D, false, t1reg, false); ToPS2FPU(EEREC_D, false, t1reg, false);
if (roundmodeFlag == 1) if (roundmodeFlag == 1)
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR.bitmask]);
_freeXMMreg(t1reg); _freeXMMreg(t1reg);
} }
@ -1080,7 +1080,7 @@ void recRSQRT_S_xmm(int info)
//Console.WriteLn("sqrt to nearest"); //Console.WriteLn("sqrt to nearest");
roundmode_nearest = g_sseMXCSR; roundmode_nearest = g_sseMXCSR;
roundmode_nearest.SetRoundMode(SSEround_Nearest); roundmode_nearest.SetRoundMode(SSEround_Nearest);
xLDMXCSR(roundmode_nearest); xLDMXCSR(ptr32[&roundmode_nearest.bitmask]);
roundmodeFlag = true; roundmodeFlag = true;
} }
@ -1096,7 +1096,7 @@ void recRSQRT_S_xmm(int info)
_freeXMMreg(treg); _freeXMMreg(sreg); _freeXMMreg(treg); _freeXMMreg(sreg);
if (roundmodeFlag) if (roundmodeFlag)
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR.bitmask]);
} }
FPURECOMPILE_CONSTCODE(RSQRT_S, XMMINFO_WRITED | XMMINFO_READS | XMMINFO_READT); FPURECOMPILE_CONSTCODE(RSQRT_S, XMMINFO_WRITED | XMMINFO_READS | XMMINFO_READT);

8
pcsx2/x86/microVU_Execute.inl
View File

@ -32,7 +32,7 @@ void mVUdispatcherAB(mV)
// Load VU's MXCSR state // Load VU's MXCSR state
if (mvuNeedsFPCRUpdate(mVU)) if (mvuNeedsFPCRUpdate(mVU))
xLDMXCSR(isVU0 ? g_sseVU0MXCSR : g_sseVU1MXCSR); xLDMXCSR(ptr32[isVU0 ? &g_sseVU0MXCSR.bitmask : &g_sseVU1MXCSR.bitmask]);
// Load Regs // Load Regs
xMOVAPS (xmmT1, ptr128[&mVU.regs().VI[REG_P].UL]); xMOVAPS (xmmT1, ptr128[&mVU.regs().VI[REG_P].UL]);
@ -72,7 +72,7 @@ void mVUdispatcherAB(mV)
// Load EE's MXCSR state // Load EE's MXCSR state
if (mvuNeedsFPCRUpdate(mVU)) if (mvuNeedsFPCRUpdate(mVU))
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR.bitmask]);
// = The first two DWORD or smaller arguments are passed in ECX and EDX registers; // = The first two DWORD or smaller arguments are passed in ECX and EDX registers;
// all other arguments are passed right to left. // all other arguments are passed right to left.
@ -96,7 +96,7 @@ void mVUdispatcherCD(mV)
// Load VU's MXCSR state // Load VU's MXCSR state
if (mvuNeedsFPCRUpdate(mVU)) if (mvuNeedsFPCRUpdate(mVU))
xLDMXCSR(isVU0 ? g_sseVU0MXCSR : g_sseVU1MXCSR); xLDMXCSR(ptr32[isVU0 ? &g_sseVU0MXCSR.bitmask : &g_sseVU1MXCSR.bitmask]);
mVUrestoreRegs(mVU); mVUrestoreRegs(mVU);
xMOV(gprF0, ptr32[&mVU.regs().micro_statusflags[0]]); xMOV(gprF0, ptr32[&mVU.regs().micro_statusflags[0]]);
@ -117,7 +117,7 @@ void mVUdispatcherCD(mV)
// Load EE's MXCSR state // Load EE's MXCSR state
if (mvuNeedsFPCRUpdate(mVU)) if (mvuNeedsFPCRUpdate(mVU))
xLDMXCSR(g_sseMXCSR); xLDMXCSR(ptr32[&g_sseMXCSR.bitmask]);
} }
xRET(); xRET();