[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Use identical prototype for tcg_out_vec_op and tcg_out_op fu
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
Re: [PATCH] Use identical prototype for tcg_out_vec_op and tcg_out_op function |
|
Date: |
Fri, 12 Mar 2021 19:43:29 +0100 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 |
Cc'ing TCG maintainer ;)
On 3/12/21 1:14 PM, mrezanin@redhat.com wrote:
> From: Miroslav Rezanina <mrezanin@redhat.com>
>
> There are two different versions of prototype for tcg_out_op and
> tcg_out_vec_op functions:
>
> 1) using const TCGArg *args and const int *const_args arguments
> 2) using const TCGArg args[TCG_MAX_OP_ARGS] and const int
> const_args[TCG_MAX_OP_ARGS]
> aguments.
>
> This duality cause warning on GCC 11 and prevent build using --enable-werror.
>
> As second version provides more information, unify functions prototypes to
> this variant.
>
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
>
> --
> Note: These changes were send to mailing list before:
>
> - First sending by me using first variant
> - Several iterations sended by Philippe Mathieu-Daudé with additional fixes
> that were not accepted.
> ---
> tcg/aarch64/tcg-target.c.inc | 3 ++-
> tcg/i386/tcg-target.c.inc | 6 ++++--
> tcg/mips/tcg-target.c.inc | 3 ++-
> tcg/ppc/tcg-target.c.inc | 8 +++++---
> tcg/riscv/tcg-target.c.inc | 3 ++-
> tcg/s390/tcg-target.c.inc | 3 ++-
> tcg/tcg.c | 19 +++++++++++--------
> tcg/tci/tcg-target.c.inc | 5 +++--
> 8 files changed, 31 insertions(+), 19 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
> index fcaa5aface..f07ba98aa4 100644
> --- a/tcg/aarch64/tcg-target.c.inc
> +++ b/tcg/aarch64/tcg-target.c.inc
> @@ -2286,7 +2286,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
>
> static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
> unsigned vecl, unsigned vece,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> static const AArch64Insn cmp_vec_insn[16] = {
> [TCG_COND_EQ] = I3616_CMEQ,
> diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc
> index 40326c2806..415c5c0796 100644
> --- a/tcg/i386/tcg-target.c.inc
> +++ b/tcg/i386/tcg-target.c.inc
> @@ -2177,7 +2177,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg
> *args, bool is64)
> }
>
> static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> TCGArg a0, a1, a2;
> int c, const_a2, vexop, rexw = 0;
> @@ -2613,7 +2614,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode
> opc,
>
> static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
> unsigned vecl, unsigned vece,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> static int const add_insn[4] = {
> OPC_PADDB, OPC_PADDW, OPC_PADDD, OPC_PADDQ
> diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
> index ab55f3109b..8738a3a581 100644
> --- a/tcg/mips/tcg-target.c.inc
> +++ b/tcg/mips/tcg-target.c.inc
> @@ -1651,7 +1651,8 @@ static void tcg_out_clz(TCGContext *s, MIPSInsn opcv2,
> MIPSInsn opcv6,
> }
>
> static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> MIPSInsn i1, i2;
> TCGArg a0, a1, a2;
> diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
> index 4377d15d62..838ccfa42d 100644
> --- a/tcg/ppc/tcg-target.c.inc
> +++ b/tcg/ppc/tcg-target.c.inc
> @@ -2319,8 +2319,9 @@ static void tcg_target_qemu_prologue(TCGContext *s)
> tcg_out32(s, BCLR | BO_ALWAYS);
> }
>
> -static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
> - const int *const_args)
> +static void tcg_out_op(TCGContext *s, TCGOpcode opc,
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> TCGArg a0, a1, a2;
> int c;
> @@ -3115,7 +3116,8 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType
> type, unsigned vece,
>
> static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
> unsigned vecl, unsigned vece,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> static const uint32_t
> add_op[4] = { VADDUBM, VADDUHM, VADDUWM, VADDUDM },
> diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
> index e700c52067..ef43147040 100644
> --- a/tcg/riscv/tcg-target.c.inc
> +++ b/tcg/riscv/tcg-target.c.inc
> @@ -1212,7 +1212,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg
> *args, bool is_64)
> static const tcg_insn_unit *tb_ret_addr;
>
> static void tcg_out_op(TCGContext *s, TCGOpcode opc,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> TCGArg a0 = args[0];
> TCGArg a1 = args[1];
> diff --git a/tcg/s390/tcg-target.c.inc b/tcg/s390/tcg-target.c.inc
> index 695d7ee652..af8dfe81ac 100644
> --- a/tcg/s390/tcg-target.c.inc
> +++ b/tcg/s390/tcg-target.c.inc
> @@ -1705,7 +1705,8 @@ static void tcg_out_qemu_st(TCGContext* s, TCGReg
> data_reg, TCGReg addr_reg,
> case glue(glue(INDEX_op_,x),_i64)
>
> static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
> - const TCGArg *args, const int *const_args)
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> S390Opcode op, op2;
> TCGArg a0, a1, a2;
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 2991112829..de91bb6e9e 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -107,8 +107,9 @@ static void tcg_out_ld(TCGContext *s, TCGType type,
> TCGReg ret, TCGReg arg1,
> static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg);
> static void tcg_out_movi(TCGContext *s, TCGType type,
> TCGReg ret, tcg_target_long arg);
> -static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
> - const int *const_args);
> +static void tcg_out_op(TCGContext *s, TCGOpcode opc,
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS]);
> #if TCG_TARGET_MAYBE_vec
> static bool tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece,
> TCGReg dst, TCGReg src);
> @@ -116,9 +117,10 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType
> type, unsigned vece,
> TCGReg dst, TCGReg base, intptr_t offset);
> static void tcg_out_dupi_vec(TCGContext *s, TCGType type, unsigned vece,
> TCGReg dst, int64_t arg);
> -static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, unsigned vecl,
> - unsigned vece, const TCGArg *args,
> - const int *const_args);
> +static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
> + unsigned vecl, unsigned vece,
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS]);
> #else
> static inline bool tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned
> vece,
> TCGReg dst, TCGReg src)
> @@ -135,9 +137,10 @@ static inline void tcg_out_dupi_vec(TCGContext *s,
> TCGType type, unsigned vece,
> {
> g_assert_not_reached();
> }
> -static inline void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, unsigned
> vecl,
> - unsigned vece, const TCGArg *args,
> - const int *const_args)
> +static inline void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
> + unsigned vecl, unsigned vece,
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> g_assert_not_reached();
> }
> diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc
> index c79f9c32d8..221ad7150f 100644
> --- a/tcg/tci/tcg-target.c.inc
> +++ b/tcg/tci/tcg-target.c.inc
> @@ -392,8 +392,9 @@ static inline void tcg_out_call(TCGContext *s, const
> tcg_insn_unit *arg)
> # define CASE_64(x)
> #endif
>
> -static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
> - const int *const_args)
> +static void tcg_out_op(TCGContext *s, TCGOpcode opc,
> + const TCGArg args[TCG_MAX_OP_ARGS],
> + const int const_args[TCG_MAX_OP_ARGS])
> {
> uint8_t *old_code_ptr = s->code_ptr;
>
>