Skip to content

Fix overlay table indices after section sort #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fliperama86 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix overlay table indices after section sort #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions librecomp/src/overlays.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,24 @@ void recomp::overlays::init_overlays() {
}
);

// code_sections is sorted in-place above, but overlays_info.table entries are
// generated from the original SectionTableEntry::index values. Remap the
// overlay table so those entries still point at the same sections after sort.
std::unordered_map<int, int> original_index_to_sorted_index;

for (size_t section_index = 0; section_index < sections_info.num_code_sections; section_index++) {
SectionTableEntry* code_section = &sections_info.code_sections[section_index];

section_addresses[sections_info.code_sections[section_index].index] = code_section->ram_addr;
code_sections_by_rom[code_section->rom_addr] = section_index;
section_addresses[code_section->index] = code_section->ram_addr;
code_sections_by_rom[code_section->rom_addr] = section_index;
original_index_to_sorted_index[code_section->index] = static_cast<int>(section_index);
}

for (size_t overlay_index = 0; overlay_index < overlays_info.len; overlay_index++) {
auto sorted_index_it = original_index_to_sorted_index.find(overlays_info.table[overlay_index]);
if (sorted_index_it != original_index_to_sorted_index.end()) {
overlays_info.table[overlay_index] = sorted_index_it->second;
}
}

load_patch_functions();
Expand Down