From 26d8891d1bac10e8058580d3d943d7bc33f7f3d6 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Sun, 11 Nov 2018 08:30:49 -0500 Subject: [PATCH] target/m68k: use EXCP_ILLEGAL instead of EXCP_UNSUPPORTED Coldfire defines an "Unsupported instruction" exception if execution of a valid instruction is attempted but the required hardware is not present in the processor. We use it with instructions that are in fact undefined or illegal, and the exception expected in this case by the kernel is the illegal exception, so this patch fixes that. Backports commit b9f8e55bf7e994e192ab7360830731580384b813 from qemu --- qemu/target/m68k/cpu.h | 1 - qemu/target/m68k/translate.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/qemu/target/m68k/cpu.h b/qemu/target/m68k/cpu.h index 206acb79..d7afe858 100644 --- a/qemu/target/m68k/cpu.h +++ b/qemu/target/m68k/cpu.h @@ -71,7 +71,6 @@ #define EXCP_MMU_CONF 56 /* MMU Configuration Error */ #define EXCP_MMU_ILLEGAL 57 /* MMU Illegal Operation Error */ #define EXCP_MMU_ACCESS 58 /* MMU Access Level Violation Error */ -#define EXCP_UNSUPPORTED 61 #define EXCP_RTE 0x100 #define EXCP_HALT_INSN 0x101 diff --git a/qemu/target/m68k/translate.c b/qemu/target/m68k/translate.c index ef9dd51a..594a0768 100644 --- a/qemu/target/m68k/translate.c +++ b/qemu/target/m68k/translate.c @@ -1592,7 +1592,7 @@ DISAS_INSN(undef) but actually illegal for CPU32 or pre-68020. */ qemu_log_mask(LOG_UNIMP, "Illegal instruction: %04x @ %08x\n", insn, s->base.pc_next); - gen_exception(s, s->base.pc_next, EXCP_UNSUPPORTED); + gen_exception(s, s->base.pc_next, EXCP_ILLEGAL); } DISAS_INSN(mulw) @@ -2891,7 +2891,7 @@ DISAS_INSN(mull) if (ext & 0x400) { if (!m68k_feature(s->env, M68K_FEATURE_QUAD_MULDIV)) { - gen_exception(s, s->base.pc_next, EXCP_UNSUPPORTED); + gen_exception(s, s->base.pc_next, EXCP_ILLEGAL); return; } @@ -4690,7 +4690,7 @@ DISAS_INSN(strldsr) addr = s->pc - 2; ext = read_im16(env, s); if (ext != 0x46FC) { - gen_exception(s, addr, EXCP_UNSUPPORTED); + gen_exception(s, addr, EXCP_ILLEGAL); return; } ext = read_im16(env, s); @@ -4978,7 +4978,7 @@ DISAS_INSN(wdebug) } /* TODO: Implement wdebug. */ qemu_log("WDEBUG not implemented\n"); - gen_exception(s, s->pc - 2, EXCP_UNSUPPORTED); + gen_exception(s, s->pc - 2, EXCP_ILLEGAL); } #endif