diff options
| author | Alan Modra <amodra@gmail.com> | 2020-01-09 06:59:42 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-01-10 17:32:33 +1030 |
| commit | 441af85bd9c68dbc0c2a1dbe23bf07c6cb3c3f5d (patch) | |
| tree | 57e997f3add2572d384e6c8f7a9a93074d88f9c5 /opcodes/m10200-dis.c | |
| parent | 8948cc6971fb82feffc49e2d21747111466ad642 (diff) | |
| download | binutils-gdb-441af85bd9c68dbc0c2a1dbe23bf07c6cb3c3f5d.tar.gz | |
ubsan: m10300: shift exponent -4
* m10300-dis.c (disassemble): Move extraction of DREG, AREG, RREG,
and XRREG value earlier to avoid a shift with negative exponent.
* m10200-dis.c (disassemble): Similarly.
Diffstat (limited to 'opcodes/m10200-dis.c')
| -rw-r--r-- | opcodes/m10200-dis.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/opcodes/m10200-dis.c b/opcodes/m10200-dis.c index 4f5006a4e94..537ce46ae02 100644 --- a/opcodes/m10200-dis.c +++ b/opcodes/m10200-dis.c @@ -83,16 +83,18 @@ disassemble (bfd_vma memaddr, operand = &mn10200_operands[*opindex_ptr]; - if ((operand->flags & MN10200_OPERAND_EXTENDED) != 0) + if ((operand->flags & MN10200_OPERAND_DREG) != 0 + || (operand->flags & MN10200_OPERAND_AREG) != 0) + value = ((insn >> (operand->shift + extra_shift)) + & ((1 << operand->bits) - 1)); + else if ((operand->flags & MN10200_OPERAND_EXTENDED) != 0) { value = (insn & 0xffff) << 8; value |= extension; } else - { - value = ((insn >> (operand->shift)) - & ((1L << operand->bits) - 1L)); - } + value = ((insn >> (operand->shift)) + & ((1L << operand->bits) - 1L)); if ((operand->flags & MN10200_OPERAND_SIGNED) != 0) value = ((long)(value << (32 - operand->bits)) @@ -106,18 +108,10 @@ disassemble (bfd_vma memaddr, nocomma = 0; if ((operand->flags & MN10200_OPERAND_DREG) != 0) - { - value = ((insn >> (operand->shift + extra_shift)) - & ((1 << operand->bits) - 1)); - (*info->fprintf_func) (info->stream, "d%ld", value); - } + (*info->fprintf_func) (info->stream, "d%ld", value); else if ((operand->flags & MN10200_OPERAND_AREG) != 0) - { - value = ((insn >> (operand->shift + extra_shift)) - & ((1 << operand->bits) - 1)); - (*info->fprintf_func) (info->stream, "a%ld", value); - } + (*info->fprintf_func) (info->stream, "a%ld", value); else if ((operand->flags & MN10200_OPERAND_PSW) != 0) (*info->fprintf_func) (info->stream, "psw"); |