From 4c349caabd644befaa4b58c866d5e482cfaa990c Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Tue, 10 Jan 2023 19:03:42 +0100 Subject: [PATCH] MIOS: Avoid ppcState global. --- Source/Core/Core/IOS/MIOS.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/IOS/MIOS.cpp b/Source/Core/Core/IOS/MIOS.cpp index d4a9dd1edf..f1062b2f0b 100644 --- a/Source/Core/Core/IOS/MIOS.cpp +++ b/Source/Core/Core/IOS/MIOS.cpp @@ -76,10 +76,11 @@ bool Load() Host_NotifyMapLoaded(); } + auto& ppc_state = system.GetPPCState(); const PowerPC::CoreMode core_mode = PowerPC::GetMode(); PowerPC::SetMode(PowerPC::CoreMode::Interpreter); - PowerPC::ppcState.msr.Hex = 0; - PowerPC::ppcState.pc = 0x3400; + ppc_state.msr.Hex = 0; + ppc_state.pc = 0x3400; NOTICE_LOG_FMT(IOS, "Loaded MIOS and bootstrapped PPC."); // IOS writes 0 to 0x30f8 before bootstrapping the PPC. Once started, the IPL eventually writes