DSPCore: Make IRAM CRC and step counter private

We can construct an API around these two members to allow them to be
private.
This commit is contained in:
Lioncash 2020-12-29 14:32:08 -05:00
parent 5fb1f0bfd3
commit f4e1f48b4f
5 changed files with 15 additions and 9 deletions

View File

@ -119,7 +119,7 @@ SDSP::~SDSP() = default;
bool SDSP::Initialize(const DSPInitOptions& opts) bool SDSP::Initialize(const DSPInitOptions& opts)
{ {
step_counter = 0; m_step_counter = 0;
m_accelerator = std::make_unique<LLEAccelerator>(*this); m_accelerator = std::make_unique<LLEAccelerator>(*this);
irom = static_cast<u16*>(Common::AllocateMemoryPages(DSP_IROM_BYTE_SIZE)); irom = static_cast<u16*>(Common::AllocateMemoryPages(DSP_IROM_BYTE_SIZE));
@ -384,7 +384,7 @@ void SDSP::DoState(PointerWrap& p)
p.Do(stack); p.Do(stack);
} }
p.Do(step_counter); p.Do(m_step_counter);
p.DoArray(m_ifx_regs); p.DoArray(m_ifx_regs);
m_accelerator->DoState(p); m_accelerator->DoState(p);
p.Do(m_mailbox[0]); p.Do(m_mailbox[0]);

View File

@ -396,6 +396,12 @@ struct SDSP
// Writes a value to a given register. // Writes a value to a given register.
void WriteRegister(size_t reg, u16 val); void WriteRegister(size_t reg, u16 val);
// Advances the step counter used for debugging purposes.
void AdvanceStepCounter() { ++m_step_counter; }
// Sets the calculated IRAM CRC for debugging purposes.
void SetIRAMCRC(u32 crc) { m_iram_crc = crc; }
// Saves and loads any necessary state. // Saves and loads any necessary state.
void DoState(PointerWrap& p); void DoState(PointerWrap& p);
@ -425,10 +431,6 @@ struct SDSP
// the stack overflows, you're screwed. // the stack overflows, you're screwed.
u16 reg_stacks[4][DSP_STACK_DEPTH]{}; u16 reg_stacks[4][DSP_STACK_DEPTH]{};
// For debugging.
u32 iram_crc = 0;
u64 step_counter = 0;
// When state saving, all of the above can just be memcpy'd into the save state. // When state saving, all of the above can just be memcpy'd into the save state.
// The below needs special handling. // The below needs special handling.
u16* iram = nullptr; u16* iram = nullptr;
@ -450,6 +452,10 @@ private:
u16 ReadIFXImpl(u16 address); u16 ReadIFXImpl(u16 address);
// For debugging.
u32 m_iram_crc = 0;
u64 m_step_counter = 0;
// Accelerator / DMA / other hardware registers. Not GPRs. // Accelerator / DMA / other hardware registers. Not GPRs.
std::array<u16, 256> m_ifx_regs{}; std::array<u16, 256> m_ifx_regs{};

View File

@ -290,7 +290,7 @@ const u8* SDSP::IDMAIn(u16 dsp_addr, u32 addr, u32 size)
Host::CodeLoaded(m_dsp_core, addr, size); Host::CodeLoaded(m_dsp_core, addr, size);
NOTICE_LOG_FMT(DSPLLE, "*** Copy new UCode from {:#010x} to {:#06x} (crc: {:#08x})", addr, NOTICE_LOG_FMT(DSPLLE, "*** Copy new UCode from {:#010x} to {:#06x} (crc: {:#08x})", addr,
dsp_addr, iram_crc); dsp_addr, m_iram_crc);
return reinterpret_cast<const u8*>(iram) + dsp_addr; return reinterpret_cast<const u8*>(iram) + dsp_addr;
} }

View File

@ -49,7 +49,7 @@ void Interpreter::Step()
auto& state = m_dsp_core.DSPState(); auto& state = m_dsp_core.DSPState();
m_dsp_core.CheckExceptions(); m_dsp_core.CheckExceptions();
state.step_counter++; state.AdvanceStepCounter();
const u16 opc = state.FetchInstruction(); const u16 opc = state.FetchInstruction();
ExecuteInstruction(UDSPInstruction{opc}); ExecuteInstruction(UDSPInstruction{opc});

View File

@ -77,7 +77,7 @@ void CodeLoaded(DSPCore& dsp, const u8* ptr, size_t size)
{ {
auto& state = dsp.DSPState(); auto& state = dsp.DSPState();
const u32 iram_crc = Common::HashEctor(ptr, size); const u32 iram_crc = Common::HashEctor(ptr, size);
state.iram_crc = iram_crc; state.SetIRAMCRC(iram_crc);
if (SConfig::GetInstance().m_DumpUCode) if (SConfig::GetInstance().m_DumpUCode)
{ {