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

DSP: Change external_interrupt_waiting from volatile to atomic 

Making this volatile accomplishes... Well, nothing in practice.
Making it atomic, on the other hand, lets us enforce a memory ordering.
This commit is contained in:
JosJuice 2021-05-13 19:57:59 +02:00
parent 80ac36a712
commit d17341572d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/DSP/DSPCore.cpp
View File

@ -195,7 +195,7 @@ void SDSP::SetException(ExceptionType exception)
void SDSP::SetExternalInterrupt(bool val) void SDSP::SetExternalInterrupt(bool val)
{ {
external_interrupt_waiting = val; external_interrupt_waiting.store(val, std::memory_order_release);
} }
void SDSP::CheckExternalInterrupt() void SDSP::CheckExternalInterrupt()

2
Source/Core/Core/DSP/DSPCore.h
View File

@ -420,7 +420,7 @@ struct SDSP
u8 reg_stack_ptrs[4]{}; u8 reg_stack_ptrs[4]{};
u8 exceptions = 0; // pending exceptions u8 exceptions = 0; // pending exceptions
volatile bool external_interrupt_waiting = false; std::atomic<bool> external_interrupt_waiting = false;
bool reset_dspjit_codespace = false; bool reset_dspjit_codespace = false;
// DSP hardware stacks. They're mapped to a bunch of registers, such that writes // DSP hardware stacks. They're mapped to a bunch of registers, such that writes

3
Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp
View File

@ -69,10 +69,9 @@ int Interpreter::RunCyclesThread(int cycles)
if ((state.cr & CR_HALT) != 0) if ((state.cr & CR_HALT) != 0)
return 0; return 0;
if (state.external_interrupt_waiting) if (state.external_interrupt_waiting.exchange(false, std::memory_order_acquire))
{ {
m_dsp_core.CheckExternalInterrupt(); m_dsp_core.CheckExternalInterrupt();
m_dsp_core.SetExternalInterrupt(false);
} }
Step(); Step();

6
Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp
View File

@ -51,11 +51,10 @@ DSPEmitter::~DSPEmitter()
u16 DSPEmitter::RunCycles(u16 cycles) u16 DSPEmitter::RunCycles(u16 cycles)
{ {
if (m_dsp_core.DSPState().external_interrupt_waiting) if (m_dsp_core.DSPState().external_interrupt_waiting.exchange(false, std::memory_order_acquire))
{ {
m_dsp_core.CheckExternalInterrupt(); m_dsp_core.CheckExternalInterrupt();
m_dsp_core.CheckExceptions(); m_dsp_core.CheckExceptions();
m_dsp_core.SetExternalInterrupt(false);
} }
m_cycles_left = cycles; m_cycles_left = cycles;
@ -489,6 +488,9 @@ Gen::OpArg DSPEmitter::M_SDSP_cr()
Gen::OpArg DSPEmitter::M_SDSP_external_interrupt_waiting() Gen::OpArg DSPEmitter::M_SDSP_external_interrupt_waiting()
{ {
static_assert(decltype(SDSP::external_interrupt_waiting)::is_always_lock_free &&
sizeof(SDSP::external_interrupt_waiting) == sizeof(u8));
return MDisp(R15, static_cast<int>(offsetof(SDSP, external_interrupt_waiting))); return MDisp(R15, static_cast<int>(offsetof(SDSP, external_interrupt_waiting)));
} }