Richard Henderson writes:
> Continuing the removal of ifdefs from cpu_exec.
>
> Cc: Andreas Färber <afaer...@suse.de>
> Signed-off-by: Richard Henderson <r...@twiddle.net>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> cpu-exec.c | 14 +++++++++-----
> include/qom/cpu.h | 2 ++
> qom/cpu.c | 6 ++++++
> 3 files changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/cpu-exec.c b/cpu-exec.c
> index d930e7a..fe313b4 100644
> --- a/cpu-exec.c
> +++ b/cpu-exec.c
> @@ -676,8 +676,15 @@ int cpu_exec(CPUArchState *env)
> next_tb = 0;
> }
> #endif
> - /* Don't use the cached interrupt_request value,
> - do_interrupt may have updated the EXITTB flag. */
> + /* The target hook has 3 exit conditions:
> + False when the interrupt isn't processed,
> + True when it is, and we should restart on a new TB,
> + and via longjmp via cpu_loop_exit. */
> + if (cc->cpu_exec_interrupt(cpu, interrupt_request)) {
> + next_tb = 0;
> + }
> + /* Don't use the cached interrupt_request value,
> + do_interrupt may have updated the EXITTB flag. */
> if (cpu->interrupt_request & CPU_INTERRUPT_EXITTB) {
> cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB;
> /* ensure that no TB jump will be modified as
> @@ -783,10 +790,7 @@ int cpu_exec(CPUArchState *env)
> * local variables as longjmp is marked 'noreturn'. */
> cpu = current_cpu;
> env = cpu->env_ptr;
> -#if !(defined(CONFIG_USER_ONLY) && \
> - (defined(TARGET_M68K) || defined(TARGET_PPC) || defined(TARGET_S390X)))
> cc = CPU_GET_CLASS(cpu);
> -#endif
> #ifdef TARGET_I386
> x86_cpu = X86_CPU(cpu);
> #endif
> diff --git a/include/qom/cpu.h b/include/qom/cpu.h
> index 0340cf4..f576b47 100644
> --- a/include/qom/cpu.h
> +++ b/include/qom/cpu.h
> @@ -101,6 +101,7 @@ struct TranslationBlock;
> * @gdb_core_xml_file: File name for core registers GDB XML description.
> * @cpu_exec_enter: Callback for cpu_exec preparation.
> * @cpu_exec_exit: Callback for cpu_exec cleanup.
> + * @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec.
> *
> * Represents a CPU family or model.
> */
> @@ -154,6 +155,7 @@ typedef struct CPUClass {
>
> void (*cpu_exec_enter)(CPUState *cpu);
> void (*cpu_exec_exit)(CPUState *cpu);
> + bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
> } CPUClass;
>
> #ifdef HOST_WORDS_BIGENDIAN
> diff --git a/qom/cpu.c b/qom/cpu.c
> index 6a9d02e..0ec3337 100644
> --- a/qom/cpu.c
> +++ b/qom/cpu.c
> @@ -206,6 +206,11 @@ static void cpu_common_noop(CPUState *cpu)
> {
> }
>
> +static bool cpu_common_exec_interrupt(CPUState *cpu, int int_req)
> +{
> + return false;
> +}
> +
> void cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,
> int flags)
> {
> @@ -347,6 +352,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)
> k->debug_excp_handler = cpu_common_noop;
> k->cpu_exec_enter = cpu_common_noop;
> k->cpu_exec_exit = cpu_common_noop;
> + k->cpu_exec_interrupt = cpu_common_exec_interrupt;
> dc->realize = cpu_common_realizefn;
> /*
> * Reason: CPUs still need special care by board code: wiring up
--
Alex Bennée
