diff options
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rw-r--r-- | opcodes/d30v-dis.c | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index fb9f9e0..52ebe86 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2020-01-04 Alan Modra <amodra@gmail.com> + + * d30v-dis.c (print_insn): Avoid signed overflow in left shift. + 2020-01-03 Jan Beulich <jbeulich@suse.com> * aarch64-tbl.h (aarch64_opcode_table): Use diff --git a/opcodes/d30v-dis.c b/opcodes/d30v-dis.c index 61bb16d..212d24a 100644 --- a/opcodes/d30v-dis.c +++ b/opcodes/d30v-dis.c @@ -271,14 +271,10 @@ print_insn (struct disassemble_info *info, /* IMM6S3 is unsigned. */ if (oper->flags & OPERAND_SIGNED || bits == 32) { - long max; - max = (1 << (bits - 1)); - if (val & max) + unsigned int sign = 1u << (bits - 1); + if (val & sign) { - if (bits == 32) - val = -val; - else - val = -val & ((1 << bits) - 1); + val = -val & (sign + sign - 1); neg = 1; } } @@ -303,13 +299,11 @@ print_insn (struct disassemble_info *info, { if (oper->flags & OPERAND_SIGNED) { - int max = (1 << (bits - 1)); + unsigned int sign = 1u << (bits - 1); - if (val & max) + if (val & sign) { - val = -val; - if (bits < 32) - val &= ((1 << bits) - 1); + val = -val & (sign + sign - 1); (*info->fprintf_func) (info->stream, "-"); } } |