diff options
Diffstat (limited to 'src/readelf.c')
| -rw-r--r-- | src/readelf.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/readelf.c b/src/readelf.c index 1d8da268..69ebea6c 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -3091,12 +3091,14 @@ print_attributes (Ebl *ebl, const GElf_Ehdr *ehdr) static char * format_dwarf_addr (Dwfl_Module *dwflmod, - int address_size, Dwarf_Addr address) + int address_size, Dwarf_Addr address, bool tls) { /* See if there is a name we can give for this address. */ GElf_Sym sym; const char *name = print_address_names - ? dwfl_module_addrsym (dwflmod, address, &sym, NULL) : NULL; + ? ((tls ? dwfl_module_addrsym_tls : dwfl_module_addrsym) + (dwflmod, address, &sym, NULL)) + : NULL; if (name != NULL) sym.st_value = address - sym.st_value; @@ -4373,7 +4375,7 @@ print_debug_ranges_section (Dwfl_Module *dwflmod, if (begin == (Dwarf_Addr) -1l) /* Base address entry. */ { - char *b = format_dwarf_addr (dwflmod, address_size, end); + char *b = format_dwarf_addr (dwflmod, address_size, end, false); printf (gettext (" [%6tx] base address %s\n"), offset, b); free (b); } @@ -4381,8 +4383,8 @@ print_debug_ranges_section (Dwfl_Module *dwflmod, first = true; else { - char *b = format_dwarf_addr (dwflmod, address_size, begin); - char *e = format_dwarf_addr (dwflmod, address_size, end); + char *b = format_dwarf_addr (dwflmod, address_size, begin, false); + char *e = format_dwarf_addr (dwflmod, address_size, end, false); /* We have an address range entry. */ if (first) /* First address range entry in a list. */ printf (gettext (" [%6tx] %s..%s\n"), offset, b, e); @@ -5154,7 +5156,8 @@ attr_callback (Dwarf_Attribute *attrp, void *arg) dwarf_errmsg (-1)); return DWARF_CB_ABORT; } - char *a = format_dwarf_addr (cbargs->dwflmod, cbargs->addrsize, addr); + char *a = format_dwarf_addr (cbargs->dwflmod, cbargs->addrsize, + addr, false); printf (" %*s%-20s (%s) %s\n", (int) (level * 2), "", dwarf_attr_string (attr), dwarf_form_string (form), a); @@ -5721,7 +5724,7 @@ print_debug_line_section (Dwfl_Module *dwflmod, Ebl *ebl, line += line_increment; address += address_increment; - char *a = format_dwarf_addr (dwflmod, 0, address); + char *a = format_dwarf_addr (dwflmod, 0, address, false); printf (gettext ("\ special opcode %u: address+%u = %s, line%+d = %zu\n"), opcode, address_increment, a, line_increment, line); @@ -5761,7 +5764,7 @@ print_debug_line_section (Dwfl_Module *dwflmod, Ebl *ebl, else address = read_8ubyte_unaligned_inc (dbg, linep); { - char *a = format_dwarf_addr (dwflmod, 0, address); + char *a = format_dwarf_addr (dwflmod, 0, address, false); printf (gettext ("set address to %s\n"), a); free (a); } @@ -5813,7 +5816,7 @@ define new file: dir=%u, mtime=%" PRIu64 ", length=%" PRIu64 ", name=%s\n"), get_uleb128 (u128, linep); address += minimum_instr_len * u128; { - char *a = format_dwarf_addr (dwflmod, 0, address); + char *a = format_dwarf_addr (dwflmod, 0, address, false); printf (gettext ("advance address by %u to %s\n"), u128, a); free (a); @@ -5865,7 +5868,7 @@ define new file: dir=%u, mtime=%" PRIu64 ", length=%" PRIu64 ", name=%s\n"), * ((255 - opcode_base) / line_range)); address += u128; { - char *a = format_dwarf_addr (dwflmod, 0, address); + char *a = format_dwarf_addr (dwflmod, 0, address, false); printf (gettext ("advance address by constant %u to %s\n"), u128, a); free (a); @@ -5881,7 +5884,7 @@ define new file: dir=%u, mtime=%" PRIu64 ", length=%" PRIu64 ", name=%s\n"), u128 = read_2ubyte_unaligned_inc (dbg, linep); address += u128; { - char *a = format_dwarf_addr (dwflmod, 0, address); + char *a = format_dwarf_addr (dwflmod, 0, address, false); printf (gettext ("\ advance address by fixed value %u to %s\n"), u128, a); @@ -5981,7 +5984,7 @@ print_debug_loc_section (Dwfl_Module *dwflmod, if (begin == (Dwarf_Addr) -1l) /* Base address entry. */ { - char *b = format_dwarf_addr (dwflmod, address_size, end); + char *b = format_dwarf_addr (dwflmod, address_size, end, false); printf (gettext (" [%6tx] base address %s\n"), offset, b); free (b); } @@ -5992,8 +5995,8 @@ print_debug_loc_section (Dwfl_Module *dwflmod, /* We have a location expression entry. */ uint_fast16_t len = read_2ubyte_unaligned_inc (dbg, readp); - char *b = format_dwarf_addr (dwflmod, address_size, begin); - char *e = format_dwarf_addr (dwflmod, address_size, end); + char *b = format_dwarf_addr (dwflmod, address_size, begin, false); + char *e = format_dwarf_addr (dwflmod, address_size, end, false); if (first) /* First entry in a list. */ printf (gettext (" [%6tx] %s..%s"), offset, b, e); |