diff options
| author | Alan Modra <amodra@gmail.com> | 2021-04-06 18:57:04 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2021-04-06 23:25:09 +0930 |
| commit | a2e66773735d2d2de2ba652e44650288c88ad752 (patch) | |
| tree | f2e8dfe1592fd03641ab6e14951cc89e3e38b79e /opcodes/s12z-dis.c | |
| parent | 4db29512ce5616e90a9cdbc4daa852589b7357c0 (diff) | |
| download | binutils-a2e66773735d2d2de2ba652e44650288c88ad752.zip binutils-a2e66773735d2d2de2ba652e44650288c88ad752.tar.gz binutils-a2e66773735d2d2de2ba652e44650288c88ad752.tar.bz2 | |
Return symbol from symbol_at_address_func
include/
* dis-asm.h (struct disassemble_info <symbol_at_address_func>):
Return asymbol*.
binutils/
* objdump.c (objdump_symbol_at_address): Return asymbol*.
opcodes/
* dis-buf.c (generic_symbol_at_address): Return symbol* NULL.
* s12z-dis.c (decode_possible_symbol): Use symbol returned from
symbol_at_address_func.
Diffstat (limited to 'opcodes/s12z-dis.c')
| -rw-r--r-- | opcodes/s12z-dis.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c index 4616bc8..ec8f4f7 100644 --- a/opcodes/s12z-dis.c +++ b/opcodes/s12z-dis.c @@ -206,27 +206,12 @@ decode_possible_symbol (bfd_vma addr, bfd_vma base, struct disassemble_info *info, bool relative) { const char *fmt = relative ? "*%+" BFD_VMA_FMT "d" : "%" BFD_VMA_FMT "d"; - if (!info->symbol_at_address_func (addr + base, info)) - { - (*info->fprintf_func) (info->stream, fmt, addr); - } + asymbol *sym = info->symbol_at_address_func (addr + base, info); + + if (!sym) + (*info->fprintf_func) (info->stream, fmt, addr); else - { - asymbol *sym = NULL; - int j; - for (j = 0; j < info->symtab_size; ++j) - { - sym = info->symtab[j]; - if (bfd_asymbol_value (sym) == addr + base) - { - break; - } - } - if (j < info->symtab_size) - (*info->fprintf_func) (info->stream, "%s", bfd_asymbol_name (sym)); - else - (*info->fprintf_func) (info->stream, fmt, addr); - } + (*info->fprintf_func) (info->stream, "%s", bfd_asymbol_name (sym)); } |