Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DWARFv1 constants in enums, DW_FORM_ref parsing #335

Merged
merged 9 commits into from
Oct 10, 2020
Merged

DWARFv1 constants in enums, DW_FORM_ref parsing #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfa0363
DWARF 5 tags and attributes
Jan 31, 2020
027fb6b
Merge pull request #1 from eliben/master
sevaa Feb 4, 2020
c44d11a
Merge branch 'master' of https://github.com/sevaa/pyelftools
Feb 4, 2020
45ee006
Merge pull request #2 from eliben/master
sevaa Feb 6, 2020
82edc92
Merge branch 'master' of https://github.com/eliben/pyelftools
Mar 11, 2020
b969e03
Merge branch 'master' of https://github.com/sevaa/pyelftools into master
Oct 8, 2020
287e985
Merge branch 'master' of https://github.com/eliben/pyelftools into ma…
Oct 8, 2020
98383db
DWARF v1 constants in enums
Oct 8, 2020
fe90ceb
Topo fix
Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions elftools/dwarf/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@
DW_TAG_entry_point = 0x03,
DW_TAG_enumeration_type = 0x04,
DW_TAG_formal_parameter = 0x05,
DW_TAG_global_subroutine = 0x06,
DW_TAG_global_variable = 0x07,
DW_TAG_imported_declaration = 0x08,
DW_TAG_label = 0x0a,
DW_TAG_lexical_block = 0x0b,
DW_TAG_local_variable = 0x0c,
DW_TAG_member = 0x0d,
DW_TAG_pointer_type = 0x0f,
DW_TAG_reference_type = 0x10,
DW_TAG_compile_unit = 0x11,
DW_TAG_string_type = 0x12,
DW_TAG_structure_type = 0x13,
DW_TAG_subroutine = 0x14,
DW_TAG_subroutine_type = 0x15,
DW_TAG_typedef = 0x16,
DW_TAG_union_type = 0x17,
Expand Down Expand Up @@ -111,6 +115,10 @@
DW_AT_sibling = 0x01,
DW_AT_location = 0x02,
DW_AT_name = 0x03,
DW_AT_fund_type = 0x05,
DW_AT_mod_fund_type = 0x06,
DW_AT_user_def_type = 0x07,
DW_AT_mod_u_d_type = 0x08,
DW_AT_ordering = 0x09,
DW_AT_subscr_data = 0x0a,
DW_AT_byte_size = 0x0b,
Expand All @@ -136,7 +144,9 @@
DW_AT_is_optional = 0x21,
DW_AT_lower_bound = 0x22,
DW_AT_producer = 0x25,
DW_AT_protected = 0x26,
DW_AT_prototyped = 0x27,
DW_AT_public = 0x28,
DW_AT_return_addr = 0x2a,
DW_AT_start_scope = 0x2c,
DW_AT_bit_stride = 0x2e,
Expand Down Expand Up @@ -304,6 +314,7 @@
ENUM_DW_FORM = dict(
DW_FORM_null = 0x00,
DW_FORM_addr = 0x01,
DW_FORM_ref = 0x02,
DW_FORM_block2 = 0x03,
DW_FORM_block4 = 0x04,
DW_FORM_data2 = 0x05,
Expand Down
2 changes: 1 addition & 1 deletion elftools/dwarf/locationlists.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def parse_from_attribute(self, attr, dwarf_version):

@staticmethod
def _attribute_has_loc_expr(attr, dwarf_version):
return ((dwarf_version < 4 and attr.form == 'DW_FORM_block1' and
return ((dwarf_version < 4 and attr.form.startswith('DW_FORM_block') and
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct?

The existing code seems to be specifically targeting DW_FORM_block1, not the other kinds; why is this changing? What new forms are needed for DWARFv1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Saw a location expression of formDW_FORM_block2 in the reference binary. There was no block1 in DWARF1, and no locations sections either.

If this is a dealbreaker, we can leave this one out and I'll monkeypatch.

not attr.name == 'DW_AT_const_value') or
attr.form == 'DW_FORM_exprloc')

Expand Down
1 change: 1 addition & 0 deletions elftools/dwarf/structs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ def _create_dw_form(self):
DW_FORM_strp=self.Dwarf_offset(''),
DW_FORM_flag=self.Dwarf_uint8(''),

DW_FORM_ref=self.Dwarf_uint32(''),
DW_FORM_ref1=self.Dwarf_uint8(''),
DW_FORM_ref2=self.Dwarf_uint16(''),
DW_FORM_ref4=self.Dwarf_uint32(''),
Expand Down