Apply renamed_funcs to reference symbols

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

View file

@ -663,7 +663,13 @@ bool N64Recomp::Context::import_reference_context(const N64Recomp::Context& refe
// Copy the functions from the reference context into the reference context's function map. // Copy the functions from the reference context into the reference context's function map.
for (const N64Recomp::Function& func_in: reference_context.functions) { for (const N64Recomp::Function& func_in: reference_context.functions) {
if (!add_reference_symbol(func_in.name, func_in.section_index, func_in.vram, true)) { // Rename if necessary
std::string name = func_in.name;
if (N64Recomp::renamed_funcs.contains(name)) {
name = name + "_recomp";
}
if (!add_reference_symbol(name, func_in.section_index, func_in.vram, true)) {
return false; return false;
} }
} }

View file

@ -416,6 +416,11 @@ 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
if (N64Recomp::renamed_funcs.contains(rel_symbol_name)) {
rel_symbol_name = rel_symbol_name + "_recomp";
}
// Undefined sym, check the reference symbols. // Undefined sym, check the reference symbols.
N64Recomp::SymbolReference sym_ref; N64Recomp::SymbolReference sym_ref;
if (!context.find_reference_symbol(rel_symbol_name, sym_ref)) { if (!context.find_reference_symbol(rel_symbol_name, sym_ref)) {