encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-06-07 07:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Omit match % for right sections, improve multi-section diffing

Browse Source 
Fixes #120
This commit is contained in:
Luke Street 2025-05-07 16:46:31 -06:00
parent 8b5bf21f38
commit 3db0727469
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
objdiff-core/src/diff/data.rs
View File

@ -274,7 +274,6 @@ pub fn diff_data_section(
// We only do this when all relocations on the left side match. // We only do this when all relocations on the left side match.
if left_section_diff.match_percent.unwrap_or(-1.0) < match_percent { if left_section_diff.match_percent.unwrap_or(-1.0) < match_percent {
left_section_diff.match_percent = Some(match_percent); left_section_diff.match_percent = Some(match_percent);
right_section_diff.match_percent = Some(match_percent);
} }
} }
Ok((left_section_diff, right_section_diff)) Ok((left_section_diff, right_section_diff))
@ -413,7 +412,7 @@ pub fn diff_generic_section(
}; };
Ok(( Ok((
SectionDiff { match_percent: Some(match_percent), data_diff: vec![], reloc_diff: vec![] }, SectionDiff { match_percent: Some(match_percent), data_diff: vec![], reloc_diff: vec![] },
SectionDiff { match_percent: Some(match_percent), data_diff: vec![], reloc_diff: vec![] }, SectionDiff { match_percent: None, data_diff: vec![], reloc_diff: vec![] },
)) ))
} }
@ -454,7 +453,7 @@ pub fn diff_bss_section(
Ok(( Ok((
SectionDiff { match_percent: Some(match_percent), data_diff: vec![], reloc_diff: vec![] }, SectionDiff { match_percent: Some(match_percent), data_diff: vec![], reloc_diff: vec![] },
SectionDiff { match_percent: Some(match_percent), data_diff: vec![], reloc_diff: vec![] }, SectionDiff { match_percent: None, data_diff: vec![], reloc_diff: vec![] },
)) ))
} }

4
objdiff-core/src/diff/display.rs
View File

@ -600,9 +600,7 @@ fn symbol_matches_filter(
return false; return false;
} }
if !show_hidden_symbols if !show_hidden_symbols
&& (symbol.size == 0 && (symbol.size == 0 || symbol.flags.contains(SymbolFlag::Hidden | SymbolFlag::Ignored))
|| symbol.flags.contains(SymbolFlag::Hidden)
|| symbol.flags.contains(SymbolFlag::Ignored))
{ {
return false; return false;
} }

19
objdiff-core/src/diff/mod.rs
View File

@ -658,7 +658,11 @@ fn find_symbol(
/// Find matching sections between each object. /// Find matching sections between each object.
fn matching_sections(left: Option<&Object>, right: Option<&Object>) -> Result<Vec<SectionMatch>> { fn matching_sections(left: Option<&Object>, right: Option<&Object>) -> Result<Vec<SectionMatch>> {
let mut matches = Vec::new(); let mut matches = Vec::with_capacity(
left.as_ref()
.map_or(0, |o| o.sections.len())
.max(right.as_ref().map_or(0, |o| o.sections.len())),
);
if let Some(left) = left { if let Some(left) = left {
for (section_idx, section) in left.sections.iter().enumerate() { for (section_idx, section) in left.sections.iter().enumerate() {
if section.kind == SectionKind::Unknown { if section.kind == SectionKind::Unknown {
@ -666,7 +670,7 @@ fn matching_sections(left: Option<&Object>, right: Option<&Object>) -> Result<Ve
} }
matches.push(SectionMatch { matches.push(SectionMatch {
left: Some(section_idx), left: Some(section_idx),
right: find_section(right, &section.name, section.kind), right: find_section(right, &section.name, section.kind, &matches),
section_kind: section.kind, section_kind: section.kind,
}); });
} }
@ -689,6 +693,13 @@ fn matching_sections(left: Option<&Object>, right: Option<&Object>) -> Result<Ve
Ok(matches) Ok(matches)
} }
fn find_section(obj: Option<&Object>, name: &str, section_kind: SectionKind) -> Option<usize> { fn find_section(
obj?.sections.iter().position(|s| s.kind == section_kind && s.name == name) obj: Option<&Object>,
name: &str,
section_kind: SectionKind,
matches: &[SectionMatch],
) -> Option<usize> {
obj?.sections.iter().enumerate().position(|(i, s)| {
s.kind == section_kind && s.name == name && !matches.iter().any(|m| m.right == Some(i))
})
} }