From cc2a6a2728144894c6f800d72f11de94838eb8e1 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 2 Mar 2018 13:07:24 -0500 Subject: [PATCH] arm: HVC and SMC encodings don't exist for M profile M profile doesn't have the HVC or SMC encodings, so make them always UNDEF rather than generating calls to helper functions that assume A/R profile. Backports commit 001b3cab51ebfcb13e8dd03ea25bfa3bd0c517a3 from qemu --- qemu/target/arm/translate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c index 53c7dafd..025b32a7 100644 --- a/qemu/target/arm/translate.c +++ b/qemu/target/arm/translate.c @@ -10527,6 +10527,9 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw goto illegal_op; if (insn & (1 << 26)) { + if (arm_dc_feature(s, ARM_FEATURE_M)) { + goto illegal_op; + } if (!(insn & (1 << 20))) { /* Hypervisor call (v7) */ int imm16 = extract32(insn, 16, 4) << 12