mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-20 19:31:53 +02:00
7cecb28bdf
This fixes a problem I was having where using frame advance with the debugger open would frequently cause panic alerts about invalid addresses due to the CPU thread changing MSR.DR while the host thread was trying to access memory. To aid in tracking down all the places where we weren't properly locking the CPU, I've created a new type (in Core.h) that you have to pass as a reference or pointer to functions that require running as the CPU thread.
89 lines
3.1 KiB
C++
89 lines
3.1 KiB
C++
// Copyright 2021 Dolphin Emulator Project
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
#pragma once
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <vector>
|
|
|
|
#include "DiscIO/DirectoryBlob.h"
|
|
#include "DiscIO/RiivolutionParser.h"
|
|
|
|
namespace Core
|
|
{
|
|
class CPUThreadGuard;
|
|
}
|
|
|
|
namespace DiscIO::Riivolution
|
|
{
|
|
struct SavegameRedirect
|
|
{
|
|
std::string m_target_path;
|
|
bool m_clone;
|
|
};
|
|
|
|
class FileDataLoader
|
|
{
|
|
public:
|
|
struct Node
|
|
{
|
|
std::string m_filename;
|
|
bool m_is_directory;
|
|
};
|
|
|
|
virtual ~FileDataLoader();
|
|
virtual std::optional<u64> GetExternalFileSize(std::string_view external_relative_path) = 0;
|
|
virtual std::vector<u8> GetFileContents(std::string_view external_relative_path) = 0;
|
|
virtual std::vector<Node> GetFolderContents(std::string_view external_relative_path) = 0;
|
|
virtual BuilderContentSource MakeContentSource(std::string_view external_relative_path,
|
|
u64 external_offset, u64 external_size,
|
|
u64 disc_offset) = 0;
|
|
virtual std::optional<std::string>
|
|
ResolveSavegameRedirectPath(std::string_view external_relative_path) = 0;
|
|
};
|
|
|
|
class FileDataLoaderHostFS : public FileDataLoader
|
|
{
|
|
public:
|
|
// sd_root should be an absolute path to the folder representing our virtual SD card
|
|
// xml_path should be an absolute path to the parsed XML file
|
|
// patch_root should be the 'root' attribute given in the 'patch' or 'wiiroot' XML element
|
|
FileDataLoaderHostFS(std::string sd_root, const std::string& xml_path,
|
|
std::string_view patch_root);
|
|
|
|
std::optional<u64> GetExternalFileSize(std::string_view external_relative_path) override;
|
|
std::vector<u8> GetFileContents(std::string_view external_relative_path) override;
|
|
std::vector<FileDataLoader::Node>
|
|
GetFolderContents(std::string_view external_relative_path) override;
|
|
BuilderContentSource MakeContentSource(std::string_view external_relative_path,
|
|
u64 external_offset, u64 external_size,
|
|
u64 disc_offset) override;
|
|
std::optional<std::string>
|
|
ResolveSavegameRedirectPath(std::string_view external_relative_path) override;
|
|
|
|
private:
|
|
std::optional<std::string> MakeAbsoluteFromRelative(std::string_view external_relative_path);
|
|
|
|
std::string m_sd_root;
|
|
std::string m_patch_root;
|
|
};
|
|
|
|
enum class PatchIndex
|
|
{
|
|
FileSystem,
|
|
DolphinSysFiles,
|
|
};
|
|
|
|
void ApplyPatchesToFiles(const std::vector<Patch>& patches, PatchIndex index,
|
|
std::vector<DiscIO::FSTBuilderNode>* fst,
|
|
DiscIO::FSTBuilderNode* dol_node);
|
|
void ApplyGeneralMemoryPatches(const Core::CPUThreadGuard& guard,
|
|
const std::vector<Patch>& patches);
|
|
void ApplyApploaderMemoryPatches(const Core::CPUThreadGuard& guard,
|
|
const std::vector<Patch>& patches, u32 ram_address,
|
|
u32 ram_length);
|
|
std::optional<SavegameRedirect>
|
|
ExtractSavegameRedirect(const std::vector<Patch>& riivolution_patches);
|
|
} // namespace DiscIO::Riivolution
|