From bfc951311fef7fee25a5473a484bbeffc8cf3ed6 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Tue, 10 Jan 2023 04:53:50 +0100 Subject: [PATCH] CheatSearch: Avoid ppcState global. --- Source/Core/Core/CheatSearch.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/CheatSearch.cpp b/Source/Core/Core/CheatSearch.cpp index 3ad1a5c674..e03fa8d0b3 100644 --- a/Source/Core/Core/CheatSearch.cpp +++ b/Source/Core/Core/CheatSearch.cpp @@ -20,6 +20,7 @@ #include "Core/HW/Memmap.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PowerPC.h" +#include "Core/System.h" Cheats::DataType Cheats::GetDataType(const Cheats::SearchValue& value) { @@ -204,7 +205,9 @@ Cheats::NewSearch(const std::vector& memory_ranges, return; } - if (address_space == PowerPC::RequestedAddressSpace::Virtual && !PowerPC::ppcState.msr.DR) + auto& system = Core::System::GetInstance(); + auto& ppc_state = system.GetPPCState(); + if (address_space == PowerPC::RequestedAddressSpace::Virtual && !ppc_state.msr.DR) { error_code = Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible; return; @@ -263,7 +266,9 @@ Cheats::NextSearch(const std::vector>& previous_results, return; } - if (address_space == PowerPC::RequestedAddressSpace::Virtual && !PowerPC::ppcState.msr.DR) + auto& system = Core::System::GetInstance(); + auto& ppc_state = system.GetPPCState(); + if (address_space == PowerPC::RequestedAddressSpace::Virtual && !ppc_state.msr.DR) { error_code = Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible; return;