Re: [PATCH v2 24/26] target/arm/tcg: Inline 'exec/helper-proto.h'

[Richard Henderson]

On 6/11/23 10:58, Philippe Mathieu-Daudé wrote:
> +++ b/target/arm/tcg/vec_helper.c
> @@ -19,12 +19,15 @@
>   
>   #include "qemu/osdep.h"
>   #include "cpu.h"
> -#include "exec/helper-proto.h"
>   #include "tcg/tcg-gvec-desc.h"
>   #include "fpu/softfloat.h"
>   #include "qemu/int128.h"
>   #include "vec_internal.h"
>   
> +#define HELPER_H "helper.h"
> +#include "exec/helper-proto.h.inc"
> +#undef  HELPER_H
> +
>   #define HELPER_H "tcg/helper-vfp.h.inc"
>   #include "exec/helper-proto.h.inc"
>   #undef  HELPER_H
> diff --git a/target/arm/vfp_helper.c b/target/arm/vfp_helper.c
> index cbd78cc810..51f8e92ff7 100644
> --- a/target/arm/vfp_helper.c
> +++ b/target/arm/vfp_helper.c
> @@ -19,7 +19,6 @@
>   
>   #include "qemu/osdep.h"
>   #include "cpu.h"
> -#include "exec/helper-proto.h"
>   #include "internals.h"
>   #ifdef CONFIG_TCG
>   #include "qemu/log.h"
> @@ -32,6 +31,10 @@
>   
>   #ifdef CONFIG_TCG
>   
> +#define HELPER_H "helper.h"
> +#include "exec/helper-proto.h.inc"
> +#undef  HELPER_H
> +
>   #define HELPER_H "tcg/helper-vfp.h.inc"
>   #include "exec/helper-proto.h.inc"
>   #undef  HELPER_H

Are these really required, or are you simply replacing what you removed?

r~