piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

HW/GPFifo: Avoid ppcState global.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2023-01-10 06:49:38 +01:00
parent e2f7855b0e
commit 2bf72de43d
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Core/HW/GPFifo.cpp
View File

@ -35,12 +35,12 @@ GPFifoManager::GPFifoManager(Core::System& system) : m_system(system)
size_t GPFifoManager::GetGatherPipeCount() size_t GPFifoManager::GetGatherPipeCount()
{ {
return PowerPC::ppcState.gather_pipe_ptr - m_gather_pipe; return m_system.GetPPCState().gather_pipe_ptr - m_gather_pipe;
} }
void GPFifoManager::SetGatherPipeCount(size_t size) void GPFifoManager::SetGatherPipeCount(size_t size)
{ {
PowerPC::ppcState.gather_pipe_ptr = m_gather_pipe + size; m_system.GetPPCState().gather_pipe_ptr = m_gather_pipe + size;
} }
void GPFifoManager::DoState(PointerWrap& p) void GPFifoManager::DoState(PointerWrap& p)
@ -54,7 +54,7 @@ void GPFifoManager::DoState(PointerWrap& p)
void GPFifoManager::Init() void GPFifoManager::Init()
{ {
ResetGatherPipe(); ResetGatherPipe();
PowerPC::ppcState.gather_pipe_base_ptr = m_gather_pipe; m_system.GetPPCState().gather_pipe_base_ptr = m_gather_pipe;
memset(m_gather_pipe, 0, sizeof(m_gather_pipe)); memset(m_gather_pipe, 0, sizeof(m_gather_pipe));
} }
@ -162,29 +162,33 @@ void GPFifoManager::Write64(const u64 value)
void GPFifoManager::FastWrite8(const u8 value) void GPFifoManager::FastWrite8(const u8 value)
{ {
*PowerPC::ppcState.gather_pipe_ptr = value; auto& ppc_state = m_system.GetPPCState();
PowerPC::ppcState.gather_pipe_ptr += sizeof(u8); *ppc_state.gather_pipe_ptr = value;
ppc_state.gather_pipe_ptr += sizeof(u8);
} }
void GPFifoManager::FastWrite16(u16 value) void GPFifoManager::FastWrite16(u16 value)
{ {
value = Common::swap16(value); value = Common::swap16(value);
std::memcpy(PowerPC::ppcState.gather_pipe_ptr, &value, sizeof(u16)); auto& ppc_state = m_system.GetPPCState();
PowerPC::ppcState.gather_pipe_ptr += sizeof(u16); std::memcpy(ppc_state.gather_pipe_ptr, &value, sizeof(u16));
ppc_state.gather_pipe_ptr += sizeof(u16);
} }
void GPFifoManager::FastWrite32(u32 value) void GPFifoManager::FastWrite32(u32 value)
{ {
value = Common::swap32(value); value = Common::swap32(value);
std::memcpy(PowerPC::ppcState.gather_pipe_ptr, &value, sizeof(u32)); auto& ppc_state = m_system.GetPPCState();
PowerPC::ppcState.gather_pipe_ptr += sizeof(u32); std::memcpy(ppc_state.gather_pipe_ptr, &value, sizeof(u32));
ppc_state.gather_pipe_ptr += sizeof(u32);
} }
void GPFifoManager::FastWrite64(u64 value) void GPFifoManager::FastWrite64(u64 value)
{ {
value = Common::swap64(value); value = Common::swap64(value);
std::memcpy(PowerPC::ppcState.gather_pipe_ptr, &value, sizeof(u64)); auto& ppc_state = m_system.GetPPCState();
PowerPC::ppcState.gather_pipe_ptr += sizeof(u64); std::memcpy(ppc_state.gather_pipe_ptr, &value, sizeof(u64));
ppc_state.gather_pipe_ptr += sizeof(u64);
} }
void UpdateGatherPipe(GPFifoManager& gpfifo) void UpdateGatherPipe(GPFifoManager& gpfifo)