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

RiivolutionParser: Remove usages of global system accessor 

We can retrieve the encompassing system instance through the
CPUThreadGuard instance instead.
This commit is contained in:
Lioncash 2023-12-12 12:39:57 -05:00
parent c2e39e0d68
commit b728e37086
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DiscIO/RiivolutionPatcher.cpp
View File

@ -15,6 +15,7 @@
#include "Common/IOFile.h" #include "Common/IOFile.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/Config/AchievementSettings.h" #include "Core/Config/AchievementSettings.h"
#include "Core/Core.h"
#include "Core/HLE/HLE.h" #include "Core/HLE/HLE.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IOS/FS/FileSystem.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)) if (!original.empty() && !MemoryMatchesAt(guard, offset, original))
return; return;
auto& system = Core::System::GetInstance(); auto& system = guard.GetSystem();
const u32 size = static_cast<u32>(value.size()); const u32 size = static_cast<u32>(value.size());
for (u32 i = 0; i < size; ++i) for (u32 i = 0; i < size; ++i)
PowerPC::MMU::HostTryWriteU8(guard, value[i], offset + 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()) if (value.empty())
return; return;
auto& system = Core::System::GetInstance(); auto& system = guard.GetSystem();
for (u32 i = 0; i < length; i += 4) for (u32 i = 0; i < length; i += 4)
{ {
// first find the pattern // 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) 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(); const auto& system_memory = system.GetMemory();
for (const auto& patch : patches) for (const auto& patch : patches)