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 e485a36c35f46477144fb296d6d3bdbd4af22617..7e20a8fae182ed3a911d782a179bb41b39cd9a8c 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,12 @@
+2016-02-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       Backport from master
+       2016-02-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-dis.c (print_insn): Parenthesize expression to prevent
+       truncated addresses.
+       (OP_J): Likewise.
+
 2016-01-25  Tristan Gingold  <gingold@adacore.com>
 
        * configure: Regenerate.

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 1b4c51a55e6a3a5a4134dbdc096d96b94ee328dc..3712b59805c020d934e38a914d406d7b19c560a2 100644 (file)
--- 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