[src/trunk]: src/external/gpl3/binutils/dist/opcodes When disassembling an au...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fab495e20176
branches:  trunk
changeset: 332417:fab495e20176
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Sep 20 04:53:19 2014 +0000

description:
When disassembling an auipc/jalr pair, print the address eventually being
called:
        auipc   t0,0x2b3
        jalr    t0,-616 # ffffffff802b2e98 <memset>

diffstat:

 external/gpl3/binutils/dist/opcodes/riscv-dis.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 9b99a5a13174 -r fab495e20176 external/gpl3/binutils/dist/opcodes/riscv-dis.c
--- a/external/gpl3/binutils/dist/opcodes/riscv-dis.c   Fri Sep 19 23:52:34 2014 +0000
+++ b/external/gpl3/binutils/dist/opcodes/riscv-dis.c   Sat Sep 20 04:53:19 2014 +0000
@@ -398,7 +398,7 @@
        case 'o':
          maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l));
        case 'j':
-         if ((l & MASK_ADDI) == MATCH_ADDI)
+         if ((l & MASK_ADDI) == MATCH_ADDI || (l & MASK_JALR) == MATCH_JALR)
            maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l));
          (*info->fprintf_func) (info->stream, "%d", (int)EXTRACT_ITYPE_IMM (l));
          break;