diff options
| author | Yusuke Endoh <[email protected]> | 2021-03-15 15:22:34 +0900 |
|---|---|---|
| committer | <[email protected]> | 2021-03-15 15:22:34 +0900 |
| commit | 9e5105ca451d6d38eb2d03a2ffc904074f0333b9 () | |
| tree | c0c8855b7c0d2f156ff42138db9204f35ed58e4d /addr2line.c | |
| parent | 82b6f89283042b670975f3f7986432647101984e (diff) | |
Support GCC's DWARF 5 [Bug #17585] (#4240)
Co-Authored-By: xtkoba (Tee KOBAYASHI) <[email protected]>
Notes: Merged-By: mame <[email protected]>
| -rw-r--r-- | addr2line.c | 119 |
1 files changed, 97 insertions, 22 deletions
@@ -159,11 +159,12 @@ typedef struct obj_info { struct dwarf_section debug_info; struct dwarf_section debug_line; struct dwarf_section debug_ranges; struct dwarf_section debug_str; struct obj_info *next; } obj_info_t; -#define DWARF_SECTION_COUNT 5 static struct dwarf_section * obj_dwarf_section_at(obj_info_t *obj, int n) @@ -173,6 +174,7 @@ obj_dwarf_section_at(obj_info_t *obj, int n) &obj->debug_info, &obj->debug_line, &obj->debug_ranges, &obj->debug_str }; if (n < 0 || DWARF_SECTION_COUNT <= n) { @@ -411,7 +413,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line, FILL_LINE(); break; case DW_LNS_advance_pc: - a = uleb128((char **)&p); addr += a; break; case DW_LNS_advance_line: { @@ -451,7 +453,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line, /* isa = (unsigned int)*/(void)uleb128((char **)&p); break; case 0: - a = *(unsigned char *)p++; op = *p++; switch (op) { case DW_LNE_end_sequence: @@ -808,6 +810,18 @@ enum DW_FORM_addrx4 = 0x2c }; enum { VAL_none = 0, VAL_cstr = 1, @@ -962,6 +976,23 @@ debug_info_reader_init(DebugInfoReader *reader, obj_info_t *obj) } static void di_read_debug_abbrev_cu(DebugInfoReader *reader) { uint64_t prev = 0; @@ -975,12 +1006,7 @@ di_read_debug_abbrev_cu(DebugInfoReader *reader) prev = abbrev_number; uleb128(&p); /* tag */ p++; /* has_children */ - /* skip content */ - for (;;) { - uint64_t at = uleb128(&p); - uint64_t form = uleb128(&p); - if (!at && !form) break; - } } } @@ -1244,12 +1270,7 @@ di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number) /* skip 255th record */ uleb128(&p); /* tag */ p++; /* has_children */ - /* skip content */ - for (;;) { - uint64_t at = uleb128(&p); - uint64_t form = uleb128(&p); - if (!at && !form) break; - } for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) { if (n == 0) { fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number); @@ -1257,12 +1278,7 @@ di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number) } uleb128(&p); /* tag */ p++; /* has_children */ - /* skip content */ - for (;;) { - uint64_t at = uleb128(&p); - uint64_t form = uleb128(&p); - if (!at && !form) break; - } } return p; } @@ -1390,6 +1406,21 @@ ranges_set(ranges_t *ptr, DebugInfoValue *v) } } static uintptr_t ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr) { @@ -1403,8 +1434,50 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr) } else if (ptr->ranges_set) { /* TODO: support base address selection entry */ - char *p = reader->obj->debug_ranges.ptr + ptr->ranges; uint64_t base = ptr->low_pc_set ? ptr->low_pc : reader->current_low_pc; for (;;) { uintptr_t from = read_uintptr(&p); uintptr_t to = read_uintptr(&p); @@ -1748,6 +1821,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink, ".debug_info", ".debug_line", ".debug_ranges", ".debug_str" }; @@ -2004,6 +2078,7 @@ found_mach_header: "__debug_info", "__debug_line", "__debug_ranges", "__debug_str" }; struct LP(segment_command) *scmd = (struct LP(segment_command) *)lcmd; |