[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] target/sh4: fix BS_EXCP exit
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PULL 06/15] target/sh4: fix BS_EXCP exit |
Date: |
Sat, 13 May 2017 11:32:39 +0200 |
In case of exception, there is no need to call tcg_gen_exit_tb as the
exception helper won't return.
Also fix a few cases where BS_BRANCH is called instead of BS_EXCP.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
target/sh4/translate.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 04bc18bf7c..f608e314b6 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -339,7 +339,7 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)
if (ctx->envflags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) { \
tcg_gen_movi_i32(cpu_pc, ctx->pc); \
gen_helper_raise_slot_illegal_instruction(cpu_env); \
- ctx->bstate = BS_BRANCH; \
+ ctx->bstate = BS_EXCP; \
return; \
}
@@ -351,7 +351,7 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)
} else { \
gen_helper_raise_illegal_instruction(cpu_env); \
} \
- ctx->bstate = BS_BRANCH; \
+ ctx->bstate = BS_EXCP; \
return; \
}
@@ -363,7 +363,7 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)
} else { \
gen_helper_raise_fpu_disable(cpu_env); \
} \
- ctx->bstate = BS_BRANCH; \
+ ctx->bstate = BS_EXCP; \
return; \
}
@@ -1289,7 +1289,7 @@ static void _decode_opc(DisasContext * ctx)
imm = tcg_const_i32(B7_0);
gen_helper_trapa(cpu_env, imm);
tcg_temp_free(imm);
- ctx->bstate = BS_BRANCH;
+ ctx->bstate = BS_EXCP;
}
return;
case 0xc800: /* tst #imm,R0 */
@@ -1798,7 +1798,7 @@ static void _decode_opc(DisasContext * ctx)
} else {
gen_helper_raise_illegal_instruction(cpu_env);
}
- ctx->bstate = BS_BRANCH;
+ ctx->bstate = BS_EXCP;
}
static void decode_opc(DisasContext * ctx)
@@ -1867,7 +1867,7 @@ void gen_intermediate_code(CPUSH4State * env, struct
TranslationBlock *tb)
/* We have hit a breakpoint - make sure PC is up-to-date */
tcg_gen_movi_i32(cpu_pc, ctx.pc);
gen_helper_debug(cpu_env);
- ctx.bstate = BS_BRANCH;
+ ctx.bstate = BS_EXCP;
/* The address covered by the breakpoint must be included in
[tb->pc, tb->pc + tb->size) in order to for it to be
properly cleared -- thus we increment the PC here so that
@@ -1911,9 +1911,7 @@ void gen_intermediate_code(CPUSH4State * env, struct
TranslationBlock *tb)
gen_goto_tb(&ctx, 0, ctx.pc);
break;
case BS_EXCP:
- /* gen_op_interrupt_restart(); */
- tcg_gen_exit_tb(0);
- break;
+ /* fall through */
case BS_BRANCH:
default:
break;
--
2.11.0
- [Qemu-devel] [PULL 13/15] target/sh4: movua.l is an SH4-A only instruction, (continued)
- [Qemu-devel] [PULL 13/15] target/sh4: movua.l is an SH4-A only instruction, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 12/15] target/sh4: implement tas.b using atomic helper, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 05/15] target/sh4: fix BS_STOP exit, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 03/15] target/sh4: do not include DELAY_SLOT_TRUE in the TB state, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 15/15] target/sh4: use cpu_loop_exit_restore, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 08/15] target/sh4: fold ctx->bstate = BS_BRANCH into gen_conditional_jump, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 01/15] target/sh4: split ctx->flags into ctx->tbflags and ctx->envflags, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 11/15] target/sh4: generate fences for SH4, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 09/15] target/sh4: optimize gen_store_fpr64, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 10/15] target/sh4: optimize gen_write_sr using extract op, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 06/15] target/sh4: fix BS_EXCP exit,
Aurelien Jarno <=
- [Qemu-devel] [PULL 14/15] target/sh4: trap unaligned accesses, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 02/15] target/sh4: get rid of DELAY_SLOT_CLEARME, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 04/15] target/sh4: move DELAY_SLOT_TRUE flag into a separate global, Aurelien Jarno, 2017/05/13
- [Qemu-devel] [PULL 07/15] target/sh4: only save flags state at the end of the TB, Aurelien Jarno, 2017/05/13
- Re: [Qemu-devel] [PULL 00/15] Queued target/sh4 patches, Stefan Hajnoczi, 2017/05/15