diff options
| author | Aurelien Jarno | 2017-05-10 08:58:27 +0200 |
|---|---|---|
| committer | Aurelien Jarno | 2017-05-13 11:18:27 +0200 |
| commit | 57e2d417d3108a6e28e705f4a9d6ff22ab79af16 (patch) | |
| tree | 3ae581636596afd549c5f77fd4812714a8cc66ff /target | |
| parent | target/sh4: trap unaligned accesses (diff) | |
| download | qemu-57e2d417d3108a6e28e705f4a9d6ff22ab79af16.tar.gz qemu-57e2d417d3108a6e28e705f4a9d6ff22ab79af16.tar.xz qemu-57e2d417d3108a6e28e705f4a9d6ff22ab79af16.zip | |
target/sh4: use cpu_loop_exit_restore
Use cpu_loop_exit_restore when using cpu_restore_state and cpu_loop_exit
together.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target')
| -rw-r--r-- | target/sh4/op_helper.c | 10 |
1 files 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) |