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

FifoPlayer: Avoid ppcState global.

This commit is contained in:
Admiral H. Curtiss 2023-01-10 05:18:34 +01:00
parent 8adabb86cf
commit 1a826b27a6
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Core/FifoPlayer/FifoPlayer.cpp
View File

@ -514,6 +514,7 @@ void FifoPlayer::WriteFifo(const u8* data, u32 start, u32 end)
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
auto& core_timing = system.GetCoreTiming(); auto& core_timing = system.GetCoreTiming();
auto& gpfifo = system.GetGPFifo(); auto& gpfifo = system.GetGPFifo();
auto& ppc_state = system.GetPPCState();
// Write up to 256 bytes at a time // Write up to 256 bytes at a time
while (written < end) while (written < end)
@ -528,8 +529,8 @@ void FifoPlayer::WriteFifo(const u8* data, u32 start, u32 end)
u32 burstEnd = std::min(written + 255, lastBurstEnd); u32 burstEnd = std::min(written + 255, lastBurstEnd);
std::copy(data + written, data + burstEnd, PowerPC::ppcState.gather_pipe_ptr); std::copy(data + written, data + burstEnd, ppc_state.gather_pipe_ptr);
PowerPC::ppcState.gather_pipe_ptr += burstEnd - written; ppc_state.gather_pipe_ptr += burstEnd - written;
written = burstEnd; written = burstEnd;
gpfifo.Write8(data[written++]); gpfifo.Write8(data[written++]);
@ -539,7 +540,7 @@ void FifoPlayer::WriteFifo(const u8* data, u32 start, u32 end)
u32 cyclesUsed = elapsedCycles - m_ElapsedCycles; u32 cyclesUsed = elapsedCycles - m_ElapsedCycles;
m_ElapsedCycles = elapsedCycles; m_ElapsedCycles = elapsedCycles;
PowerPC::ppcState.downcount -= cyclesUsed; ppc_state.downcount -= cyclesUsed;
core_timing.Advance(); core_timing.Advance();
} }
} }
@ -629,16 +630,19 @@ void FifoPlayer::ClearEfb()
void FifoPlayer::LoadMemory() void FifoPlayer::LoadMemory()
{ {
auto& system = Core::System::GetInstance();
auto& ppc_state = system.GetPPCState();
UReg_MSR newMSR; UReg_MSR newMSR;
newMSR.DR = 1; newMSR.DR = 1;
newMSR.IR = 1; newMSR.IR = 1;
PowerPC::ppcState.msr.Hex = newMSR.Hex; ppc_state.msr.Hex = newMSR.Hex;
PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff; ppc_state.spr[SPR_IBAT0U] = 0x80001fff;
PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002; ppc_state.spr[SPR_IBAT0L] = 0x00000002;
PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff; ppc_state.spr[SPR_DBAT0U] = 0x80001fff;
PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002; ppc_state.spr[SPR_DBAT0L] = 0x00000002;
PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff; ppc_state.spr[SPR_DBAT1U] = 0xc0001fff;
PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a; ppc_state.spr[SPR_DBAT1L] = 0x0000002a;
PowerPC::DBATUpdated(); PowerPC::DBATUpdated();
PowerPC::IBATUpdated(); PowerPC::IBATUpdated();