Re: [RFC v8 18/27] cpu: Move cpu_exec_* to tcg_ops

[Philippe Mathieu-Daudé]

On 12/5/20 5:15 PM, Claudio Fontana wrote:
> From: Eduardo Habkost <ehabkost@redhat.com>
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> [claudio: wrapped in CONFIG_TCG]
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  accel/tcg/cpu-exec.c            | 12 ++++++------
>  include/hw/core/cpu.h           |  6 ------
>  include/hw/core/tcg-cpu-ops.h   |  9 +++++++++
>  target/alpha/cpu.c              |  3 ++-
>  target/arm/cpu.c                |  2 +-
>  target/arm/cpu64.c              |  5 ++++-
>  target/arm/cpu_tcg.c            |  5 ++++-
>  target/avr/cpu.c                |  2 +-
>  target/cris/cpu.c               |  2 +-
>  target/hppa/cpu.c               |  2 +-
>  target/i386/tcg-cpu.c           |  6 +++---
>  target/lm32/cpu.c               |  2 +-
>  target/m68k/cpu.c               |  2 +-
>  target/microblaze/cpu.c         |  2 +-
>  target/mips/cpu.c               |  2 +-
>  target/nios2/cpu.c              |  2 +-
>  target/openrisc/cpu.c           |  2 +-
>  target/ppc/translate_init.c.inc | 10 +++++-----
>  target/riscv/cpu.c              |  2 +-
>  target/rx/cpu.c                 |  2 +-
>  target/s390x/cpu.c              |  2 +-
>  target/sh4/cpu.c                |  2 +-
>  target/sparc/cpu.c              |  2 +-
>  target/tilegx/cpu.c             |  2 +-
>  target/unicore32/cpu.c          |  2 +-
>  target/xtensa/cpu.c             |  2 +-
>  26 files changed, 51 insertions(+), 41 deletions(-)
...

> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index 2f9e27c248..470b7b48c3 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -2239,7 +2239,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void 
> *data)
>  
>      cc->class_by_name = arm_cpu_class_by_name;
>      cc->has_work = arm_cpu_has_work;
> -    cc->cpu_exec_interrupt = arm_cpu_exec_interrupt;
>      cc->dump_state = arm_cpu_dump_state;
>      cc->set_pc = arm_cpu_set_pc;
>      cc->gdb_read_register = arm_cpu_gdb_read_register;
> @@ -2261,6 +2260,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void 
> *data)
>      cc->disas_set_info = arm_disas_set_info;
>  #ifdef CONFIG_TCG
>      cc->tcg_ops.initialize = arm_translate_init;
> +    cc->tcg_ops.cpu_exec_interrupt = arm_cpu_exec_interrupt;
>      cc->tcg_ops.synchronize_from_tb = arm_cpu_synchronize_from_tb;
>      cc->tlb_fill = arm_cpu_tlb_fill;
>      cc->debug_excp_handler = arm_debug_excp_handler;
> diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
> index 649213082f..ebc53c8bdc 100644
> --- a/target/arm/cpu64.c
> +++ b/target/arm/cpu64.c
> @@ -784,7 +784,10 @@ static void aarch64_cpu_class_init(ObjectClass *oc, void 
> *data)
>  {
>      CPUClass *cc = CPU_CLASS(oc);
>  
> -    cc->cpu_exec_interrupt = arm_cpu_exec_interrupt;
> +#ifdef CONFIG_TCG
> +    cc->tcg_ops.cpu_exec_interrupt = arm_cpu_exec_interrupt;
> +#endif /* CONFIG_TCG */

Thanks.