Commit 5c629f4f authored by Sergey Fedorov's avatar Sergey Fedorov Committed by Peter Maydell
Browse files

target-arm: Fix gdb singlestep handling in arm_debug_excp_handler() 



Do not raise a CPU exception if no CPU breakpoint has fired, since
singlestep is also done by generating a debug internal exception. This
fixes a bug with singlestepping in gdbstub.

Signed-off-by: default avatarSergey Fedorov <serge.fdrv@gmail.com>
Message-id: 1446726361-18328-1-git-send-email-serge.fdrv@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a8b4f958

target-arm/op_helper.c

+7 −1
Original line number Diff line number Diff line
@@ -917,7 +917,13 @@ void arm_debug_excp_handler(CPUState *cs) 
        uint64_t pc = is_a64(env) ? env->pc : env->regs[15];

        bool same_el = (arm_debug_target_el(env) == arm_current_el(env));



        if (cpu_breakpoint_test(cs, pc, BP_GDB)) {

        /* (1) GDB breakpoints should be handled first.

         * (2) Do not raise a CPU exception if no CPU breakpoint has fired,

         * since singlestep is also done by generating a debug internal

         * exception.

         */

        if (cpu_breakpoint_test(cs, pc, BP_GDB)

            || !cpu_breakpoint_test(cs, pc, BP_CPU)) {

            return;

        }