encounter/decomp-toolkit
1
0
Fork 0
mirror of https://github.com/encounter/decomp-toolkit.git synced 2025-06-06 06:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve logic for generating padding symbols

Browse Source
This commit is contained in:
Luke Street 2025-01-27 17:10:05 -07:00
parent a22e878258
commit 6819a8bd5f
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/obj/splits.rs
View File

@ -5,7 +5,7 @@ use itertools::Itertools;
use crate::{ use crate::{
obj::{ObjInfo, ObjSection, SectionIndex}, obj::{ObjInfo, ObjSection, SectionIndex},
util::{nested::NestedVec, split::default_section_align}, util::split::default_section_align,
}; };
/// Marks a split point within a section. /// Marks a split point within a section.
@ -107,7 +107,9 @@ impl ObjSplits {
} }
pub fn push(&mut self, address: u32, split: ObjSplit) { pub fn push(&mut self, address: u32, split: ObjSplit) {
self.splits.nested_push(address, split); let out = self.splits.entry(address).or_default();
out.push(split);
out.sort_by_key(|s| s.end);
} }
pub fn remove(&mut self, address: u32) -> Option<Vec<ObjSplit>> { self.splits.remove(&address) } pub fn remove(&mut self, address: u32) -> Option<Vec<ObjSplit>> { self.splits.remove(&address) }

23
src/util/split.rs
View File

@ -530,8 +530,9 @@ fn validate_splits(obj: &ObjInfo) -> Result<()> {
/// Add padding symbols to fill in gaps between splits and symbols. /// Add padding symbols to fill in gaps between splits and symbols.
fn add_padding_symbols(obj: &mut ObjInfo) -> Result<()> { fn add_padding_symbols(obj: &mut ObjInfo) -> Result<()> {
for (section_index, section, addr, _split) in obj.sections.all_splits() { let mut splits = obj.sections.all_splits().peekable();
if section.name == ".ctors" || section.name == ".dtors" { while let Some((section_index, section, addr, split)) = splits.next() {
if section.name == ".ctors" || section.name == ".dtors" || addr == split.end {
continue; continue;
} }
@ -545,19 +546,31 @@ fn add_padding_symbols(obj: &mut ObjInfo) -> Result<()> {
})? })?
.is_none() .is_none()
{ {
let next_split_address = splits
.peek()
.map(|(_, _, addr, _)| *addr as u64)
.unwrap_or(section.address + section.size);
let next_symbol_address = obj let next_symbol_address = obj
.symbols .symbols
.for_section_range(section_index, addr + 1..) .for_section_range(section_index, addr + 1..next_split_address as u32)
.find(|&(_, s)| s.size_known && s.size > 0) .find(|&(_, s)| s.size_known && s.size > 0)
.map(|(_, s)| s.address) .map(|(_, s)| s.address)
.unwrap_or(section.address + section.size); .unwrap_or(next_split_address);
if next_symbol_address <= addr as u64 {
continue;
}
let symbol_name = format!( let symbol_name = format!(
"pad_{:02}_{:08X}_{}", "pad_{:02}_{:08X}_{}",
section_index, section_index,
addr, addr,
section.name.trim_start_matches('.') section.name.trim_start_matches('.')
); );
log::debug!("Adding padding symbol {} at {:#010X}", symbol_name, addr); log::debug!(
"Adding padding symbol {} at {:#010X}-{:#010X}",
symbol_name,
addr,
next_symbol_address
);
obj.symbols.add_direct(ObjSymbol { obj.symbols.add_direct(ObjSymbol {
name: symbol_name, name: symbol_name,
address: addr as u64, address: addr as u64,