From dec53848f55fd6b32d4323db4a7ef78e7dc52b7f Mon Sep 17 00:00:00 2001 From: Lioncache Date: Mon, 18 Dec 2023 19:24:32 -0500 Subject: [PATCH] CheatSearch: Get rid of global system accessors We can retrieve the system via the CPUThreadGuard instances. --- Source/Core/Core/CheatSearch.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/CheatSearch.cpp b/Source/Core/Core/CheatSearch.cpp index 6ff7f6ceaf..8b488191f3 100644 --- a/Source/Core/Core/CheatSearch.cpp +++ b/Source/Core/Core/CheatSearch.cpp @@ -222,8 +222,7 @@ Cheats::NewSearch(const Core::CPUThreadGuard& guard, return; } - auto& system = Core::System::GetInstance(); - auto& ppc_state = system.GetPPCState(); + const auto& ppc_state = guard.GetSystem().GetPPCState(); if (address_space == PowerPC::RequestedAddressSpace::Virtual && !ppc_state.msr.DR) { error_code = Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible; @@ -288,8 +287,7 @@ Cheats::NextSearch(const Core::CPUThreadGuard& guard, return; } - auto& system = Core::System::GetInstance(); - auto& ppc_state = system.GetPPCState(); + const auto& ppc_state = guard.GetSystem().GetPPCState(); if (address_space == PowerPC::RequestedAddressSpace::Virtual && !ppc_state.msr.DR) { error_code = Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible;