Commit f47ede19 authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target-sh4: Use cpu_exec_interrupt qom hook 



Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Message-id: 1410626734-3804-13-git-send-email-rth@twiddle.net
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent dde7c241

cpu-exec.c

+0 −5
Original line number Diff line number Diff line
@@ -592,11 +592,6 @@ int cpu_exec(CPUArchState *env) 
                        cc->do_interrupt(cpu);

                        next_tb = 0;

                    }

#elif defined(TARGET_SH4)

                    if (interrupt_request & CPU_INTERRUPT_HARD) {

                        cc->do_interrupt(cpu);

                        next_tb = 0;

                    }

#endif

                    /* The target hook has 3 exit conditions:

                       False when the interrupt isn't processed,

target-sh4/cpu-qom.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static inline SuperHCPU *sh_env_get_cpu(CPUSH4State *env) 
#define ENV_OFFSET offsetof(SuperHCPU, env)



void superh_cpu_do_interrupt(CPUState *cpu);

bool superh_cpu_exec_interrupt(CPUState *cpu, int int_req);

void superh_cpu_dump_state(CPUState *cpu, FILE *f,

                           fprintf_function cpu_fprintf, int flags);

hwaddr superh_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

target-sh4/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data) 
    cc->class_by_name = superh_cpu_class_by_name;

    cc->has_work = superh_cpu_has_work;

    cc->do_interrupt = superh_cpu_do_interrupt;

    cc->cpu_exec_interrupt = superh_cpu_exec_interrupt;

    cc->dump_state = superh_cpu_dump_state;

    cc->set_pc = superh_cpu_set_pc;

    cc->synchronize_from_tb = superh_cpu_synchronize_from_tb;

target-sh4/helper.c

+9 −0
Original line number Diff line number Diff line
@@ -863,3 +863,12 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr) 
}



#endif



bool superh_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

{

    if (interrupt_request & CPU_INTERRUPT_HARD) {

        superh_cpu_do_interrupt(cs);

        return true;

    }

    return false;

}