Module Name:    src
Committed By:   matt
Date:           Sat Sep 20 04:53:19 UTC 2014

Modified Files:
        src/external/gpl3/binutils/dist/opcodes: riscv-dis.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/dist/opcodes/riscv-dis.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/opcodes/riscv-dis.c
diff -u src/external/gpl3/binutils/dist/opcodes/riscv-dis.c:1.1 src/external/gpl3/binutils/dist/opcodes/riscv-dis.c:1.2
--- src/external/gpl3/binutils/dist/opcodes/riscv-dis.c:1.1	Fri Sep 19 17:19:53 2014
+++ src/external/gpl3/binutils/dist/opcodes/riscv-dis.c	Sat Sep 20 04:53:19 2014
@@ -398,7 +398,7 @@ print_insn_args (const char *d, insn_t l
 	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;

Reply via email to