From a3cc0bd13f4548707c4bda5a2157a81b4ba75a8b Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 13 Jul 2024 16:26:33 -0700 Subject: [PATCH] use ResourceDASM namespace where needed --- src/AddressTranslator.cc | 24 ++++++++++++------------ src/FunctionCompiler.cc | 16 ++++++++-------- src/ProxyCommands.cc | 6 +++--- src/QuestScript.cc | 6 +++--- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/AddressTranslator.cc b/src/AddressTranslator.cc index de469c8a..65804496 100644 --- a/src/AddressTranslator.cc +++ b/src/AddressTranslator.cc @@ -115,8 +115,8 @@ public: if (ends_with(filename, ".dol")) { string name = filename.substr(0, filename.size() - 4); string path = directory + "/" + filename; - DOLFile dol(path.c_str()); - auto mem = make_shared(); + ResourceDASM::DOLFile dol(path.c_str()); + auto mem = make_shared(); dol.load_into(mem); this->mems.emplace(name, mem); this->enable_ppc = true; @@ -124,8 +124,8 @@ public: } else if (ends_with(filename, ".xbe")) { string name = filename.substr(0, filename.size() - 4); string path = directory + "/" + filename; - XBEFile xbe(path.c_str()); - auto mem = make_shared(); + ResourceDASM::XBEFile xbe(path.c_str()); + auto mem = make_shared(); xbe.load_into(mem); this->mems.emplace(name, mem); this->log.info("Loaded %s", name.c_str()); @@ -133,7 +133,7 @@ public: string name = filename.substr(0, filename.size() - 4); string path = directory + "/" + filename; string data = load_file(path); - auto mem = make_shared(); + auto mem = make_shared(); mem->allocate_at(0x8C010000, data.size()); mem->memcpy(0x8C010000, data.data(), data.size()); this->mems.emplace(name, mem); @@ -204,7 +204,7 @@ public: } uint32_t find_match( - shared_ptr dest_mem, + shared_ptr dest_mem, uint32_t src_addr, uint32_t src_size, ExpandMethod expand_method) const { @@ -470,9 +470,9 @@ public: private: PrefixedLogger log; string directory; - unordered_map> mems; + unordered_map> mems; string src_filename; - shared_ptr src_mem; + shared_ptr src_mem; bool enable_ppc; }; @@ -490,10 +490,10 @@ void run_address_translator(const std::string& directory, const std::string& use } vector> diff_dol_files(const string& a_filename, const string& b_filename) { - DOLFile a(a_filename.c_str()); - DOLFile b(b_filename.c_str()); - auto a_mem = make_shared(); - auto b_mem = make_shared(); + ResourceDASM::DOLFile a(a_filename.c_str()); + ResourceDASM::DOLFile b(b_filename.c_str()); + auto a_mem = make_shared(); + auto b_mem = make_shared(); a.load_into(a_mem); b.load_into(b_mem); diff --git a/src/FunctionCompiler.cc b/src/FunctionCompiler.cc index cd454977..56de9f44 100644 --- a/src/FunctionCompiler.cc +++ b/src/FunctionCompiler.cc @@ -169,16 +169,16 @@ shared_ptr compile_function_code( if (!get_include_stack.emplace(name).second) { throw runtime_error("mutual recursion between includes: " + name); } - EmulatorBase::AssembleResult ret; + ResourceDASM::EmulatorBase::AssembleResult ret; switch (arch) { case CompiledFunctionCode::Architecture::POWERPC: - ret = PPC32Emulator::assemble(load_file(asm_filename), get_include); + ret = ResourceDASM::PPC32Emulator::assemble(load_file(asm_filename), get_include); break; case CompiledFunctionCode::Architecture::X86: - ret = X86Emulator::assemble(load_file(asm_filename), get_include); + ret = ResourceDASM::X86Emulator::assemble(load_file(asm_filename), get_include); break; case CompiledFunctionCode::Architecture::SH4: - ret = SH4Emulator::assemble(load_file(asm_filename), get_include); + ret = ResourceDASM::SH4Emulator::assemble(load_file(asm_filename), get_include); break; default: throw runtime_error("unknown architecture"); @@ -198,13 +198,13 @@ shared_ptr compile_function_code( throw runtime_error("data not found for include: " + name + " (from " + asm_filename + " or " + bin_filename + ")"); }; - EmulatorBase::AssembleResult assembled; + ResourceDASM::EmulatorBase::AssembleResult assembled; if (arch == CompiledFunctionCode::Architecture::POWERPC) { - assembled = PPC32Emulator::assemble(text, get_include); + assembled = ResourceDASM::PPC32Emulator::assemble(text, get_include); } else if (arch == CompiledFunctionCode::Architecture::X86) { - assembled = X86Emulator::assemble(text, get_include); + assembled = ResourceDASM::X86Emulator::assemble(text, get_include); } else if (arch == CompiledFunctionCode::Architecture::SH4) { - assembled = SH4Emulator::assemble(text, get_include); + assembled = ResourceDASM::SH4Emulator::assemble(text, get_include); } else { throw runtime_error("invalid architecture"); } diff --git a/src/ProxyCommands.cc b/src/ProxyCommands.cc index 3306e954..5e8825af 100644 --- a/src/ProxyCommands.cc +++ b/src/ProxyCommands.cc @@ -754,19 +754,19 @@ static HandlerResult S_B2(shared_ptr ses, uint16_t, string disassembly; if (is_ppc) { - disassembly = PPC32Emulator::disassemble( + disassembly = ResourceDASM::PPC32Emulator::disassemble( &r.pget(0, code.size()), code.size(), 0, &labels); } else if (is_x86) { - disassembly = X86Emulator::disassemble( + disassembly = ResourceDASM::X86Emulator::disassemble( &r.pget(0, code.size()), code.size(), 0, &labels); } else if (is_sh4) { - disassembly = SH4Emulator::disassemble( + disassembly = ResourceDASM::SH4Emulator::disassemble( &r.pget(0, code.size()), code.size(), 0, diff --git a/src/QuestScript.cc b/src/QuestScript.cc index 7c17ff3e..a529859b 100644 --- a/src/QuestScript.cc +++ b/src/QuestScript.cc @@ -2225,11 +2225,11 @@ std::string assemble_quest_script(const std::string& text, const std::string& in string native_text = load_file(include_directory + "/" + filename); string code; if (is_ppc(quest_version)) { - code = std::move(PPC32Emulator::assemble(native_text).code); + code = std::move(ResourceDASM::PPC32Emulator::assemble(native_text).code); } else if (is_x86(quest_version)) { - code = std::move(X86Emulator::assemble(native_text).code); + code = std::move(ResourceDASM::X86Emulator::assemble(native_text).code); } else if (is_sh4(quest_version)) { - code = std::move(SH4Emulator::assemble(native_text).code); + code = std::move(ResourceDASM::SH4Emulator::assemble(native_text).code); } else { throw runtime_error("unknown architecture"); }