Indirect encoding support (#430)

[pyelftools.git] / elftools / dwarf / structs.py

diff --git a/elftools/dwarf/structs.py b/elftools/dwarf/structs.py
index b479399d10dfc75e060100d6cc9f31e7dbb09421..798f6907a559ecaeda442b590b0fa4d6a7446096 100644 (file)
--- a/elftools/dwarf/structs.py
+++ b/elftools/dwarf/structs.py
@@ -241,6 +241,10 @@ class DWARFStructs(object):
             DW_FORM_GNU_strp_alt=self.Dwarf_offset(''),
             DW_FORM_GNU_ref_alt=self.Dwarf_offset(''),
             DW_AT_GNU_all_call_sites=self.Dwarf_uleb128(''),
+
+            # New forms in DWARFv5
+            DW_FORM_loclistx=self.Dwarf_uleb128(''),
+            DW_FORM_rnglistx=self.Dwarf_uleb128('')            
         )
 
     def _create_aranges_header(self):
@@ -432,7 +436,8 @@ class DWARFStructs(object):
                     'DW_LLE_start_end'        : Struct('start_end', self.Dwarf_target_addr('start_address'), self.Dwarf_target_addr('end_address'), cld),
                     'DW_LLE_start_length'     : Struct('start_length', self.Dwarf_target_addr('start_address'), self.Dwarf_uleb128('length'), cld),
                 })),
-                StreamOffset('entry_end_offset')))
+                StreamOffset('entry_end_offset'),
+                Value('entry_length', lambda ctx: ctx.entry_end_offset - ctx.entry_offset)))
 
         self.Dwarf_locview_pair = Struct('locview_pair',
             StreamOffset('entry_offset'), self.Dwarf_uleb128('begin'), self.Dwarf_uleb128('end'))