From: H.J. Lu Date: Mon, 15 Feb 2016 23:58:42 +0000 (-0800) Subject: Add parentheses to prevent truncated addresses X-Git-Tag: users/ARM/embedded-binutils-2_26-branch-2016q1~20^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b72c95a77f477c0048fddc8f1f602667632cab2;p=thirdparty%2Fbinutils-gdb.git Add parentheses to prevent truncated addresses Backport from master * i386-dis.c (print_insn): Parenthesize expression to prevent truncated addresses. (OP_J): Likewise. --- diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index e485a36c35f..7e20a8fae18 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,12 @@ +2016-02-15 H.J. Lu + + Backport from master + 2016-02-15 H.J. Lu + + * i386-dis.c (print_insn): Parenthesize expression to prevent + truncated addresses. + (OP_J): Likewise. + 2016-01-25 Tristan Gingold * configure: Regenerate. diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 1b4c51a55e6..3712b59805c 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -13644,7 +13644,7 @@ print_insn (bfd_vma pc, disassemble_info *info) if (op_index[i] != -1 && op_riprel[i]) { (*info->fprintf_func) (info->stream, " # "); - (*info->print_address_func) ((bfd_vma) (start_pc + codep - start_codep + (*info->print_address_func) ((bfd_vma) (start_pc + (codep - start_codep) + op_address[op_index[i]]), info); break; } @@ -16158,7 +16158,7 @@ OP_J (int bytemode, int sizeflag) the displacement is added! */ mask = 0xffff; if ((prefixes & PREFIX_DATA) == 0) - segment = ((start_pc + codep - start_codep) + segment = ((start_pc + (codep - start_codep)) & ~((bfd_vma) 0xffff)); } if (address_mode != mode_64bit