From 5739006b9ab1ae3680359db5a291eae97eef0f9f Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 21 Jan 2013 18:40:04 +0400 Subject: target-xtensa: add fallthrough markers Explicitly mark cases where we are deliberately falling through to the following code. Signed-off-by: Max Filippov --- target-xtensa/op_helper.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'target-xtensa/op_helper.c') diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index 4c41de0668..834fe9087d 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -448,8 +448,10 @@ void HELPER(check_atomctl)(CPUXtensaState *env, uint32_t pc, uint32_t vaddr) switch (access & PAGE_CACHE_MASK) { case PAGE_CACHE_WB: atomctl >>= 2; + /* fall through */ case PAGE_CACHE_WT: atomctl >>= 2; + /* fall through */ case PAGE_CACHE_BYPASS: if ((atomctl & 0x3) == 0) { HELPER(exception_cause_vaddr)(env, pc, -- cgit v1.2.1 From a00817cc4c18b7872e92765a4736fb2227cc237b Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 4 Mar 2013 07:02:00 +0400 Subject: 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 --- target-xtensa/op_helper.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'target-xtensa/op_helper.c') 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); } -- cgit v1.2.1