diff options
| author | Peter Maydell | 2017-03-20 13:41:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-03-20 13:41:44 +0100 |
| commit | 001b3cab51ebfcb13e8dd03ea25bfa3bd0c517a3 (patch) | |
| tree | 8736d24a95ef6597e8bccf3f7ab2cceac77b019e /target | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170320' into staging (diff) | |
| download | qemu-001b3cab51ebfcb13e8dd03ea25bfa3bd0c517a3.tar.gz qemu-001b3cab51ebfcb13e8dd03ea25bfa3bd0c517a3.tar.xz qemu-001b3cab51ebfcb13e8dd03ea25bfa3bd0c517a3.zip | |
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.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1487616072-9226-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/translate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/translate.c b/target/arm/translate.c index b859f10755..216852b673 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10377,6 +10377,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 |