Also apply reimplemented_funcs and ignored_funcs

This commit is contained in:
Ethan Lafrenais 2025-01-16 01:00:31 -05:00
parent 37dabfb295
commit 91be352ee0
No known key found for this signature in database
GPG key ID: 928A0136009E2745
2 changed files with 6 additions and 2 deletions

View file

@ -665,7 +665,9 @@ bool N64Recomp::Context::import_reference_context(const N64Recomp::Context& refe
for (const N64Recomp::Function& func_in: reference_context.functions) { for (const N64Recomp::Function& func_in: reference_context.functions) {
// Rename if necessary // Rename if necessary
std::string name = func_in.name; std::string name = func_in.name;
if (N64Recomp::renamed_funcs.contains(name)) { if (N64Recomp::reimplemented_funcs.contains(name) ||
N64Recomp::ignored_funcs.contains(name) ||
N64Recomp::renamed_funcs.contains(name)) {
name = name + "_recomp"; name = name + "_recomp";
} }

View file

@ -417,7 +417,9 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
// Check if the symbol is undefined and to know whether to look for it in the reference symbols. // Check if the symbol is undefined and to know whether to look for it in the reference symbols.
if (rel_symbol_section_index == ELFIO::SHN_UNDEF) { if (rel_symbol_section_index == ELFIO::SHN_UNDEF) {
// Get renamed version of symbol name if necessary // Get renamed version of symbol name if necessary
if (N64Recomp::renamed_funcs.contains(rel_symbol_name)) { if (N64Recomp::reimplemented_funcs.contains(rel_symbol_name) ||
N64Recomp::ignored_funcs.contains(rel_symbol_name) ||
N64Recomp::renamed_funcs.contains(rel_symbol_name)) {
rel_symbol_name = rel_symbol_name + "_recomp"; rel_symbol_name = rel_symbol_name + "_recomp";
} }