piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 15:49:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

HW/ProcessorInterface: Avoid ppcState global.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2023-01-10 06:55:53 +01:00
parent 884130f95c
commit a784fe1f2f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/HW/ProcessorInterface.cpp
View File

@ -65,14 +65,14 @@ void ProcessorInterfaceManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
MMIO::ComplexWrite<u32>([](Core::System& system, u32, u32 val) { MMIO::ComplexWrite<u32>([](Core::System& system, u32, u32 val) {
auto& processor_interface = system.GetProcessorInterface(); auto& processor_interface = system.GetProcessorInterface();
processor_interface.m_interrupt_cause &= ~val; processor_interface.m_interrupt_cause &= ~val;
processor_interface.UpdateException(); processor_interface.UpdateException(system);
})); }));
mmio->Register(base | PI_INTERRUPT_MASK, MMIO::DirectRead<u32>(&m_interrupt_mask), mmio->Register(base | PI_INTERRUPT_MASK, MMIO::DirectRead<u32>(&m_interrupt_mask),
MMIO::ComplexWrite<u32>([](Core::System& system, u32, u32 val) { MMIO::ComplexWrite<u32>([](Core::System& system, u32, u32 val) {
auto& processor_interface = system.GetProcessorInterface(); auto& processor_interface = system.GetProcessorInterface();
processor_interface.m_interrupt_mask = val; processor_interface.m_interrupt_mask = val;
processor_interface.UpdateException(); processor_interface.UpdateException(system);
})); }));
mmio->Register(base | PI_FIFO_BASE, MMIO::DirectRead<u32>(&m_fifo_cpu_base), mmio->Register(base | PI_FIFO_BASE, MMIO::DirectRead<u32>(&m_fifo_cpu_base),
@ -137,12 +137,13 @@ void ProcessorInterfaceManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
} }
} }
void ProcessorInterfaceManager::UpdateException() void ProcessorInterfaceManager::UpdateException(Core::System& system)
{ {
auto& ppc_state = system.GetPPCState();
if ((m_interrupt_cause & m_interrupt_mask) != 0) if ((m_interrupt_cause & m_interrupt_mask) != 0)
PowerPC::ppcState.Exceptions |= EXCEPTION_EXTERNAL_INT; ppc_state.Exceptions |= EXCEPTION_EXTERNAL_INT;
else else
PowerPC::ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT; ppc_state.Exceptions &= ~EXCEPTION_EXTERNAL_INT;
} }
static const char* Debug_GetInterruptName(u32 cause_mask) static const char* Debug_GetInterruptName(u32 cause_mask)
@ -208,7 +209,7 @@ void ProcessorInterfaceManager::SetInterrupt(u32 cause_mask, bool set)
m_interrupt_cause &= ~cause_mask; // is there any reason to have this possibility? m_interrupt_cause &= ~cause_mask; // is there any reason to have this possibility?
// F|RES: i think the hw devices reset the interrupt in the PI to 0 // F|RES: i think the hw devices reset the interrupt in the PI to 0
// if the interrupt cause is eliminated. that isn't done by software (afaik) // if the interrupt cause is eliminated. that isn't done by software (afaik)
UpdateException(); UpdateException(Core::System::GetInstance());
} }
void ProcessorInterfaceManager::SetResetButton(bool set) void ProcessorInterfaceManager::SetResetButton(bool set)

2
Source/Core/Core/HW/ProcessorInterface.h
View File

@ -87,7 +87,7 @@ public:
private: private:
// Let the PPC know that an external exception is set/cleared // Let the PPC know that an external exception is set/cleared
void UpdateException(); void UpdateException(Core::System& system);
void SetResetButton(bool set); void SetResetButton(bool set);