piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9387 from lioncash/priv

Browse Source 
DSPCore: Make several SDSP members private
This commit is contained in:
Léo Lam 2020-12-29 22:05:11 +01:00 committed by GitHub
commit 351fb71653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -396,6 +396,12 @@ struct SDSP
// Writes a value to a given register.
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.
void DoState(PointerWrap& p);
@ -425,15 +431,6 @@ struct SDSP
// the stack overflows, you're screwed.
u16 reg_stacks[4][DSP_STACK_DEPTH]{};
// For debugging.
u32 iram_crc = 0;
u64 step_counter = 0;
// Accelerator / DMA / other hardware registers. Not GPRs.
std::array<u16, 256> ifx_regs{};
std::unique_ptr<Accelerator> accelerator;
// When state saving, all of the above can just be memcpy'd into the save state.
// The below needs special handling.
u16* iram = nullptr;
@ -455,6 +452,14 @@ private:
u16 ReadIFXImpl(u16 address);
// For debugging.
u32 m_iram_crc = 0;
u64 m_step_counter = 0;
// Accelerator / DMA / other hardware registers. Not GPRs.
std::array<u16, 256> m_ifx_regs{};
std::unique_ptr<Accelerator> m_accelerator;
std::array<std::atomic<u32>, 2> m_mailbox;
DSPCore& m_dsp_core;
Analyzer m_analyzer;

88
Source/Core/Core/DSP/DSPHWInterface.cpp
View File

@ -23,7 +23,7 @@ namespace DSP
{
void SDSP::InitializeIFX()
{
ifx_regs.fill(0);
m_ifx_regs.fill(0);
GetMailbox(Mailbox::CPU).store(0);
GetMailbox(Mailbox::DSP).store(0);
@ -118,14 +118,14 @@ void SDSP::WriteIFX(u32 address, u16 value)
break;
case DSP_DSBL:
ifx_regs[DSP_DSBL] = value;
ifx_regs[DSP_DSCR] |= 4; // Doesn't really matter since we do DMA instantly
if (!ifx_regs[DSP_AMDM])
m_ifx_regs[DSP_DSBL] = value;
m_ifx_regs[DSP_DSCR] |= 4; // Doesn't really matter since we do DMA instantly
if (!m_ifx_regs[DSP_AMDM])
DoDMA();
else
NOTICE_LOG_FMT(DSPLLE, "Masked DMA skipped");
ifx_regs[DSP_DSCR] &= ~4;
ifx_regs[DSP_DSBL] = 0;
m_ifx_regs[DSP_DSCR] &= ~4;
m_ifx_regs[DSP_DSBL] = 0;
break;
case DSP_GAIN:
@ -138,44 +138,46 @@ void SDSP::WriteIFX(u32 address, u16 value)
case DSP_DSMAH:
case DSP_DSMAL:
case DSP_DSCR:
ifx_regs[address & 0xFF] = value;
m_ifx_regs[address & 0xFF] = value;
break;
case DSP_ACSAH:
accelerator->SetStartAddress(value << 16 | static_cast<u16>(accelerator->GetStartAddress()));
m_accelerator->SetStartAddress(value << 16 |
static_cast<u16>(m_accelerator->GetStartAddress()));
break;
case DSP_ACSAL:
accelerator->SetStartAddress(static_cast<u16>(accelerator->GetStartAddress() >> 16) << 16 |
m_accelerator->SetStartAddress(static_cast<u16>(m_accelerator->GetStartAddress() >> 16) << 16 |
value);
break;
case DSP_ACEAH:
accelerator->SetEndAddress(value << 16 | static_cast<u16>(accelerator->GetEndAddress()));
m_accelerator->SetEndAddress(value << 16 | static_cast<u16>(m_accelerator->GetEndAddress()));
break;
case DSP_ACEAL:
accelerator->SetEndAddress(static_cast<u16>(accelerator->GetEndAddress() >> 16) << 16 | value);
break;
case DSP_ACCAH:
accelerator->SetCurrentAddress(value << 16 |
static_cast<u16>(accelerator->GetCurrentAddress()));
break;
case DSP_ACCAL:
accelerator->SetCurrentAddress(static_cast<u16>(accelerator->GetCurrentAddress() >> 16) << 16 |
m_accelerator->SetEndAddress(static_cast<u16>(m_accelerator->GetEndAddress() >> 16) << 16 |
value);
break;
case DSP_ACCAH:
m_accelerator->SetCurrentAddress(value << 16 |
static_cast<u16>(m_accelerator->GetCurrentAddress()));
break;
case DSP_ACCAL:
m_accelerator->SetCurrentAddress(
static_cast<u16>(m_accelerator->GetCurrentAddress() >> 16) << 16 | value);
break;
case DSP_FORMAT:
accelerator->SetSampleFormat(value);
m_accelerator->SetSampleFormat(value);
break;
case DSP_YN1:
accelerator->SetYn1(value);
m_accelerator->SetYn1(value);
break;
case DSP_YN2:
accelerator->SetYn2(value);
m_accelerator->SetYn2(value);
break;
case DSP_PRED_SCALE:
accelerator->SetPredScale(value);
m_accelerator->SetPredScale(value);
break;
case DSP_ACDATA1: // Accelerator write (Zelda type) - "UnkZelda"
accelerator->WriteD3(value);
m_accelerator->WriteD3(value);
break;
default:
@ -197,7 +199,7 @@ void SDSP::WriteIFX(u32 address, u16 value)
{
ERROR_LOG_FMT(DSPLLE, "{:04x} MW {:04x} ({:04x})", pc, address, value);
}
ifx_regs[address & 0xFF] = value;
m_ifx_regs[address & 0xFF] = value;
break;
}
}
@ -219,36 +221,36 @@ u16 SDSP::ReadIFXImpl(u16 address)
return ReadMailboxLow(Mailbox::CPU);
case DSP_DSCR:
return ifx_regs[address & 0xFF];
return m_ifx_regs[address & 0xFF];
case DSP_ACSAH:
return static_cast<u16>(accelerator->GetStartAddress() >> 16);
return static_cast<u16>(m_accelerator->GetStartAddress() >> 16);
case DSP_ACSAL:
return static_cast<u16>(accelerator->GetStartAddress());
return static_cast<u16>(m_accelerator->GetStartAddress());
case DSP_ACEAH:
return static_cast<u16>(accelerator->GetEndAddress() >> 16);
return static_cast<u16>(m_accelerator->GetEndAddress() >> 16);
case DSP_ACEAL:
return static_cast<u16>(accelerator->GetEndAddress());
return static_cast<u16>(m_accelerator->GetEndAddress());
case DSP_ACCAH:
return static_cast<u16>(accelerator->GetCurrentAddress() >> 16);
return static_cast<u16>(m_accelerator->GetCurrentAddress() >> 16);
case DSP_ACCAL:
return static_cast<u16>(accelerator->GetCurrentAddress());
return static_cast<u16>(m_accelerator->GetCurrentAddress());
case DSP_FORMAT:
return accelerator->GetSampleFormat();
return m_accelerator->GetSampleFormat();
case DSP_YN1:
return accelerator->GetYn1();
return m_accelerator->GetYn1();
case DSP_YN2:
return accelerator->GetYn2();
return m_accelerator->GetYn2();
case DSP_PRED_SCALE:
return accelerator->GetPredScale();
return m_accelerator->GetPredScale();
case DSP_ACCELERATOR: // ADPCM Accelerator reads
return accelerator->Read(reinterpret_cast<s16*>(&ifx_regs[DSP_COEF_A1_0]));
return m_accelerator->Read(reinterpret_cast<s16*>(&m_ifx_regs[DSP_COEF_A1_0]));
case DSP_ACDATA1: // Accelerator reads (Zelda type) - "UnkZelda"
return accelerator->ReadD3();
return m_accelerator->ReadD3();
default:
{
const u16 ifx_reg = ifx_regs[address & 0xFF];
const u16 ifx_reg = m_ifx_regs[address & 0xFF];
if ((address & 0xff) >= 0xa0)
{
@ -288,7 +290,7 @@ const u8* SDSP::IDMAIn(u16 dsp_addr, u32 addr, u32 size)
Host::CodeLoaded(m_dsp_core, addr, size);
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;
}
@ -321,10 +323,10 @@ const u8* SDSP::DDMAOut(u16 dsp_addr, u32 addr, u32 size)
void SDSP::DoDMA()
{
const u32 addr = (ifx_regs[DSP_DSMAH] << 16) | ifx_regs[DSP_DSMAL];
const u16 ctl = ifx_regs[DSP_DSCR];
const u16 dsp_addr = ifx_regs[DSP_DSPA] * 2;
const u16 len = ifx_regs[DSP_DSBL];
const u32 addr = (m_ifx_regs[DSP_DSMAH] << 16) | m_ifx_regs[DSP_DSMAL];
const u16 ctl = m_ifx_regs[DSP_DSCR];
const u16 dsp_addr = m_ifx_regs[DSP_DSPA] * 2;
const u16 len = m_ifx_regs[DSP_DSBL];
if (len > 0x4000)
{

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

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

2
Source/Core/Core/HW/DSPLLE/DSPHost.cpp
View File

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