diff options
| author | Lioncash <mai.iam2048@gmail.com> | 2023-12-12 12:39:57 -0500 |
|---|---|---|
| committer | Lioncash <mai.iam2048@gmail.com> | 2023-12-12 12:48:40 -0500 |
| commit | b728e370862ea157f33672e8a88d55f28e8f0cf8 (patch) | |
| tree | 83bd11f42788e84c25cc002edee68d50ae3aab9b /Source/Core/DiscIO | |
| parent | c2e39e0d682c3102ba1dc8c0ec337f1a129eacf9 (diff) | |
RiivolutionParser: Remove usages of global system accessor
We can retrieve the encompassing system instance through the
CPUThreadGuard instance instead.
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/RiivolutionPatcher.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/RiivolutionPatcher.cpp b/Source/Core/DiscIO/RiivolutionPatcher.cpp index 68047dd8c9..4a6f7bb2ad 100644 --- a/Source/Core/DiscIO/RiivolutionPatcher.cpp +++ b/Source/Core/DiscIO/RiivolutionPatcher.cpp @@ -15,6 +15,7 @@ #include "Common/IOFile.h" #include "Common/StringUtil.h" #include "Core/Config/AchievementSettings.h" +#include "Core/Core.h" #include "Core/HLE/HLE.h" #include "Core/HW/Memmap.h" #include "Core/IOS/FS/FileSystem.h" @@ -534,7 +535,7 @@ static void ApplyMemoryPatch(const Core::CPUThreadGuard& guard, u32 offset, if (!original.empty() && !MemoryMatchesAt(guard, offset, original)) return; - auto& system = Core::System::GetInstance(); + auto& system = guard.GetSystem(); const u32 size = static_cast<u32>(value.size()); for (u32 i = 0; i < size; ++i) PowerPC::MMU::HostTryWriteU8(guard, value[i], offset + i); @@ -590,7 +591,7 @@ static void ApplyOcarinaMemoryPatch(const Core::CPUThreadGuard& guard, const Pat if (value.empty()) return; - auto& system = Core::System::GetInstance(); + auto& system = guard.GetSystem(); for (u32 i = 0; i < length; i += 4) { // first find the pattern @@ -624,7 +625,7 @@ static void ApplyOcarinaMemoryPatch(const Core::CPUThreadGuard& guard, const Pat void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard, std::span<const Patch> patches) { - const auto& system = Core::System::GetInstance(); + const auto& system = guard.GetSystem(); const auto& system_memory = system.GetMemory(); for (const auto& patch : patches) |