From 9d7c59c84d4530d05e8702b1c3a31e6da00a397e Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 20 Apr 2017 17:32:30 +0100 Subject: arm: Don't implement BXJ on M-profile CPUs For M-profile CPUs, the BXJ instruction does not exist at all, and the encoding should always UNDEF. We were accidentally implementing it to behave like A-profile BXJ; correct the error. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 1491844419-12485-2-git-send-email-peter.maydell@linaro.org --- target/arm/translate.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'target') diff --git a/target/arm/translate.c b/target/arm/translate.c index e32e38cadd..fe3f44298c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10485,7 +10485,12 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw } break; case 4: /* bxj */ - /* Trivial implementation equivalent to bx. */ + /* Trivial implementation equivalent to bx. + * This instruction doesn't exist at all for M-profile. + */ + if (arm_dc_feature(s, ARM_FEATURE_M)) { + goto illegal_op; + } tmp = load_reg(s, rn); gen_bx(s, tmp); break; -- cgit v1.2.3-55-g7522