From 7849cda3f9be3ba7da2abb0e7f4d9f201b43fa50 Mon Sep 17 00:00:00 2001 From: KyleMiles Date: Wed, 23 Aug 2023 10:12:14 -0400 Subject: DWARF Import : Introduce fastpath for compilation unit handling --- rust/examples/dwarf/dwarf_import/src/helpers.rs | 123 ++++++++++++++++++++---- 1 file changed, 104 insertions(+), 19 deletions(-) (limited to 'rust/examples/dwarf/dwarf_import/src/helpers.rs') diff --git a/rust/examples/dwarf/dwarf_import/src/helpers.rs b/rust/examples/dwarf/dwarf_import/src/helpers.rs index 8670e6f4..f3b7dd81 100644 --- a/rust/examples/dwarf/dwarf_import/src/helpers.rs +++ b/rust/examples/dwarf/dwarf_import/src/helpers.rs @@ -33,6 +33,11 @@ pub(crate) fn get_uid>( //////////////////////////////////// // DIE attr convenience functions +pub(crate) enum DieReference> { + Offset(UnitOffset), + UnitAndOffset((Unit, UnitOffset)), +} + fn get_unit_copy<'a, R: Reader>(dwarf: &'a Dwarf, unit: &'a Unit) -> Unit { let mut iter = dwarf.units(); while let Ok(Some(header)) = iter.next() { @@ -45,17 +50,20 @@ fn get_unit_copy<'a, R: Reader>(dwarf: &'a Dwarf, unit: &'a U pub(crate) fn get_attr_die<'a, R: Reader>( dwarf: &'a Dwarf, - unit: &'a Unit, + _unit: &'a Unit, entry: &'a DebuggingInformationEntry, attr: constants::DwAt, -) -> Option<(Unit, UnitOffset)> { +) -> Option> { match entry.attr_value(attr) { - Ok(Some(UnitRef(offset))) => Some((get_unit_copy(dwarf, unit), offset)), + Ok(Some(UnitRef(offset))) => Some(DieReference::Offset(offset)), Ok(Some(DebugInfoRef(offset))) | Ok(Some(DebugInfoRefSup(offset))) => { let mut iter = dwarf.units(); while let Ok(Some(header)) = iter.next() { if let Some(new_offset) = offset.to_unit_offset(&header) { - return Some((dwarf.unit(header).unwrap(), new_offset)); + return Some(DieReference::UnitAndOffset(( + dwarf.unit(header).unwrap(), + new_offset, + ))); } } unreachable!() //None @@ -68,17 +76,75 @@ pub(crate) fn resolve_specification<'a, R: Reader>( dwarf: &'a Dwarf, unit: &'a Unit, entry: &'a DebuggingInformationEntry, -) -> (Unit, UnitOffset) { - if let Some((entry_unit, entry_offset)) = - get_attr_die(dwarf, unit, entry, constants::DW_AT_specification) +) -> DieReference { + if let Some(die_reference) = get_attr_die(dwarf, unit, entry, constants::DW_AT_specification) { + match die_reference { + DieReference::Offset(entry_offset) => { + resolve_specification(dwarf, unit, &unit.entry(entry_offset).unwrap()) + } + DieReference::UnitAndOffset((entry_unit, entry_offset)) => { + resolve_specification_slowpath( + dwarf, + &entry_unit, + &entry_unit.entry(entry_offset).unwrap(), + ) + } + } + } else if let Some(die_reference) = + get_attr_die(dwarf, unit, entry, constants::DW_AT_abstract_origin) { - resolve_specification(dwarf, &entry_unit, &entry_unit.entry(entry_offset).unwrap()) - } else if let Some((entry_unit, entry_offset)) = + match die_reference { + DieReference::Offset(entry_offset) => { + resolve_specification(dwarf, unit, &unit.entry(entry_offset).unwrap()) + } + DieReference::UnitAndOffset((entry_unit, entry_offset)) => { + resolve_specification_slowpath( + dwarf, + &entry_unit, + &entry_unit.entry(entry_offset).unwrap(), + ) + } + } + } else { + DieReference::Offset(entry.offset()) + } +} + +fn resolve_specification_slowpath<'a, R: Reader>( + dwarf: &'a Dwarf, + unit: &'a Unit, + entry: &'a DebuggingInformationEntry, +) -> DieReference { + if let Some(die_reference) = get_attr_die(dwarf, unit, entry, constants::DW_AT_specification) { + match die_reference { + DieReference::Offset(entry_offset) => { + resolve_specification_slowpath(dwarf, unit, &unit.entry(entry_offset).unwrap()) + } + DieReference::UnitAndOffset((entry_unit, entry_offset)) => { + resolve_specification_slowpath( + dwarf, + &entry_unit, + &entry_unit.entry(entry_offset).unwrap(), + ) + } + } + } else if let Some(die_reference) = get_attr_die(dwarf, unit, entry, constants::DW_AT_abstract_origin) { - resolve_specification(dwarf, &entry_unit, &entry_unit.entry(entry_offset).unwrap()) + match die_reference { + DieReference::Offset(entry_offset) => { + resolve_specification_slowpath(dwarf, unit, &unit.entry(entry_offset).unwrap()) + } + DieReference::UnitAndOffset((entry_unit, entry_offset)) => { + resolve_specification_slowpath( + dwarf, + &entry_unit, + &entry_unit.entry(entry_offset).unwrap(), + ) + } + } } else { - (get_unit_copy(dwarf, unit), entry.offset()) + DieReference::UnitAndOffset((get_unit_copy(dwarf, unit), entry.offset())) } } @@ -88,17 +154,36 @@ pub(crate) fn get_name>( unit: &Unit, entry: &DebuggingInformationEntry, ) -> Option { - let (entry_unit, entry_offset) = resolve_specification(dwarf, unit, entry); - let entry = entry_unit.entry(entry_offset).unwrap(); - - if let Ok(Some(attr_val)) = entry.attr_value(constants::DW_AT_name) { - if let Ok(attr_string) = dwarf.attr_string(&entry_unit, attr_val) { - if let Ok(attr_string) = attr_string.to_string() { - return Some(CString::new(attr_string.to_string()).unwrap()); + match resolve_specification(dwarf, unit, entry) { + DieReference::Offset(entry_offset) => { + if let Ok(Some(attr_val)) = unit + .entry(entry_offset) + .unwrap() + .attr_value(constants::DW_AT_name) + { + if let Ok(attr_string) = dwarf.attr_string(unit, attr_val) { + if let Ok(attr_string) = attr_string.to_string() { + return Some(CString::new(attr_string.to_string()).unwrap()); + } + } } + None + } + DieReference::UnitAndOffset((entry_unit, entry_offset)) => { + if let Ok(Some(attr_val)) = entry_unit + .entry(entry_offset) + .unwrap() + .attr_value(constants::DW_AT_name) + { + if let Ok(attr_string) = dwarf.attr_string(&entry_unit, attr_val) { + if let Ok(attr_string) = attr_string.to_string() { + return Some(CString::new(attr_string.to_string()).unwrap()); + } + } + } + None } } - None } // Get raw name from DIE, or referenced dependencies -- cgit v1.3.1