summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-09-22 04:43:49 +0200
committerZach Hilman <zachhilman@gmail.com>2019-09-22 04:43:49 +0200
commit2bddc0346815bf5e893ad9611d89dbb0d511e32f (patch)
treea613f239938891b6d89c37df63caf5d842de8070 /src/core
parentdmnt_cheat_vm: Make Cheat VM compliant to code style (diff)
downloadyuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.tar
yuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.tar.gz
yuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.tar.bz2
yuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.tar.lz
yuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.tar.xz
yuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.tar.zst
yuzu-2bddc0346815bf5e893ad9611d89dbb0d511e32f.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/file_sys/patch_manager.cpp3
-rw-r--r--src/core/memory/dmnt_cheat_types.h30
-rw-r--r--src/core/memory/dmnt_cheat_vm.h144
3 files changed, 88 insertions, 89 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index 90b537834..df0ecb15c 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -278,8 +278,7 @@ std::optional<std::vector<Memory::CheatEntry>> ReadCheatFileFromFolder(
std::vector<Memory::CheatEntry> PatchManager::CreateCheatList(
const Core::System& system, const std::array<u8, 32>& build_id_) const {
- const auto load_dir =
- Core::System::GetInstance().GetFileSystemController().GetModificationLoadRoot(title_id);
+ const auto load_dir = system.GetFileSystemController().GetModificationLoadRoot(title_id);
if (load_dir == nullptr) {
LOG_ERROR(Loader, "Cannot load mods for invalid title_id={:016X}", title_id);
return {};
diff --git a/src/core/memory/dmnt_cheat_types.h b/src/core/memory/dmnt_cheat_types.h
index aa1264c32..bf68fa0fe 100644
--- a/src/core/memory/dmnt_cheat_types.h
+++ b/src/core/memory/dmnt_cheat_types.h
@@ -29,30 +29,30 @@
namespace Memory {
struct MemoryRegionExtents {
- u64 base;
- u64 size;
+ u64 base{};
+ u64 size{};
};
struct CheatProcessMetadata {
- u64 process_id;
- u64 title_id;
- MemoryRegionExtents main_nso_extents;
- MemoryRegionExtents heap_extents;
- MemoryRegionExtents alias_extents;
- MemoryRegionExtents address_space_extents;
- std::array<u8, 0x20> main_nso_build_id;
+ u64 process_id{};
+ u64 title_id{};
+ MemoryRegionExtents main_nso_extents{};
+ MemoryRegionExtents heap_extents{};
+ MemoryRegionExtents alias_extents{};
+ MemoryRegionExtents address_space_extents{};
+ std::array<u8, 0x20> main_nso_build_id{};
};
struct CheatDefinition {
- std::array<char, 0x40> readable_name;
- u32 num_opcodes;
- std::array<u32, 0x100> opcodes;
+ std::array<char, 0x40> readable_name{};
+ u32 num_opcodes{};
+ std::array<u32, 0x100> opcodes{};
};
struct CheatEntry {
- bool enabled;
- u32 cheat_id;
- CheatDefinition definition;
+ bool enabled{};
+ u32 cheat_id{};
+ CheatDefinition definition{};
};
} // namespace Memory
diff --git a/src/core/memory/dmnt_cheat_vm.h b/src/core/memory/dmnt_cheat_vm.h
index d1580d7f6..c36212cf1 100644
--- a/src/core/memory/dmnt_cheat_vm.h
+++ b/src/core/memory/dmnt_cheat_vm.h
@@ -136,131 +136,131 @@ union VmInt {
};
struct StoreStaticOpcode {
- u32 bit_width;
- MemoryAccessType mem_type;
- u32 offset_register;
- u64 rel_address;
- VmInt value;
+ u32 bit_width{};
+ MemoryAccessType mem_type{};
+ u32 offset_register{};
+ u64 rel_address{};
+ VmInt value{};
};
struct BeginConditionalOpcode {
- u32 bit_width;
- MemoryAccessType mem_type;
- ConditionalComparisonType cond_type;
- u64 rel_address;
- VmInt value;
+ u32 bit_width{};
+ MemoryAccessType mem_type{};
+ ConditionalComparisonType cond_type{};
+ u64 rel_address{};
+ VmInt value{};
};
struct EndConditionalOpcode {};
struct ControlLoopOpcode {
- bool start_loop;
- u32 reg_index;
- u32 num_iters;
+ bool start_loop{};
+ u32 reg_index{};
+ u32 num_iters{};
};
struct LoadRegisterStaticOpcode {
- u32 reg_index;
- u64 value;
+ u32 reg_index{};
+ u64 value{};
};
struct LoadRegisterMemoryOpcode {
- u32 bit_width;
- MemoryAccessType mem_type;
- u32 reg_index;
- bool load_from_reg;
- u64 rel_address;
+ u32 bit_width{};
+ MemoryAccessType mem_type{};
+ u32 reg_index{};
+ bool load_from_reg{};
+ u64 rel_address{};
};
struct StoreStaticToAddressOpcode {
- u32 bit_width;
- u32 reg_index;
- bool increment_reg;
- bool add_offset_reg;
- u32 offset_reg_index;
- u64 value;
+ u32 bit_width{};
+ u32 reg_index{};
+ bool increment_reg{};
+ bool add_offset_reg{};
+ u32 offset_reg_index{};
+ u64 value{};
};
struct PerformArithmeticStaticOpcode {
- u32 bit_width;
- u32 reg_index;
- RegisterArithmeticType math_type;
- u32 value;
+ u32 bit_width{};
+ u32 reg_index{};
+ RegisterArithmeticType math_type{};
+ u32 value{};
};
struct BeginKeypressConditionalOpcode {
- u32 key_mask;
+ u32 key_mask{};
};
struct PerformArithmeticRegisterOpcode {
- u32 bit_width;
- RegisterArithmeticType math_type;
- u32 dst_reg_index;
- u32 src_reg_1_index;
- u32 src_reg_2_index;
- bool has_immediate;
- VmInt value;
+ u32 bit_width{};
+ RegisterArithmeticType math_type{};
+ u32 dst_reg_index{};
+ u32 src_reg_1_index{};
+ u32 src_reg_2_index{};
+ bool has_immediate{};
+ VmInt value{};
};
struct StoreRegisterToAddressOpcode {
- u32 bit_width;
- u32 str_reg_index;
- u32 addr_reg_index;
- bool increment_reg;
- StoreRegisterOffsetType ofs_type;
- MemoryAccessType mem_type;
- u32 ofs_reg_index;
- u64 rel_address;
+ u32 bit_width{};
+ u32 str_reg_index{};
+ u32 addr_reg_index{};
+ bool increment_reg{};
+ StoreRegisterOffsetType ofs_type{};
+ MemoryAccessType mem_type{};
+ u32 ofs_reg_index{};
+ u64 rel_address{};
};
struct BeginRegisterConditionalOpcode {
- u32 bit_width;
- ConditionalComparisonType cond_type;
- u32 val_reg_index;
- CompareRegisterValueType comp_type;
- MemoryAccessType mem_type;
- u32 addr_reg_index;
- u32 other_reg_index;
- u32 ofs_reg_index;
- u64 rel_address;
- VmInt value;
+ u32 bit_width{};
+ ConditionalComparisonType cond_type{};
+ u32 val_reg_index{};
+ CompareRegisterValueType comp_type{};
+ MemoryAccessType mem_type{};
+ u32 addr_reg_index{};
+ u32 other_reg_index{};
+ u32 ofs_reg_index{};
+ u64 rel_address{};
+ VmInt value{};
};
struct SaveRestoreRegisterOpcode {
- u32 dst_index;
- u32 src_index;
- SaveRestoreRegisterOpType op_type;
+ u32 dst_index{};
+ u32 src_index{};
+ SaveRestoreRegisterOpType op_type{};
};
struct SaveRestoreRegisterMaskOpcode {
- SaveRestoreRegisterOpType op_type;
- std::array<bool, 0x10> should_operate;
+ SaveRestoreRegisterOpType op_type{};
+ std::array<bool, 0x10> should_operate{};
};
struct DebugLogOpcode {
- u32 bit_width;
- u32 log_id;
- DebugLogValueType val_type;
- MemoryAccessType mem_type;
- u32 addr_reg_index;
- u32 val_reg_index;
- u32 ofs_reg_index;
- u64 rel_address;
+ u32 bit_width{};
+ u32 log_id{};
+ DebugLogValueType val_type{};
+ MemoryAccessType mem_type{};
+ u32 addr_reg_index{};
+ u32 val_reg_index{};
+ u32 ofs_reg_index{};
+ u64 rel_address{};
};
struct UnrecognizedInstruction {
- CheatVmOpcodeType opcode;
+ CheatVmOpcodeType opcode{};
};
struct CheatVmOpcode {
- bool begin_conditional_block;
+ bool begin_conditional_block{};
std::variant<StoreStaticOpcode, BeginConditionalOpcode, EndConditionalOpcode, ControlLoopOpcode,
LoadRegisterStaticOpcode, LoadRegisterMemoryOpcode, StoreStaticToAddressOpcode,
PerformArithmeticStaticOpcode, BeginKeypressConditionalOpcode,
PerformArithmeticRegisterOpcode, StoreRegisterToAddressOpcode,
BeginRegisterConditionalOpcode, SaveRestoreRegisterOpcode,
SaveRestoreRegisterMaskOpcode, DebugLogOpcode, UnrecognizedInstruction>
- opcode;
+ opcode{};
};
class DmntCheatVm {