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

Merge pull request #12398 from lioncash/parse 

RiivolutionParser: Make use of std::span where applicable
This commit is contained in:
Tilka 2023-12-12 20:07:44 +00:00 committed by GitHub
parent 198a53e7df b728e37086
commit c92e402454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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"
@ -490,8 +491,8 @@ static void ApplyFolderPatchToFST(const Patch& patch, const Folder& folder,
ApplyFolderPatchToFST(patch, folder, fst, dol_node, folder.m_disc, folder.m_external); ApplyFolderPatchToFST(patch, folder, fst, dol_node, folder.m_disc, folder.m_external);
} }
void ApplyPatchesToFiles(const std::vector<Patch>& patches, PatchIndex index, void ApplyPatchesToFiles(std::span<const Patch> patches, PatchIndex index,
std::vector<DiscIO::FSTBuilderNode>* fst, DiscIO::FSTBuilderNode* dol_node) std::vector<FSTBuilderNode>* fst, FSTBuilderNode* dol_node)
{ {
for (const auto& patch : patches) for (const auto& patch : patches)
{ {
@ -509,7 +510,7 @@ void ApplyPatchesToFiles(const std::vector<Patch>& patches, PatchIndex index,
} }
static bool MemoryMatchesAt(const Core::CPUThreadGuard& guard, u32 offset, static bool MemoryMatchesAt(const Core::CPUThreadGuard& guard, u32 offset,
const std::vector<u8>& value) std::span<const u8> value)
{ {
for (u32 i = 0; i < value.size(); ++i) for (u32 i = 0; i < value.size(); ++i)
{ {
@ -521,7 +522,7 @@ static bool MemoryMatchesAt(const Core::CPUThreadGuard& guard, u32 offset,
} }
static void ApplyMemoryPatch(const Core::CPUThreadGuard& guard, u32 offset, static void ApplyMemoryPatch(const Core::CPUThreadGuard& guard, u32 offset,
const std::vector<u8>& value, const std::vector<u8>& original) std::span<const u8> value, std::span<const u8> original)
{ {
#ifdef USE_RETRO_ACHIEVEMENTS #ifdef USE_RETRO_ACHIEVEMENTS
if (::Config::Get(::Config::RA_HARDCORE_ENABLED)) if (::Config::Get(::Config::RA_HARDCORE_ENABLED))
@ -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
@ -622,10 +623,10 @@ static void ApplyOcarinaMemoryPatch(const Core::CPUThreadGuard& guard, const Pat
} }
} }
void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard, const std::vector<Patch>& patches) void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard, std::span<const Patch> patches)
{ {
auto& system = Core::System::GetInstance(); const auto& system = guard.GetSystem();
auto& system_memory = system.GetMemory(); const auto& system_memory = system.GetMemory();
for (const auto& patch : patches) for (const auto& patch : patches)
{ {
@ -642,8 +643,8 @@ void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard, const std::vec
} }
} }
void ApplyApploaderMemoryPatches(const Core::CPUThreadGuard& guard, void ApplyApploaderMemoryPatches(const Core::CPUThreadGuard& guard, std::span<const Patch> patches,
const std::vector<Patch>& patches, u32 ram_address, u32 ram_length) u32 ram_address, u32 ram_length)
{ {
for (const auto& patch : patches) for (const auto& patch : patches)
{ {
@ -660,8 +661,7 @@ void ApplyApploaderMemoryPatches(const Core::CPUThreadGuard& guard,
} }
} }
std::optional<SavegameRedirect> std::optional<SavegameRedirect> ExtractSavegameRedirect(std::span<const Patch> riivolution_patches)
ExtractSavegameRedirect(const std::vector<Patch>& riivolution_patches)
{ {
for (const auto& patch : riivolution_patches) for (const auto& patch : riivolution_patches)
{ {

17
Source/Core/DiscIO/RiivolutionPatcher.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <optional> #include <optional>
#include <span>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <vector> #include <vector>
@ -76,14 +77,10 @@ enum class PatchIndex
DolphinSysFiles, DolphinSysFiles,
}; };
void ApplyPatchesToFiles(const std::vector<Patch>& patches, PatchIndex index, void ApplyPatchesToFiles(std::span<const Patch> patches, PatchIndex index,
std::vector<DiscIO::FSTBuilderNode>* fst, std::vector<FSTBuilderNode>* fst, FSTBuilderNode* dol_node);
DiscIO::FSTBuilderNode* dol_node); void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard, std::span<const Patch> patches);
void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard, void ApplyApploaderMemoryPatches(const Core::CPUThreadGuard& guard, std::span<const Patch> patches,
const std::vector<Patch>& patches); u32 ram_address, u32 ram_length);
void ApplyApploaderMemoryPatches(const Core::CPUThreadGuard& guard, std::optional<SavegameRedirect> ExtractSavegameRedirect(std::span<const Patch> riivolution_patches);
const std::vector<Patch>& patches, u32 ram_address,
u32 ram_length);
std::optional<SavegameRedirect>
ExtractSavegameRedirect(const std::vector<Patch>& riivolution_patches);
} // namespace DiscIO::Riivolution } // namespace DiscIO::Riivolution