diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2013-03-04 07:02:00 +0400 |
---|---|---|
committer | Max Filippov <jcmvbkbc@gmail.com> | 2013-07-29 18:35:45 +0400 |
commit | a00817cc4c18b7872e92765a4736fb2227cc237b (patch) | |
tree | d5435f7fb92e8df1aef3cbdb0c6d7caf4916a377 /target-xtensa/translate.c | |
parent | 5739006b9ab1ae3680359db5a291eae97eef0f9f (diff) |
target-xtensa: avoid double-stopping at breakpoints
env->exception_taken is set every time an exception is taken. It is used
to allow single-stepping to stop at the first exception handler
instruction. This however must exclude debug exceptions, as otherwise
first step from the instruction where breakpoint was hit stops at that
same instruction.
Also don't check env->exception_taken directly from the
gen_intermediate_code_internal, instead allocate and use TB flag
XTENSA_TBFLAG_EXCEPTION.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'target-xtensa/translate.c')
-rw-r--r-- | target-xtensa/translate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index e692329157..7ea5e2ae16 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -2918,8 +2918,7 @@ void gen_intermediate_code_internal(XtensaCPU *cpu, gen_tb_start(); - if (cs->singlestep_enabled && env->exception_taken) { - env->exception_taken = 0; + if (tb->flags & XTENSA_TBFLAG_EXCEPTION) { tcg_gen_movi_i32(cpu_pc, dc.pc); gen_exception(&dc, EXCP_DEBUG); } |