RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:37:35 +00:00
Code Issues Activity Actions

LibDebug: Make use of the newly supported data forms

Browse source 
With this change, our DWARF 5 support is nearly feature-complete.
This commit is contained in:
Daniel Bertalan 2021-10-09 17:45:48 +02:00 • committed by Linus Groh
parent 8278039105
commit 622d408d82
2 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp
View file

@ -31,6 +31,12 @@ void AddressRanges::for_each_range(Function<void(Range)> callback)
current_base_address = base;
break;
}
case RangeListEntryType::BaseAddressX: {
FlatPtr index;
m_range_lists_stream.read_LEB128_unsigned(index);
current_base_address = m_compilation_unit.get_address(index);
break;
}
case RangeListEntryType::OffsetPair: {
Optional<FlatPtr> base_address = current_base_address;
if (!base_address.has_value()) {
@ -56,6 +62,21 @@ void AddressRanges::for_each_range(Function<void(Range)> callback)
callback(Range { start, start + length });
break;
}
case RangeListEntryType::StartXEndX: {
size_t start, end;
m_range_lists_stream.read_LEB128_unsigned(start);
m_range_lists_stream.read_LEB128_unsigned(end);
callback(Range { m_compilation_unit.get_address(start), m_compilation_unit.get_address(end) });
break;
}
case RangeListEntryType::StartXLength: {
size_t start, length;
m_range_lists_stream.read_LEB128_unsigned(start);
m_range_lists_stream.read_LEB128_unsigned(length);
auto start_addr = m_compilation_unit.get_address(start);
callback(Range { start_addr, start_addr + length });
break;
}
case RangeListEntryType::EndOfList:
return;
default:

14
Userland/Libraries/LibDebug/Dwarf/DwarfInfo.cpp
View file

@ -326,10 +326,16 @@ void DwarfInfo::build_cached_dies() const
auto get_ranges_of_die = [this](DIE const& die) -> Vector<DIERange> {
auto ranges = die.get_attribute(Attribute::Ranges);
if (ranges.has_value()) {
// TODO Support DW_FORM_rnglistx
if (ranges->form() != AttributeDataForm::SecOffset)
return {};
auto offset = ranges->as_unsigned();
size_t offset;
if (ranges->form() == AttributeDataForm::SecOffset) {
offset = ranges->as_unsigned();
} else {
auto index = ranges->as_unsigned();
auto base = die.compilation_unit().range_lists_base();
// FIXME: This assumes that the format is DWARf32
auto offsets = reinterpret_cast<u32 const*>(debug_range_lists_data().offset(base));
offset = offsets[index] + base;
}
AddressRanges address_ranges(debug_range_lists_data(), offset, die.compilation_unit());
Vector<DIERange> entries;
address_ranges.for_each_range([&entries](auto range) {