Commit ed6c6448 authored Nov 12, 2015 by Sergey Fedorov Committed by Peter Maydell Nov 12, 2015

target-arm: Update PC before calling gen_helper_check_breakpoints()



PC should be updated in the CPU state before calling check_breakpoints()
helper. Otherwise, the helper would not see the correct PC in the CPU
state if it is not at the start of a TB.

Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Message-id: 1447176222-16401-1-git-send-email-serge.fdrv@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parent 8f0da01d

target-arm/translate-a64.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -11102,6 +11102,7 @@ void gen_intermediate_code_a64(ARMCPU cpu, TranslationBlock tb)
		QTAILQ_FOREACH(bp, &cs->breakpoints, entry) {
		if (bp->pc == dc->pc) {
		if (bp->flags & BP_CPU) {
		gen_a64_set_pc_im(dc->pc);
		gen_helper_check_breakpoints(cpu_env);
		/* End the TB early; it likely won't be executed */
		dc->is_jmp = DISAS_UPDATE;

target-arm/translate.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -11373,6 +11373,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_pc_im(dc, dc->pc);
		gen_helper_check_breakpoints(cpu_env);
		/* End the TB early; it's likely not going to be executed */
		dc->is_jmp = DISAS_UPDATE;