From 2a81ccbbbf81ab9c66ba366a0c1da7abb6460423 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 11 Dec 2019 08:53:50 +1030 Subject: [PATCH] ubsan: v850: left shift cannot be represented in type 'long' * v850-dis.c (get_operand_value): Use unsigned arithmetic. Don't sign extend using shifts. --- opcodes/ChangeLog | 5 +++++ opcodes/v850-dis.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3ba885c48b9..2ad26cb5d6f 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2019-12-11 Alan Modra + + * v850-dis.c (get_operand_value): Use unsigned arithmetic. Don't + sign extend using shifts. + 2019-12-11 Alan Modra * tic6x-dis.c (tic6x_extract_32): Avoid signed overflow. diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c index f8b5d1c93f2..45e6c65d83a 100644 --- a/opcodes/v850-dis.c +++ b/opcodes/v850-dis.c @@ -88,7 +88,7 @@ get_operand_value (const struct v850_operand *operand, bfd_boolean noerror, int *invalid) { - long value; + unsigned long value; bfd_byte buffer[4]; if ((operand->flags & V850E_IMMEDIATE16) @@ -158,11 +158,13 @@ get_operand_value (const struct v850_operand *operand, if (operand->bits == -1) value = (insn & operand->shift); else - value = (insn >> operand->shift) & ((1 << operand->bits) - 1); + value = (insn >> operand->shift) & ((1ul << operand->bits) - 1); if (operand->flags & V850_OPERAND_SIGNED) - value = ((long)(value << (sizeof (long)*8 - operand->bits)) - >> (sizeof (long)*8 - operand->bits)); + { + unsigned long sign = 1ul << (operand->bits - 1); + value = (value ^ sign) - sign; + } } return value; -- 2.30.2