From 4fd7268abff6f99dbbb78505f095bf1f54064db7 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 15 Feb 2016 15:58:42 -0800 Subject: [PATCH] Add parentheses to prevent truncated addresses * i386-dis.c (print_insn): Parenthesize expression to prevent truncated addresses. (OP_J): Likewise. --- opcodes/ChangeLog | 6 ++++++ opcodes/i386-dis.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 24c16806bff..e9f157880d6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2016-02-15 H.J. Lu + + * i386-dis.c (print_insn): Parenthesize expression to prevent + truncated addresses. + (OP_J): Likewise. + 2016-02-10 Claudiu Zissulescu Janek van Oirschot diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 5f4aed566d6..de0534c24e7 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 -- 2.30.2