RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:47: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;
}