mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 00:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DSP: Make mailboxes private

Browse source 
These aren't used externally anywhere and can be made private.
This commit is contained in:
Lioncash 2020-12-29 12:25:15 -05:00
commit f9d8d06037
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/DSP/DSPCore.cpp
View file

@ -387,8 +387,8 @@ void SDSP::DoState(PointerWrap& p)
p.Do(step_counter); p.Do(step_counter);
p.DoArray(ifx_regs); p.DoArray(ifx_regs);
accelerator->DoState(p); accelerator->DoState(p);
p.Do(mbox[0]); p.Do(m_mailbox[0]);
p.Do(mbox[1]); p.Do(m_mailbox[1]);
Common::UnWriteProtectMemory(iram, DSP_IRAM_BYTE_SIZE, false); Common::UnWriteProtectMemory(iram, DSP_IRAM_BYTE_SIZE, false);
p.DoArray(iram, DSP_IRAM_SIZE); p.DoArray(iram, DSP_IRAM_SIZE);
Common::WriteProtectMemory(iram, DSP_IRAM_BYTE_SIZE, false); Common::WriteProtectMemory(iram, DSP_IRAM_BYTE_SIZE, false);

8
Source/Core/Core/DSP/DSPCore.h
View file

@ -429,9 +429,6 @@ struct SDSP
u32 iram_crc = 0; u32 iram_crc = 0;
u64 step_counter = 0; u64 step_counter = 0;
// Mailbox.
std::atomic<u32> mbox[2];
// Accelerator / DMA / other hardware registers. Not GPRs. // Accelerator / DMA / other hardware registers. Not GPRs.
std::array<u16, 256> ifx_regs{}; std::array<u16, 256> ifx_regs{};
@ -445,8 +442,8 @@ struct SDSP
u16* coef = nullptr; u16* coef = nullptr;
private: private:
auto& GetMailbox(Mailbox mailbox) { return mbox[static_cast<u32>(mailbox)]; } auto& GetMailbox(Mailbox mailbox) { return m_mailbox[static_cast<u32>(mailbox)]; }
const auto& GetMailbox(Mailbox mailbox) const { return mbox[static_cast<u32>(mailbox)]; } const auto& GetMailbox(Mailbox mailbox) const { return m_mailbox[static_cast<u32>(mailbox)]; }
void FreeMemoryPages(); void FreeMemoryPages();
@ -458,6 +455,7 @@ private:
u16 ReadIFXImpl(u16 address); u16 ReadIFXImpl(u16 address);
std::atomic<u32> m_mailbox[2];
DSPCore& m_dsp_core; DSPCore& m_dsp_core;
Analyzer m_analyzer; Analyzer m_analyzer;
}; };