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

Core/DSPHLE: Store reference to DSPManager in HLEAccelerator (AX/AXWii).

This commit is contained in:
Admiral H. Curtiss 2024-01-08 10:27:39 +01:00
parent 3a9160100d
commit 1f0fe5a99a
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
View File

@ -38,7 +38,7 @@ void AXUCode::Initialize()
{ {
InitializeShared(); InitializeShared();
m_accelerator = std::make_unique<HLEAccelerator>(); m_accelerator = std::make_unique<HLEAccelerator>(m_dsphle->GetSystem().GetDSP());
} }
void AXUCode::InitializeShared() void AXUCode::InitializeShared()

21
Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
View File

@ -150,6 +150,13 @@ void WritePB(Memory::MemoryManager& memory, u32 addr, const PB_TYPE& pb, u32 crc
class HLEAccelerator final : public Accelerator class HLEAccelerator final : public Accelerator
{ {
public: public:
explicit HLEAccelerator(DSP::DSPManager& dsp) : m_dsp(dsp) {}
HLEAccelerator(const HLEAccelerator&) = delete;
HLEAccelerator(HLEAccelerator&&) = delete;
HLEAccelerator& operator=(const HLEAccelerator&) = delete;
HLEAccelerator& operator=(HLEAccelerator&&) = delete;
~HLEAccelerator() = default;
PB_TYPE* acc_pb = nullptr; PB_TYPE* acc_pb = nullptr;
protected: protected:
@ -182,14 +189,12 @@ protected:
} }
} }
u8 ReadMemory(u32 address) override u8 ReadMemory(u32 address) override { return m_dsp.ReadARAM(address); }
{
return Core::System::GetInstance().GetDSP().ReadARAM(address); void WriteMemory(u32 address, u8 value) override { m_dsp.WriteARAM(value, address); }
}
void WriteMemory(u32 address, u8 value) override private:
{ DSP::DSPManager& m_dsp;
Core::System::GetInstance().GetDSP().WriteARAM(value, address);
}
}; };
// Sets up the simulated accelerator. // Sets up the simulated accelerator.

2
Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
View File

@ -34,7 +34,7 @@ void AXWiiUCode::Initialize()
{ {
InitializeShared(); InitializeShared();
m_accelerator = std::make_unique<HLEAccelerator>(); m_accelerator = std::make_unique<HLEAccelerator>(m_dsphle->GetSystem().GetDSP());
} }
void AXWiiUCode::HandleCommandList() void AXWiiUCode::HandleCommandList()