OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR25281, sh disassembler abort 

PR 25281
	* sh-dis.c (print_insn_ddt): Properly check validity of MOVX_NOPY
	and MOVY_NOPX insns.  For invalid cases include 0xf000 in the word
	printed.  Print .word in more cases.
This commit is contained in:
Alan Modra 2019-12-20 17:56:35 +10:30
parent bcd9f578a9
commit cda8d785b3
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opcodes/ChangeLog
View File

@ -1,3 +1,10 @@
2019-12-20 Alan Modra <amodra@gmail.com>
PR 25281
* sh-dis.c (print_insn_ddt): Properly check validity of MOVX_NOPY
and MOVY_NOPX insns. For invalid cases include 0xf000 in the word
printed. Print .word in more cases.
2019-12-20 Alan Modra <amodra@gmail.com> 2019-12-20 Alan Modra <amodra@gmail.com>
* or1k-ibld.c: Regenerate. * or1k-ibld.c: Regenerate.

16
opcodes/sh-dis.c
View File

@ -102,8 +102,7 @@ print_movxy (const sh_opcode_info *op,
/* Print a double data transfer insn. INSN is just the lower three /* Print a double data transfer insn. INSN is just the lower three
nibbles of the insn, i.e. field a and the bit that indicates if nibbles of the insn, i.e. field a and the bit that indicates if
a parallel processing insn follows. a parallel processing insn follows. */
Return nonzero if a field b of a parallel processing insns follows. */
static void static void
print_insn_ddt (int insn, struct disassemble_info *info) print_insn_ddt (int insn, struct disassemble_info *info)
@ -113,7 +112,10 @@ print_insn_ddt (int insn, struct disassemble_info *info)
/* If this is just a nop, make sure to emit something. */ /* If this is just a nop, make sure to emit something. */
if (insn == 0x000) if (insn == 0x000)
fprintf_fn (stream, "nopx\tnopy"); {
fprintf_fn (stream, "nopx\tnopy");
return;
}
/* If a parallel processing insn was printed before, /* If a parallel processing insn was printed before,
and we got a non-nop, emit a tab. */ and we got a non-nop, emit a tab. */
@ -121,8 +123,8 @@ print_insn_ddt (int insn, struct disassemble_info *info)
fprintf_fn (stream, "\t"); fprintf_fn (stream, "\t");
/* Check if either the x or y part is invalid. */ /* Check if either the x or y part is invalid. */
if (((insn & 0xc) == 0 && (insn & 0x2a0)) if (((insn & 3) != 0 && (insn & 0xc) == 0 && (insn & 0x2a0))
|| ((insn & 3) == 0 && (insn & 0x150))) || ((insn & 3) == 0 && (insn & 0xc) != 0 && (insn & 0x150)))
if (info->mach != bfd_mach_sh_dsp if (info->mach != bfd_mach_sh_dsp
&& info->mach != bfd_mach_sh3_dsp) && info->mach != bfd_mach_sh3_dsp)
{ {
@ -157,7 +159,7 @@ print_insn_ddt (int insn, struct disassemble_info *info)
fprintf_fn, stream); fprintf_fn, stream);
} }
else else
fprintf_fn (stream, ".word 0x%x", insn); fprintf_fn (stream, ".word 0x%x", insn | 0xf000);
else else
{ {
static const sh_opcode_info *first_movx, *first_movy; static const sh_opcode_info *first_movx, *first_movy;
@ -189,6 +191,8 @@ print_insn_ddt (int insn, struct disassemble_info *info)
print_movxy (opy, ((insn >> 8) & 1) + 6, (insn >> 6) & 1, print_movxy (opy, ((insn >> 8) & 1) + 6, (insn >> 6) & 1,
fprintf_fn, stream); fprintf_fn, stream);
} }
if (!insn_x && !insn_y && ((insn & 0x3ff) != 0 || (insn & 0x800) == 0))
fprintf_fn (stream, ".word 0x%x", insn | 0xf000);
} }
} }