Commit 57e2d417 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

target/sh4: use cpu_loop_exit_restore 



Use cpu_loop_exit_restore when using cpu_restore_state and cpu_loop_exit
together.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
parent 34257c21

target/sh4/op_helper.c

+2 −8
Original line number Diff line number Diff line
@@ -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)