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 a mechanism to provide original section indices for jump table regeneration (#130)

Browse source
This commit is contained in:
Wiseguy 2025-02-11 22:36:33 -05:00 • committed by GitHub
parent be65d37760
commit 8781eb44ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LiveRecomp/live_generator.cpp
View file

@ -1563,8 +1563,14 @@ void N64Recomp::LiveGenerator::emit_switch(const Context& recompiler_context, co
// Get the relocated address of the jump table. // Get the relocated address of the jump table.
uint32_t section_offset = jtbl.vram - jtbl_section.ram_addr; uint32_t section_offset = jtbl.vram - jtbl_section.ram_addr;
// Get the section index to use for relocation at runtime.
uint16_t reloc_section_index = jtbl.section_index;
if (!inputs.original_section_indices.empty()) {
reloc_section_index = inputs.original_section_indices[reloc_section_index];
}
// Populate the necessary fields of the dummy context and load the relocated address into temp2. // Populate the necessary fields of the dummy context and load the relocated address into temp2.
dummy_context.reloc_section_index = jtbl.section_index; dummy_context.reloc_section_index = reloc_section_index;
dummy_context.reloc_target_section_offset = section_offset; dummy_context.reloc_target_section_offset = section_offset;
load_relocated_address(dummy_context, Registers::arithmetic_temp2); load_relocated_address(dummy_context, Registers::arithmetic_temp2);

3
include/recompiler/live_recompiler.h
View file

@ -83,6 +83,9 @@ namespace N64Recomp {
std::unordered_map<size_t, size_t> entry_func_hooks; std::unordered_map<size_t, size_t> entry_func_hooks;
// Maps function index in recompiler context to function's return hook slot. // Maps function index in recompiler context to function's return hook slot.
std::unordered_map<size_t, size_t> return_func_hooks; std::unordered_map<size_t, size_t> return_func_hooks;
// Maps section index in the generated code to original section index. Used by regenerated
// code to relocate using the corresponding original section's address.
std::vector<size_t> original_section_indices;
}; };
class LiveGenerator final : public Generator { class LiveGenerator final : public Generator {
public: public: