From: Sergey Fedorov Date: Tue, 17 Nov 2015 13:38:47 +0000 (+0300) Subject: target-arm: Update condexec before arch BP check in AA32 translation X-Git-Tag: v2.5.0-rc1~4^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce8a1b5449cd8c4c2831abb581d3208c3a3745a0;p=thirdparty%2Fqemu.git target-arm: Update condexec before arch BP check in AA32 translation Architectural breakpoint check could raise an exceptions, thus condexec bits should be updated before calling gen_helper_check_breakpoints(). Signed-off-by: Sergey Fedorov Message-id: 1447767527-21268-3-git-send-email-serge.fdrv@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- diff --git a/target-arm/translate.c b/target-arm/translate.c index 739f373fc27..5d22879755f 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -11374,6 +11374,7 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb) QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { if (bp->pc == dc->pc) { if (bp->flags & BP_CPU) { + gen_set_condexec(dc); gen_set_pc_im(dc, dc->pc); gen_helper_check_breakpoints(cpu_env); /* End the TB early; it's likely not going to be executed */