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

AK: Make LEB128 decoding work with read_value

Browse source
This commit is contained in:
Tim Schumacher 2023-01-30 00:02:38 +01:00 • committed by Andrew Kaster
parent 787f4d639a
commit 47531a42a9
9 changed files with 135 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibDebug/Dwarf/AbbreviationsMap.cpp
View file

@ -25,15 +25,13 @@ ErrorOr<void> AbbreviationsMap::populate_map()
TRY(abbreviation_stream->discard(m_offset));
while (!abbreviation_stream->is_eof()) {
size_t abbreviation_code = 0;
TRY(LEB128::read_unsigned(*abbreviation_stream, abbreviation_code));
size_t abbreviation_code = TRY(abbreviation_stream->read_value<LEB128<size_t>>());
// An abbreviation code of 0 marks the end of the
// abbreviations for a given compilation unit
if (abbreviation_code == 0)
break;
size_t tag {};
TRY(LEB128::read_unsigned(*abbreviation_stream, tag));
size_t tag = TRY(abbreviation_stream->read_value<LEB128<size_t>>());
auto has_children = TRY(abbreviation_stream->read_value<u8>());
@ -43,17 +41,14 @@ ErrorOr<void> AbbreviationsMap::populate_map()
AttributeSpecification current_attribute_specification {};
do {
size_t attribute_value = 0;
size_t form_value = 0;
TRY(LEB128::read_unsigned(*abbreviation_stream, attribute_value));
TRY(LEB128::read_unsigned(*abbreviation_stream, form_value));
size_t attribute_value = TRY(abbreviation_stream->read_value<LEB128<size_t>>());
size_t form_value = TRY(abbreviation_stream->read_value<LEB128<size_t>>());
current_attribute_specification.attribute = static_cast<Attribute>(attribute_value);
current_attribute_specification.form = static_cast<AttributeDataForm>(form_value);
if (current_attribute_specification.form == AttributeDataForm::ImplicitConst) {
ssize_t data_value;
TRY(LEB128::read_signed(*abbreviation_stream, data_value));
ssize_t data_value = TRY(abbreviation_stream->read_value<LEB128<ssize_t>>());
current_attribute_specification.value = data_value;
}

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

@ -30,8 +30,7 @@ ErrorOr<void> AddressRangesV5::for_each_range(Function<void(Range)> callback)
break;
}
case RangeListEntryType::BaseAddressX: {
FlatPtr index;
TRY(LEB128::read_unsigned(*m_range_lists_stream, index));
FlatPtr index = TRY(m_range_lists_stream->read_value<LEB128<FlatPtr>>());
current_base_address = TRY(m_compilation_unit.get_address(index));
break;
}
@ -44,30 +43,26 @@ ErrorOr<void> AddressRangesV5::for_each_range(Function<void(Range)> callback)
if (!base_address.has_value())
return Error::from_string_literal("Expected base_address for rangelist");
size_t start_offset, end_offset;
TRY(LEB128::read_unsigned(*m_range_lists_stream, start_offset));
TRY(LEB128::read_unsigned(*m_range_lists_stream, end_offset));
size_t start_offset = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
size_t end_offset = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
callback(Range { start_offset + *base_address, end_offset + *base_address });
break;
}
case RangeListEntryType::StartLength: {
auto start = TRY(m_range_lists_stream->read_value<FlatPtr>());
size_t length;
TRY(LEB128::read_unsigned(*m_range_lists_stream, length));
size_t length = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
callback(Range { start, start + length });
break;
}
case RangeListEntryType::StartXEndX: {
size_t start, end;
TRY(LEB128::read_unsigned(*m_range_lists_stream, start));
TRY(LEB128::read_unsigned(*m_range_lists_stream, end));
size_t start = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
size_t end = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
callback(Range { TRY(m_compilation_unit.get_address(start)), TRY(m_compilation_unit.get_address(end)) });
break;
}
case RangeListEntryType::StartXLength: {
size_t start, length;
TRY(LEB128::read_unsigned(*m_range_lists_stream, start));
TRY(LEB128::read_unsigned(*m_range_lists_stream, length));
size_t start = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
size_t length = TRY(m_range_lists_stream->read_value<LEB128<size_t>>());
auto start_addr = TRY(m_compilation_unit.get_address(start));
callback(Range { start_addr, start_addr + length });
break;

2
Userland/Libraries/LibDebug/Dwarf/DIE.cpp
View file

@ -26,7 +26,7 @@ ErrorOr<void> DIE::rehydrate_from(u32 offset, Optional<u32> parent_offset)
auto stream = TRY(FixedMemoryStream::construct(m_compilation_unit.dwarf_info().debug_info_data()));
// Note: We can't just slice away from the input data here, since get_attribute_value will try to recover the original offset using seek().
TRY(stream->seek(m_offset));
TRY(LEB128::read_unsigned(*stream, m_abbreviation_code));
m_abbreviation_code = TRY(stream->read_value<LEB128<size_t>>());
m_data_offset = TRY(stream->tell());
if (m_abbreviation_code == 0) {

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

@ -120,15 +120,13 @@ ErrorOr<AttributeValue> DwarfInfo::get_attribute_value(AttributeDataForm form, s
break;
}
case AttributeDataForm::SData: {
i64 data;
TRY(LEB128::read_signed(debug_info_stream, data));
i64 data = TRY(debug_info_stream.read_value<LEB128<i64>>());
value.m_type = AttributeValue::Type::SignedNumber;
value.m_data.as_signed = data;
break;
}
case AttributeDataForm::UData: {
u64 data;
TRY(LEB128::read_unsigned(debug_info_stream, data));
u64 data = TRY(debug_info_stream.read_value<LEB128<u64>>());
value.m_type = AttributeValue::Type::UnsignedNumber;
value.m_data.as_unsigned = data;
break;
@ -169,8 +167,7 @@ ErrorOr<AttributeValue> DwarfInfo::get_attribute_value(AttributeDataForm form, s
break;
}
case AttributeDataForm::ExprLoc: {
size_t length;
TRY(LEB128::read_unsigned(debug_info_stream, length));
size_t length = TRY(debug_info_stream.read_value<LEB128<size_t>>());
value.m_type = AttributeValue::Type::DwarfExpression;
TRY(assign_raw_bytes_value(length));
break;
@ -202,8 +199,7 @@ ErrorOr<AttributeValue> DwarfInfo::get_attribute_value(AttributeDataForm form, s
}
case AttributeDataForm::Block: {
value.m_type = AttributeValue::Type::RawBytes;
size_t length;
TRY(LEB128::read_unsigned(debug_info_stream, length));
size_t length = TRY(debug_info_stream.read_value<LEB128<size_t>>());
TRY(assign_raw_bytes_value(length));
break;
}
@ -240,8 +236,7 @@ ErrorOr<AttributeValue> DwarfInfo::get_attribute_value(AttributeDataForm form, s
break;
}
case AttributeDataForm::StrX: {
size_t index;
TRY(LEB128::read_unsigned(debug_info_stream, index));
size_t index = TRY(debug_info_stream.read_value<LEB128<size_t>>());
value.m_type = AttributeValue::Type::String;
value.m_data.as_unsigned = index;
break;
@ -265,15 +260,13 @@ ErrorOr<AttributeValue> DwarfInfo::get_attribute_value(AttributeDataForm form, s
break;
}
case AttributeDataForm::AddrX: {
size_t index;
TRY(LEB128::read_unsigned(debug_info_stream, index));
size_t index = TRY(debug_info_stream.read_value<LEB128<size_t>>());
value.m_type = AttributeValue::Type::Address;
value.m_data.as_unsigned = index;
break;
}
case AttributeDataForm::RngListX: {
size_t index;
TRY(LEB128::read_unsigned(debug_info_stream, index));
size_t index = TRY(debug_info_stream.read_value<LEB128<size_t>>());
value.m_type = AttributeValue::Type::UnsignedNumber;
value.m_data.as_unsigned = index;
break;

38
Userland/Libraries/LibDebug/Dwarf/LineProgram.cpp
View file

@ -44,17 +44,14 @@ ErrorOr<void> LineProgram::parse_path_entries(Function<void(PathEntry& entry)> c
Vector<PathEntryFormat> format_descriptions;
for (u8 i = 0; i < path_entry_format_count; i++) {
UnderlyingType<ContentType> content_type;
TRY(LEB128::read_unsigned(m_stream, content_type));
UnderlyingType<ContentType> content_type = TRY(m_stream.read_value<LEB128<UnderlyingType<ContentType>>>());
UnderlyingType<AttributeDataForm> data_form;
TRY(LEB128::read_unsigned(m_stream, data_form));
UnderlyingType<AttributeDataForm> data_form = TRY(m_stream.read_value<LEB128<UnderlyingType<AttributeDataForm>>>());
format_descriptions.empend(static_cast<ContentType>(content_type), static_cast<AttributeDataForm>(data_form));
}
size_t paths_count = 0;
TRY(LEB128::read_unsigned(m_stream, paths_count));
size_t paths_count = TRY(m_stream.read_value<LEB128<size_t>>());
for (size_t i = 0; i < paths_count; i++) {
PathEntry entry;
@ -85,11 +82,9 @@ ErrorOr<void> LineProgram::parse_path_entries(Function<void(PathEntry& entry)> c
PathEntry entry;
entry.path = path;
if (list_type == PathListType::Filenames) {
size_t directory_index = 0;
TRY(LEB128::read_unsigned(m_stream, directory_index));
size_t _unused = 0;
TRY(LEB128::read_unsigned(m_stream, _unused)); // skip modification time
TRY(LEB128::read_unsigned(m_stream, _unused)); // skip file size
size_t directory_index = TRY(m_stream.read_value<LEB128<size_t>>());
TRY(m_stream.read_value<LEB128<size_t>>()); // skip modification time
TRY(m_stream.read_value<LEB128<size_t>>()); // skip file size
entry.directory_index = directory_index;
dbgln_if(DWARF_DEBUG, "file: {}, directory index: {}", path, directory_index);
}
@ -157,8 +152,7 @@ void LineProgram::reset_registers()
ErrorOr<void> LineProgram::handle_extended_opcode()
{
size_t length = 0;
TRY(LEB128::read_unsigned(m_stream, length));
size_t length = TRY(m_stream.read_value<LEB128<size_t>>());
auto sub_opcode = TRY(m_stream.read_value<u8>());
@ -176,8 +170,7 @@ ErrorOr<void> LineProgram::handle_extended_opcode()
}
case ExtendedOpcodes::SetDiscriminator: {
dbgln_if(DWARF_DEBUG, "SetDiscriminator");
size_t discriminator;
TRY(LEB128::read_unsigned(m_stream, discriminator));
[[maybe_unused]] size_t discriminator = TRY(m_stream.read_value<LEB128<size_t>>());
break;
}
default:
@ -195,16 +188,14 @@ ErrorOr<void> LineProgram::handle_standard_opcode(u8 opcode)
break;
}
case StandardOpcodes::AdvancePc: {
size_t operand = 0;
TRY(LEB128::read_unsigned(m_stream, operand));
size_t operand = TRY(m_stream.read_value<LEB128<size_t>>());
size_t delta = operand * m_unit_header.min_instruction_length();
dbgln_if(DWARF_DEBUG, "AdvancePC by: {} to: {:p}", delta, m_address + delta);
m_address += delta;
break;
}
case StandardOpcodes::SetFile: {
size_t new_file_index = 0;
TRY(LEB128::read_unsigned(m_stream, new_file_index));
size_t new_file_index = TRY(m_stream.read_value<LEB128<size_t>>());
dbgln_if(DWARF_DEBUG, "SetFile: new file index: {}", new_file_index);
m_file_index = new_file_index;
break;
@ -212,14 +203,12 @@ ErrorOr<void> LineProgram::handle_standard_opcode(u8 opcode)
case StandardOpcodes::SetColumn: {
// not implemented
dbgln_if(DWARF_DEBUG, "SetColumn");
size_t new_column;
TRY(LEB128::read_unsigned(m_stream, new_column));
[[maybe_unused]] size_t new_column = TRY(m_stream.read_value<LEB128<size_t>>());
break;
}
case StandardOpcodes::AdvanceLine: {
ssize_t line_delta;
TRY(LEB128::read_signed(m_stream, line_delta));
ssize_t line_delta = TRY(m_stream.read_value<LEB128<ssize_t>>());
VERIFY(line_delta >= 0 || m_line >= (size_t)(-line_delta));
m_line += line_delta;
dbgln_if(DWARF_DEBUG, "AdvanceLine: {}", m_line);
@ -239,8 +228,7 @@ ErrorOr<void> LineProgram::handle_standard_opcode(u8 opcode)
break;
}
case StandardOpcodes::SetIsa: {
size_t isa;
TRY(LEB128::read_unsigned(m_stream, isa));
size_t isa = TRY(m_stream.read_value<LEB128<size_t>>());
dbgln_if(DWARF_DEBUG, "SetIsa: {}", isa);
break;
}