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

Mark combined sections as SectionKind::Unknown

Browse Source
This commit is contained in:
Luke Street 2025-05-07 16:45:00 -06:00
parent b77df77000
commit 8b5bf21f38
5 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,7 +684,7 @@ pub fn display_sections(
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if let Some(section_idx) = section_idx { if let Some(section_idx) = section_idx {
let section = &obj.sections[section_idx]; let section = &obj.sections[section_idx];
if section.kind == SectionKind::Unknown || section.flags.contains(SectionFlag::Hidden) { if section.kind == SectionKind::Unknown {
// Skip unknown and hidden sections // Skip unknown and hidden sections
continue; continue;
} }

1
objdiff-core/src/obj/mod.rs
View File

@ -57,7 +57,6 @@ flags! {
pub enum SectionFlag: u8 { pub enum SectionFlag: u8 {
/// Section combined from multiple input sections /// Section combined from multiple input sections
Combined, Combined,
Hidden,
} }
} }

2
objdiff-core/src/obj/read.rs
View File

@ -764,7 +764,7 @@ fn do_combine_sections(
line_info.append(&mut section.line_info.iter().map(|(&a, &l)| (a + offset, l)).collect()); line_info.append(&mut section.line_info.iter().map(|(&a, &l)| (a + offset, l)).collect());
section.line_info.clear(); section.line_info.clear();
if offset > 0 { if offset > 0 {
section.flags |= SectionFlag::Hidden; section.kind = SectionKind::Unknown;
} }
} }
{ {

8
objdiff-core/src/obj/snapshots/objdiff_core__obj__read__test__combine_sections.snap
View File

@ -84,11 +84,11 @@ expression: "(sections, symbols)"
name: ".data", name: ".data",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: None, align: None,
relocations: [], relocations: [],
line_info: {}, line_info: {},
@ -99,11 +99,11 @@ expression: "(sections, symbols)"
name: ".data", name: ".data",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: None, align: None,
relocations: [], relocations: [],
line_info: {}, line_info: {},

112
objdiff-core/tests/snapshots/arch_x86__read_x86_combine_sections.snap
View File

@ -42,11 +42,11 @@ expression: obj.sections
name: ".rdata", name: ".rdata",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -59,11 +59,11 @@ expression: obj.sections
name: ".rdata", name: ".rdata",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -76,11 +76,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -425,11 +425,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -442,11 +442,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -459,11 +459,11 @@ expression: obj.sections
name: ".data$rs", name: ".data$rs",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -476,11 +476,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -493,11 +493,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -510,11 +510,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -527,11 +527,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -544,11 +544,11 @@ expression: obj.sections
name: ".data$rs", name: ".data$rs",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -561,11 +561,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -578,11 +578,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -595,11 +595,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -612,11 +612,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -629,11 +629,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
1, 1,
), ),
@ -646,11 +646,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -663,11 +663,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -680,11 +680,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -697,11 +697,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -714,11 +714,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -731,11 +731,11 @@ expression: obj.sections
name: ".text$mn", name: ".text$mn",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -902,11 +902,11 @@ expression: obj.sections
name: ".text$yd", name: ".text$yd",
address: 0, address: 0,
size: 0, size: 0,
kind: Code, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
16, 16,
), ),
@ -919,11 +919,11 @@ expression: obj.sections
name: ".rdata", name: ".rdata",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -936,11 +936,11 @@ expression: obj.sections
name: ".rdata", name: ".rdata",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -953,11 +953,11 @@ expression: obj.sections
name: ".data", name: ".data",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -970,11 +970,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),
@ -987,11 +987,11 @@ expression: obj.sections
name: ".rdata$r", name: ".rdata$r",
address: 0, address: 0,
size: 0, size: 0,
kind: Data, kind: Unknown,
data: SectionData( data: SectionData(
0, 0,
), ),
flags: FlagSet(Hidden), flags: FlagSet(),
align: Some( align: Some(
4, 4,
), ),