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/op_helper.c | |
parent | 5739006b9ab1ae3680359db5a291eae97eef0f9f (diff) | |
download | qemu-a00817cc4c18b7872e92765a4736fb2227cc237b.tar.gz qemu-a00817cc4c18b7872e92765a4736fb2227cc237b.tar.bz2 qemu-a00817cc4c18b7872e92765a4736fb2227cc237b.zip |
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/op_helper.c')
-rw-r--r-- | target-xtensa/op_helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index 834fe9087d..6ca912c5bb 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -96,6 +96,9 @@ static void tb_invalidate_virtual_addr(CPUXtensaState *env, uint32_t vaddr) void HELPER(exception)(CPUXtensaState *env, uint32_t excp) { env->exception_index = excp; + if (excp == EXCP_DEBUG) { + env->exception_taken = 0; + } cpu_loop_exit(env); } |