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

R5900: Get rid of ScopedBools

This commit is contained in:
Connor McLaughlin 2021-09-21 20:06:13 +10:00 committed by refractionpcsx2
parent 4594e02812
commit 91627b28b4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/R5900.cpp
View File

@ -367,7 +367,7 @@ u32 g_nextEventCycle = 0;
// and the recompiler. (moved here to help alleviate redundant code) // and the recompiler. (moved here to help alleviate redundant code)
__fi void _cpuEventTest_Shared() __fi void _cpuEventTest_Shared()
{ {
ScopedBool etest(eeEventTestIsActive); eeEventTestIsActive = true;
g_nextEventCycle = cpuRegs.cycle + eeWaitCycles; g_nextEventCycle = cpuRegs.cycle + eeWaitCycles;
// ---- INTC / DMAC (CPU-level Exceptions) ----------------- // ---- INTC / DMAC (CPU-level Exceptions) -----------------
@ -463,6 +463,8 @@ __fi void _cpuEventTest_Shared()
// Apply vsync and other counter nextCycles // Apply vsync and other counter nextCycles
cpuSetNextEvent( nextsCounter, nextCounter ); cpuSetNextEvent( nextsCounter, nextCounter );
eeEventTestIsActive = false;
} }
__ri void cpuTestINTCInts() __ri void cpuTestINTCInts()

4
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -762,7 +762,7 @@ static void recExecute()
if (!setjmp(m_SetJmp_StateCheck)) if (!setjmp(m_SetJmp_StateCheck))
{ {
eeRecIsReset = false; eeRecIsReset = false;
ScopedBool executing(eeCpuExecuting); eeCpuExecuting = true;
// Important! Most of the console logging and such has cancel points in it. This is great // Important! Most of the console logging and such has cancel points in it. This is great
// in Windows, where SEH lets us safely kill a thread from anywhere we want. This is bad // in Windows, where SEH lets us safely kill a thread from anywhere we want. This is bad
@ -779,6 +779,8 @@ static void recExecute()
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
} }
eeCpuExecuting = false;
if (m_cpuException) if (m_cpuException)
m_cpuException->Rethrow(); m_cpuException->Rethrow();
if (m_Exception) if (m_Exception)