From 0c00b036be4d046d9d1bbd61dcb3fb769e30d055 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 1 Mar 2018 12:02:34 -0500 Subject: [PATCH] target-m68k: Do not cpu_abort on undefined insns Report this properly via exception and, importantly, allow the disassembler the chance to tell us what insn is not handled. Backports commit 72d2e4b6a437f11f97d3138f6b2ec177b78210c7 from qemu --- qemu/target-m68k/translate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qemu/target-m68k/translate.c b/qemu/target-m68k/translate.c index e8cb1b9b..b71be4d9 100644 --- a/qemu/target-m68k/translate.c +++ b/qemu/target-m68k/translate.c @@ -1229,10 +1229,12 @@ DISAS_INSN(undef_fpu) DISAS_INSN(undef) { - M68kCPU *cpu = m68k_env_get_cpu(env); - + /* ??? This is both instructions that are as yet unimplemented + for the 680x0 series, as well as those that are implemented + but actually illegal for CPU32 or pre-68020. */ + qemu_log_mask(LOG_UNIMP, "Illegal instruction: %04x @ %08x", + insn, s->pc - 2); gen_exception(s, s->pc - 2, EXCP_UNSUPPORTED); - cpu_abort(CPU(cpu), "Illegal instruction: %04x @ %08x", insn, s->pc - 2); } DISAS_INSN(mulw)