From d6eafe5982935474dd679129581c4f9521fea100 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Sun, 25 Mar 2018 16:36:49 -0400 Subject: [PATCH] target/arm: Set FSR for BKPT, BRK when raising exception Now that we have a helper function specifically for the BRK and BKPT instructions, we can set the exception.fsr there rather than in arm_cpu_do_interrupt_aarch32(). This allows us to use our new arm_debug_exception_fsr() helper. In particular this fixes a bug where we were hardcoding the short-form IFSR value, which is wrong if the target exception level has LPAE enabled. Fixes: https://bugs.launchpad.net/qemu/+bug/1756927 Backports commit 62b94f31d0df75187bb00684fc29e8639eacc0c5 from qemu --- qemu/target/arm/helper.c | 1 - qemu/target/arm/op_helper.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 51a80191..0de3f701 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -7162,7 +7162,6 @@ static void arm_cpu_do_interrupt_aarch32_(CPUState *cs) offset = 0; break; case EXCP_BKPT: - env->exception.fsr = 2; /* Fall through to prefetch abort. */ case EXCP_PREFETCH_ABORT: A32_BANKED_CURRENT_REG_SET(env, ifsr, env->exception.fsr); diff --git a/qemu/target/arm/op_helper.c b/qemu/target/arm/op_helper.c index ded7c276..51770dee 100644 --- a/qemu/target/arm/op_helper.c +++ b/qemu/target/arm/op_helper.c @@ -494,6 +494,8 @@ void HELPER(exception_with_syndrome)(CPUARMState *env, uint32_t excp, */ void HELPER(exception_bkpt_insn)(CPUARMState *env, uint32_t syndrome) { + /* FSR will only be used if the debug target EL is AArch32. */ + env->exception.fsr = arm_debug_exception_fsr(env); raise_exception(env, EXCP_BKPT, syndrome, arm_debug_target_el(env)); }