[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/15] target/sh4: use cpu_loop_exit_restore
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PULL 15/15] target/sh4: use cpu_loop_exit_restore |
Date: |
Sat, 13 May 2017 11:32:48 +0200 |
Use cpu_loop_exit_restore when using cpu_restore_state and cpu_loop_exit
together.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
target/sh4/op_helper.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c
index fa238c660e..528a40ac1d 100644
--- a/target/sh4/op_helper.c
+++ b/target/sh4/op_helper.c
@@ -48,10 +48,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType
access_type,
ret = superh_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
if (ret) {
/* now we have a real cpu fault */
- if (retaddr) {
- cpu_restore_state(cs, retaddr);
- }
- cpu_loop_exit(cs);
+ cpu_loop_exit_restore(cs, retaddr);
}
}
@@ -75,10 +72,7 @@ static inline void QEMU_NORETURN raise_exception(CPUSH4State
*env, int index,
CPUState *cs = CPU(sh_env_get_cpu(env));
cs->exception_index = index;
- if (retaddr) {
- cpu_restore_state(cs, retaddr);
- }
- cpu_loop_exit(cs);
+ cpu_loop_exit_restore(cs, retaddr);
}
void helper_raise_illegal_instruction(CPUSH4State *env)
--
2.11.0
- [Qemu-devel] [PULL 00/15] Queued target/sh4 patches, Aurelien Jarno, 2017/05/13
- [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 <=
- [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, 2017/05/13
- [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