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

Simplify line_info (no Option)

Browse Source
This commit is contained in:
Luke Street 2024-05-21 09:24:06 -06:00
parent ee9cef4c6f
commit 88af321192
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
objdiff-core/src/arch/mips.rs
View File

@ -111,10 +111,7 @@ impl ObjArch for ObjArchMips {
} }
} }
} }
let line = section let line = section.line_info.range(..=cur_addr as u64).last().map(|(_, &b)| b);
.line_info
.as_ref()
.and_then(|map| map.range(..=cur_addr as u64).last().map(|(_, &b)| b));
insts.push(ObjIns { insts.push(ObjIns {
address: cur_addr as u64, address: cur_addr as u64,
size: 4, size: 4,

5
objdiff-core/src/arch/ppc.rs
View File

@ -132,10 +132,7 @@ impl ObjArch for ObjArchPpc {
} }
ops.push(ins.op as u16); ops.push(ins.op as u16);
let line = section let line = section.line_info.range(..=cur_addr as u64).last().map(|(_, &b)| b);
.line_info
.as_ref()
.and_then(|map| map.range(..=cur_addr as u64).last().map(|(_, &b)| b));
insts.push(ObjIns { insts.push(ObjIns {
address: cur_addr as u64, address: cur_addr as u64,
size: 4, size: 4,

2
objdiff-core/src/arch/x86.rs
View File

@ -73,7 +73,7 @@ impl ObjArch for ObjArchX86 {
.relocations .relocations
.iter() .iter()
.find(|r| r.address >= address && r.address < address + instruction.len() as u64); .find(|r| r.address >= address && r.address < address + instruction.len() as u64);
let line = section.line_info.as_ref().and_then(|m| m.get(&address).cloned()); let line = section.line_info.range(..=address).last().map(|(_, &b)| b);
output.ins = ObjIns { output.ins = ObjIns {
address, address,
size: instruction.len() as u8, size: instruction.len() as u8,

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

@ -40,7 +40,7 @@ pub struct ObjSection {
pub relocations: Vec<ObjReloc>, pub relocations: Vec<ObjReloc>,
pub virtual_address: Option<u64>, pub virtual_address: Option<u64>,
/// Line number info (.line or .debug_line section) /// Line number info (.line or .debug_line section)
pub line_info: Option<BTreeMap<u64, u64>>, pub line_info: BTreeMap<u64, u64>,
} }
#[derive(Debug, Clone, Eq, PartialEq)] #[derive(Debug, Clone, Eq, PartialEq)]

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

@ -111,7 +111,7 @@ fn filter_sections(obj_file: &File<'_>, split_meta: Option<&SplitMeta>) -> Resul
symbols: Vec::new(), symbols: Vec::new(),
relocations: Vec::new(), relocations: Vec::new(),
virtual_address, virtual_address,
line_info: None, line_info: Default::default(),
}); });
} }
result.sort_by(|a, b| a.name.cmp(&b.name)); result.sort_by(|a, b| a.name.cmp(&b.name));
@ -292,7 +292,6 @@ fn line_info(obj_file: &File<'_>, sections: &mut [ObjSection]) -> Result<()> {
reader.set_position(start + size as u64); reader.set_position(start + size as u64);
continue; continue;
}; };
let lines = out_section.line_info.get_or_insert_with(Default::default);
let end = start + size as u64; let end = start + size as u64;
while reader.position() < end { while reader.position() < end {
let line_number = reader.read_u32::<BigEndian>()? as u64; let line_number = reader.read_u32::<BigEndian>()? as u64;
@ -301,7 +300,7 @@ fn line_info(obj_file: &File<'_>, sections: &mut [ObjSection]) -> Result<()> {
log::warn!("Unhandled statement pos {}", statement_pos); log::warn!("Unhandled statement pos {}", statement_pos);
} }
let address_delta = reader.read_u32::<BigEndian>()? as u64; let address_delta = reader.read_u32::<BigEndian>()? as u64;
lines.insert(base_address + address_delta, line_number); out_section.line_info.insert(base_address + address_delta, line_number);
log::debug!("Line: {:#x} -> {}", base_address + address_delta, line_number); log::debug!("Line: {:#x} -> {}", base_address + address_delta, line_number);
} }
} }
@ -337,7 +336,7 @@ fn line_info(obj_file: &File<'_>, sections: &mut [ObjSection]) -> Result<()> {
let mut lines = sections let mut lines = sections
.iter_mut() .iter_mut()
.find(|s| s.orig_index == section_index) .find(|s| s.orig_index == section_index)
.map(|s| s.line_info.get_or_insert_with(Default::default)); .map(|s| &mut s.line_info);
let mut rows = program.rows(); let mut rows = program.rows();
while let Some((_header, row)) = rows.next_row()? { while let Some((_header, row)) = rows.next_row()? {
@ -355,7 +354,7 @@ fn line_info(obj_file: &File<'_>, sections: &mut [ObjSection]) -> Result<()> {
lines = sections lines = sections
.iter_mut() .iter_mut()
.find(|s| s.orig_index == section_index) .find(|s| s.orig_index == section_index)
.map(|s| s.line_info.get_or_insert_with(Default::default)); .map(|s| &mut s.line_info);
} }
} }
} }