On 24/01/24, Philippe Mathieu-Daudé wrote:
> Move this x86-specific code out of the generic accel/tcg/.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> ---
> target/i386/tcg/helper-tcg.h | 1 +
> accel/tcg/cpu-exec.c | 9 ---------
> target/i386/tcg/sysemu/seg_helper.c | 10 ++++++++++
> target/i386/tcg/tcg-cpu.c | 1 +
> 4 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h
> index ce34b737bb..253b1f561e 100644
> --- a/target/i386/tcg/helper-tcg.h
> +++ b/target/i386/tcg/helper-tcg.h
> @@ -39,6 +39,7 @@ QEMU_BUILD_BUG_ON(TCG_PHYS_ADDR_BITS >
> TARGET_PHYS_ADDR_SPACE_BITS);
> */
> void x86_cpu_do_interrupt(CPUState *cpu);
> #ifndef CONFIG_USER_ONLY
> +bool x86_need_replay_interrupt(int interrupt_request);
> bool x86_cpu_exec_interrupt(CPUState *cpu, int int_req);
> #endif
>
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 4ab7d6c896..5a978a9e72 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -768,21 +768,12 @@ static inline bool cpu_handle_exception(CPUClass *cc,
> CPUState *cpu, int *ret)
> }
>
> #ifndef CONFIG_USER_ONLY
> -/*
> - * CPU_INTERRUPT_POLL is a virtual event which gets converted into a
> - * "real" interrupt event later. It does not need to be recorded for
> - * replay purposes.
> - */
> static inline bool need_replay_interrupt(CPUClass *cc, int interrupt_request)
> {
> -#if defined(TARGET_I386)
> - return !(interrupt_request & CPU_INTERRUPT_POLL);
> -#else
> if (!cc->tcg_ops->need_replay_interrupt) {
> return true;
> }
> return cc->tcg_ops->need_replay_interrupt(interrupt_request);
> -#endif
> }
> #endif /* !CONFIG_USER_ONLY */
>
> diff --git a/target/i386/tcg/sysemu/seg_helper.c
> b/target/i386/tcg/sysemu/seg_helper.c
> index 1cb5a0db45..e6f42282bb 100644
> --- a/target/i386/tcg/sysemu/seg_helper.c
> +++ b/target/i386/tcg/sysemu/seg_helper.c
> @@ -127,6 +127,16 @@ void x86_cpu_do_interrupt(CPUState *cs)
> }
> }
>
> +bool x86_need_replay_interrupt(int interrupt_request)
> +{
> + /*
> + * CPU_INTERRUPT_POLL is a virtual event which gets converted into a
> + * "real" interrupt event later. It does not need to be recorded for
> + * replay purposes.
> + */
> + return !(interrupt_request & CPU_INTERRUPT_POLL);
> +}
> +
> bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
> {
> X86CPU *cpu = X86_CPU(cs);
> diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c
> index e1405b7be9..255d56d4c3 100644
> --- a/target/i386/tcg/tcg-cpu.c
> +++ b/target/i386/tcg/tcg-cpu.c
> @@ -123,6 +123,7 @@ static const struct TCGCPUOps x86_tcg_ops = {
> .do_unaligned_access = x86_cpu_do_unaligned_access,
> .debug_excp_handler = breakpoint_handler,
> .debug_check_breakpoint = x86_debug_check_breakpoint,
> + .need_replay_interrupt = x86_need_replay_interrupt,
> #endif /* !CONFIG_USER_ONLY */
> };
>
> --
> 2.41.0
>
Ah this makes me happy!:)
Reviewed-by: Anton Johansson <a...@rev.ng>
