Fix value in comment of disassembled ARM type A opcodes.

	* arm-dis.c (print_insn_thumb32): Fix value_in_comment.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b9d67d2745f3839994b3eac2c88e0e98fbc7b26d..ad3a01afe824bd142ba04a7a9761133d4a8ccdef 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-02  Bernd Edlinger   <bernd.edlinger@hotmail.de>
+
+       * arm-dis.c (print_insn_thumb32): Fix value_in_comment.
+
 2017-04-25  Claudiu Zissulescu  <claziss@synopsys.com>
 
        * arc-dis.c (print_insn_arc): Smartly print enter/leave mnemonics.

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index a3e53db01bc6366d808c4fe4817bc3c422bae199..a0a03ee1f87fa87ebeb85aa12e3f1f6b711e5838 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -5733,7 +5733,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
                      if (off || !U)
                        {
                          func (stream, ", #%c%u", U ? '+' : '-', off * 4);
-                         value_in_comment = (off && U) ? 1 : -1;
+                         value_in_comment = off * 4 * (U ? 1 : -1);
                        }
                      func (stream, "]");
                      if (W)
@@ -5745,7 +5745,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
                      if (W)
                        {
                          func (stream, "#%c%u", U ? '+' : '-', off * 4);
-                         value_in_comment = (off && U) ? 1 : -1;
+                         value_in_comment = off * 4 * (U ? 1 : -1);
                        }
                      else
                        {