ubsan: tilepro: signed integer overflow

[deliverable/binutils-gdb.git] / opcodes / tilegx-opc.c

diff --git a/opcodes/tilegx-opc.c b/opcodes/tilegx-opc.c
index f49dae5de39c6e092613740752167f9ff33ad039..a122f49abc92ceea2363cbf137d4b4b92ec10484 100644 (file)
--- a/opcodes/tilegx-opc.c
+++ b/opcodes/tilegx-opc.c
@@ -8096,21 +8096,18 @@ parse_insn_tilegx (tilegx_bundle_bits bits,
        {
          const struct tilegx_operand *op =
            &tilegx_operands[opc->operands[pipe][i]];
-         int raw_opval = op->extract (bits);
-         long long opval;
+         unsigned int opval = op->extract (bits);
 
          if (op->is_signed)
            {
              /* Sign-extend the operand.  */
              unsigned int sign = 1u << (op->num_bits - 1);
-             raw_opval = ((raw_opval & (sign + sign - 1)) ^ sign) - sign;
+             opval = ((opval & (sign + sign - 1)) ^ sign) - sign;
            }
 
          /* Adjust PC-relative scaled branch offsets.  */
          if (op->type == TILEGX_OP_TYPE_ADDRESS)
-           opval = (raw_opval * TILEGX_BUNDLE_SIZE_IN_BYTES) + pc;
-         else
-           opval = raw_opval;
+           opval = opval * TILEGX_BUNDLE_SIZE_IN_BYTES + pc;
 
          /* Record the final value.  */
          d->operands[i] = op;