MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ubsan: m10300: shift exponent -4

Browse Source 
* 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.
This commit is contained in:
Alan Modra 2020-01-09 06:59:42 +10:30
parent 8948cc6971
commit 441af85bd9
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opcodes/ChangeLog
View File

@ -1,3 +1,9 @@
2020-01-10 Alan Modra <amodra@gmail.com>
* 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.
2020-01-09 Nick Clifton <nickc@redhat.com> 2020-01-09 Nick Clifton <nickc@redhat.com>
PR 25224 PR 25224

24
opcodes/m10200-dis.c
View File

@ -83,16 +83,18 @@ disassemble (bfd_vma memaddr,
operand = &mn10200_operands[*opindex_ptr]; 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 = (insn & 0xffff) << 8;
value |= extension; value |= extension;
} }
else else
{ value = ((insn >> (operand->shift))
value = ((insn >> (operand->shift)) & ((1L << operand->bits) - 1L));
& ((1L << operand->bits) - 1L));
}
if ((operand->flags & MN10200_OPERAND_SIGNED) != 0) if ((operand->flags & MN10200_OPERAND_SIGNED) != 0)
value = ((long)(value << (32 - operand->bits)) value = ((long)(value << (32 - operand->bits))
@ -106,18 +108,10 @@ disassemble (bfd_vma memaddr,
nocomma = 0; nocomma = 0;
if ((operand->flags & MN10200_OPERAND_DREG) != 0) if ((operand->flags & MN10200_OPERAND_DREG) != 0)
{ (*info->fprintf_func) (info->stream, "d%ld", value);
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
(*info->fprintf_func) (info->stream, "d%ld", value);
}
else if ((operand->flags & MN10200_OPERAND_AREG) != 0) else if ((operand->flags & MN10200_OPERAND_AREG) != 0)
{ (*info->fprintf_func) (info->stream, "a%ld", value);
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
(*info->fprintf_func) (info->stream, "a%ld", value);
}
else if ((operand->flags & MN10200_OPERAND_PSW) != 0) else if ((operand->flags & MN10200_OPERAND_PSW) != 0)
(*info->fprintf_func) (info->stream, "psw"); (*info->fprintf_func) (info->stream, "psw");

24
opcodes/m10300-dis.c
View File

@ -318,7 +318,13 @@ disassemble (bfd_vma memaddr,
if ((operand->flags & MN10300_OPERAND_PLUS) != 0) if ((operand->flags & MN10300_OPERAND_PLUS) != 0)
nocomma = 1; nocomma = 1;
if ((operand->flags & MN10300_OPERAND_SPLIT) != 0) if ((operand->flags & MN10300_OPERAND_DREG) != 0
|| (operand->flags & MN10300_OPERAND_AREG) != 0
|| (operand->flags & MN10300_OPERAND_RREG) != 0
|| (operand->flags & MN10300_OPERAND_XRREG) != 0)
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
else if ((operand->flags & MN10300_OPERAND_SPLIT) != 0)
{ {
unsigned long temp; unsigned long temp;
@ -410,18 +416,10 @@ disassemble (bfd_vma memaddr,
nocomma = 0; nocomma = 0;
if ((operand->flags & MN10300_OPERAND_DREG) != 0) if ((operand->flags & MN10300_OPERAND_DREG) != 0)
{ (*info->fprintf_func) (info->stream, "d%d", (int) value);
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
(*info->fprintf_func) (info->stream, "d%d", (int) value);
}
else if ((operand->flags & MN10300_OPERAND_AREG) != 0) else if ((operand->flags & MN10300_OPERAND_AREG) != 0)
{ (*info->fprintf_func) (info->stream, "a%d", (int) value);
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
(*info->fprintf_func) (info->stream, "a%d", (int) value);
}
else if ((operand->flags & MN10300_OPERAND_SP) != 0) else if ((operand->flags & MN10300_OPERAND_SP) != 0)
(*info->fprintf_func) (info->stream, "sp"); (*info->fprintf_func) (info->stream, "sp");
@ -434,8 +432,6 @@ disassemble (bfd_vma memaddr,
else if ((operand->flags & MN10300_OPERAND_RREG) != 0) else if ((operand->flags & MN10300_OPERAND_RREG) != 0)
{ {
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
if (value < 8) if (value < 8)
(*info->fprintf_func) (info->stream, "r%d", (int) value); (*info->fprintf_func) (info->stream, "r%d", (int) value);
else if (value < 12) else if (value < 12)
@ -446,8 +442,6 @@ disassemble (bfd_vma memaddr,
else if ((operand->flags & MN10300_OPERAND_XRREG) != 0) else if ((operand->flags & MN10300_OPERAND_XRREG) != 0)
{ {
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
if (value == 0) if (value == 0)
(*info->fprintf_func) (info->stream, "sp"); (*info->fprintf_func) (info->stream, "sp");
else else