encounter/objdiff
0
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2026-03-30 11:32:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

Combine .init sections separately from .text sections (#304)

Browse Source
This commit is contained in:
LagoLunatic
2025-12-21 11:58:13 -05:00
committed by GitHub
parent 278683f103
commit f3f4b0482a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
objdiff-core/src/obj/read.rs
+7 -8
View File
@@ -824,19 +824,16 @@ fn combine_sections(
config: &DiffObjConfig,
) -> Result<()> {
let mut data_sections = BTreeMap::<String, Vec<usize>>::new();
let mut text_sections = Vec::<usize>::new();
let mut text_sections = BTreeMap::<String, Vec<usize>>::new();
for (i, section) in sections.iter().enumerate() {
let base_name =
if let Some(i) = section.name.rfind('$') { &section.name[..i] } else { &section.name };
match section.kind {
SectionKind::Data | SectionKind::Bss => {
let base_name = if let Some(i) = section.name.rfind('$') {
&section.name[..i]
} else {
&section.name
};
data_sections.entry(base_name.to_string()).or_default().push(i);
}
SectionKind::Code => {
text_sections.push(i);
text_sections.entry(base_name.to_string()).or_default().push(i);
}
_ => {}
}
@@ -847,7 +844,9 @@ fn combine_sections(
}
}
if config.combine_text_sections {
do_combine_sections(sections, symbols, &mut text_sections, ".text".to_string())?;
for (combined_name, mut section_indices) in text_sections {
do_combine_sections(sections, symbols, &mut section_indices, combined_name)?;
}
}
Ok(())
}