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

Add an option to the context to force function lookup for all non-relocated function calls

Browse source
This commit is contained in:
Mr-Wiseguy 2025-01-09 01:56:43 -05:00
parent f09031e84e
commit 8641508cd3
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/recompiler/context.h
View file

@ -223,6 +223,8 @@ namespace N64Recomp {
std::vector<uint8_t> rom; std::vector<uint8_t> rom;
// Whether reference symbols should be validated when emitting function calls during recompilation. // Whether reference symbols should be validated when emitting function calls during recompilation.
bool skip_validating_reference_symbols = true; bool skip_validating_reference_symbols = true;
// Whether all function calls (excluding reference symbols) should go through lookup.
bool use_lookup_for_all_function_calls = false;
//// Only used by the CLI, TODO move this to a struct in the internal headers. //// Only used by the CLI, TODO move this to a struct in the internal headers.
// A mapping of function name to index in the functions vector // A mapping of function name to index in the functions vector

8
src/recompilation.cpp
View file

@ -22,6 +22,11 @@ enum class JalResolutionResult {
}; };
JalResolutionResult resolve_jal(const N64Recomp::Context& context, size_t cur_section_index, uint32_t target_func_vram, size_t& matched_function_index) { JalResolutionResult resolve_jal(const N64Recomp::Context& context, size_t cur_section_index, uint32_t target_func_vram, size_t& matched_function_index) {
// Skip resolution if all function calls should use lookup and just return Ambiguous.
if (context.use_lookup_for_all_function_calls) {
return JalResolutionResult::Ambiguous;
}
// Look for symbols with the target vram address // Look for symbols with the target vram address
const N64Recomp::Section& cur_section = context.sections[cur_section_index]; const N64Recomp::Section& cur_section = context.sections[cur_section_index];
const auto matching_funcs_find = context.functions_by_vram.find(target_func_vram); const auto matching_funcs_find = context.functions_by_vram.find(target_func_vram);
@ -316,7 +321,10 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
call_by_name = true; call_by_name = true;
break; break;
case JalResolutionResult::Ambiguous: case JalResolutionResult::Ambiguous:
// Print a warning if lookup isn't forced for all non-reloc function calls.
if (!context.use_lookup_for_all_function_calls) {
fmt::print(stderr, "[Info] Ambiguous jal target 0x{:08X} in function {}, falling back to function lookup\n", target_func_vram, func.name); fmt::print(stderr, "[Info] Ambiguous jal target 0x{:08X} in function {}, falling back to function lookup\n", target_func_vram, func.name);
}
// Relocation isn't necessary for jumps inside a relocatable section, as this code path will never run if the target vram // Relocation isn't necessary for jumps inside a relocatable section, as this code path will never run if the target vram
// is in the current function's section (see the branch for `in_current_section` above). // is in the current function's section (see the branch for `in_current_section` above).
// If a game ever needs to jump between multiple relocatable sections, relocation will be necessary here. // If a game ever needs to jump between multiple relocatable sections, relocation will be necessary here.