diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 4d097d7eb5..feee9730f5 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -70,7 +70,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 54; // Last changed in PR 3782 +static const u32 STATE_VERSION = 55; // Maps savestate versions to Dolphin versions. // Versions after 42 don't need to be added to this list, diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index d7fd67c18f..43b6399e6f 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -90,10 +90,10 @@ static UPEDstAlphaConfReg m_DstAlphaConf; static UPEAlphaModeConfReg m_AlphaModeConf; static UPEAlphaReadReg m_AlphaRead; static UPECtrlReg m_Control; -// static u16 m_Token; // token value most recently encountered +static std::atomic s_Token; // token value most recently encountered -static std::atomic s_signal_token_interrupt; -static std::atomic s_signal_finish_interrupt; +static bool s_signal_token_interrupt; +static bool s_signal_finish_interrupt; static int et_SetTokenOnMainThread; static int et_SetFinishOnMainThread; @@ -112,14 +112,13 @@ void DoState(PointerWrap& p) p.Do(m_AlphaModeConf); p.Do(m_AlphaRead); p.DoPOD(m_Control); + p.Do(s_Token); p.Do(s_signal_token_interrupt); p.Do(s_signal_finish_interrupt); } static void UpdateInterrupts(); -static void UpdateTokenInterrupt(bool active); -static void UpdateFinishInterrupt(bool active); static void SetToken_OnMainThread(u64 userdata, s64 cyclesLate); static void SetFinish_OnMainThread(u64 userdata, s64 cyclesLate); @@ -131,9 +130,10 @@ void Init() m_DstAlphaConf.Hex = 0; m_AlphaModeConf.Hex = 0; m_AlphaRead.Hex = 0; + s_Token = 0; - s_signal_token_interrupt.store(0); - s_signal_finish_interrupt.store(0); + s_signal_token_interrupt = false; + s_signal_finish_interrupt = false; et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread); et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread); @@ -191,10 +191,10 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) UPECtrlReg tmpCtrl(val); if (tmpCtrl.PEToken) - s_signal_token_interrupt.store(0); + s_signal_token_interrupt = false; if (tmpCtrl.PEFinish) - s_signal_finish_interrupt.store(0); + s_signal_finish_interrupt = false; m_Control.PETokenEnable = tmpCtrl.PETokenEnable; m_Control.PEFinishEnable = tmpCtrl.PEFinishEnable; @@ -206,7 +206,9 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) })); // Token register, readonly. - mmio->Register(base | PE_TOKEN_REG, MMIO::DirectRead(&CommandProcessor::fifo.PEToken), + mmio->Register(base | PE_TOKEN_REG, + + MMIO::ComplexRead([](u32) { return s_Token.load(); }), MMIO::InvalidWrite()); // BBOX registers, readonly and need to update a flag. @@ -223,45 +225,23 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) static void UpdateInterrupts() { // check if there is a token-interrupt - UpdateTokenInterrupt((s_signal_token_interrupt.load() & m_Control.PETokenEnable) != 0); + ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, + s_signal_token_interrupt && m_Control.PETokenEnable); // check if there is a finish-interrupt - UpdateFinishInterrupt((s_signal_finish_interrupt.load() & m_Control.PEFinishEnable) != 0); + ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, + s_signal_finish_interrupt && m_Control.PEFinishEnable); } -static void UpdateTokenInterrupt(bool active) -{ - ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active); -} - -static void UpdateFinishInterrupt(bool active) -{ - ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active); -} - -// TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate). -// Think about the right order between tokenVal and tokenINT... one day maybe. -// Cleanup++ - -// Called only if BPMEM_PE_TOKEN_INT_ID is ack by GP static void SetToken_OnMainThread(u64 userdata, s64 cyclesLate) { - // XXX: No 16-bit atomic store available, so cheat and use 32-bit. - // That's what we've always done. We're counting on fifo.PEToken to be - // 4-byte padded. - Common::AtomicStore(*(volatile u32*)&CommandProcessor::fifo.PEToken, userdata & 0xffff); - INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", - CommandProcessor::fifo.PEToken); - if (userdata >> 16) - { - s_signal_token_interrupt.store(1); - UpdateInterrupts(); - } + s_signal_token_interrupt = true; + UpdateInterrupts(); } static void SetFinish_OnMainThread(u64 userdata, s64 cyclesLate) { - s_signal_finish_interrupt.store(1); + s_signal_finish_interrupt = true; UpdateInterrupts(); Core::FrameUpdateOnCPUThread(); @@ -271,16 +251,16 @@ static void SetFinish_OnMainThread(u64 userdata, s64 cyclesLate) // THIS IS EXECUTED FROM VIDEO THREAD void SetToken(const u16 _token, const int _bSetTokenAcknowledge) { + INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", _token); + s_Token.store(_token); + if (_bSetTokenAcknowledge) // set token INT { - s_signal_token_interrupt.store(1); + if (!SConfig::GetInstance().bCPUThread || Fifo::UseDeterministicGPUThread()) + CoreTiming::ScheduleEvent(0, et_SetTokenOnMainThread, 0); + else + CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread, 0); } - - if (!SConfig::GetInstance().bCPUThread || Fifo::UseDeterministicGPUThread()) - CoreTiming::ScheduleEvent(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16)); - else - CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread, - _token | (_bSetTokenAcknowledge << 16)); } // SetFinish diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index 09570f63f8..d5cb8a4259 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -43,11 +43,6 @@ struct SCPFifoStruct volatile u32 CPReadPointer; volatile u32 CPBreakpoint; volatile u32 SafeCPReadPointer; - // Super Monkey Ball Adventure require this. - // Because the read&check-PEToken-loop stays in its JITed block I suppose. - // So no possiblity to ack the Token irq by the scheduler until some sort of PPC watchdog do its - // mess. - volatile u16 PEToken; volatile u32 bFF_GPLinkEnable; volatile u32 bFF_GPReadEnable;