Mirrors/N64Recomp
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64Recomp.git synced 2025-05-14 08:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused code, tidy updates, uniformity

Browse source
This commit is contained in:
dcvz 2024-05-15 09:29:45 +02:00 • committed by Mr-Wiseguy
parent a67337c7c3
commit 05e07e79e2
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/config.cpp
View file

@ -48,7 +48,7 @@ std::vector<std::string> get_stubbed_funcs(const toml::table* patches_data) {
stubbed_funcs.push_back(*el); stubbed_funcs.push_back(*el);
} }
else { else {
throw toml::parse_error{ "Invalid stubbed function", el.source()}; throw toml::parse_error("Invalid stubbed function", el.source());
} }
}); });
} }
@ -196,7 +196,6 @@ std::vector<RecompPort::InstructionPatch> get_instruction_patches(const toml::ta
const toml::table& cur_patch = *el.as_table(); const toml::table& cur_patch = *el.as_table();
// Get the vram and make sure it's 4-byte aligned. // Get the vram and make sure it's 4-byte aligned.
auto testval = cur_patch["vram"];
std::optional<uint32_t> vram = cur_patch["vram"].value<uint32_t>(); std::optional<uint32_t> vram = cur_patch["vram"].value<uint32_t>();
std::optional<std::string> func_name = cur_patch["func"].value<std::string>(); std::optional<std::string> func_name = cur_patch["func"].value<std::string>();
std::optional<uint32_t> value = cur_patch["value"].value<uint32_t>(); std::optional<uint32_t> value = cur_patch["value"].value<uint32_t>();
@ -484,8 +483,6 @@ bool RecompPort::Context::from_symbol_file(const std::filesystem::path& symbol_f
const toml::array* relocs_array = relocs_value.as_array(); const toml::array* relocs_array = relocs_value.as_array();
relocs_array->for_each([&ret, &rom, &section, section_index](auto&& reloc_el) { relocs_array->for_each([&ret, &rom, &section, section_index](auto&& reloc_el) {
if constexpr (toml::is_table<decltype(reloc_el)>) { if constexpr (toml::is_table<decltype(reloc_el)>) {
size_t reloc_index = ret.functions.size();
std::optional<uint32_t> vram = reloc_el["vram"].template value<uint32_t>(); std::optional<uint32_t> vram = reloc_el["vram"].template value<uint32_t>();
std::optional<uint32_t> target_vram = reloc_el["target_vram"].template value<uint32_t>(); std::optional<uint32_t> target_vram = reloc_el["target_vram"].template value<uint32_t>();
std::optional<std::string> type_string = reloc_el["type"].template value<std::string>(); std::optional<std::string> type_string = reloc_el["type"].template value<std::string>();
@ -508,7 +505,7 @@ bool RecompPort::Context::from_symbol_file(const std::filesystem::path& symbol_f
cur_reloc.target_section = section_index; cur_reloc.target_section = section_index;
cur_reloc.type = reloc_type; cur_reloc.type = reloc_type;
section.relocs.emplace_back(std::move(cur_reloc)); section.relocs.emplace_back(cur_reloc);
} }
else { else {
throw toml::parse_error("Invalid reloc entry", reloc_el.source()); throw toml::parse_error("Invalid reloc entry", reloc_el.source());