summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2016-11-09 14:46:08 +0100
committerLaurent Vivier <laurent@vivier.eu>2016-12-27 18:28:40 +0100
commit72d2e4b6a437f11f97d3138f6b2ec177b78210c7 (patch)
tree11023633afa4a6e98ecbebcc60bdd0ed8f4c3df3
parent7b542eb96d7d5d9266a9c0425f05d49c8e6df2f9 (diff)
downloadfocaccia-qemu-72d2e4b6a437f11f97d3138f6b2ec177b78210c7.tar.gz
focaccia-qemu-72d2e4b6a437f11f97d3138f6b2ec177b78210c7.zip
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.

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Message-Id: <1478699171-10637-3-git-send-email-rth@twiddle.net>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-rw-r--r--target/m68k/translate.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index acc8182d72..0417c325e6 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -1214,10 +1214,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)