[PATCH v2 0/1] Fix MAX_OPC_PARAM_IARGS accordingly

[PATCH v2 0/1] Fix MAX_OPC_PARAM_IARGS accordingly

[Ziqiao Kong]

I notice that in the patch here:

https://gitlab.com/qemu-project/qemu/-/commit/5d6542bea780ad443c4f7f1496e64706101f525

The MAX_OPC_PARAM_IARGS was not updated as this path did:

https://gitlab.com/qemu-project/qemu/-/commit/1df3caa946e08b387511dfba3a37d78910e51796

And thus this patch fixes it accordingly.

Sorry that the format of my previous patch is wrong.

Ziqiao Kong (1):
  tcg: Set MAX_OPC_PARAM_IARGS to 7

 include/tcg/tcg.h        | 2 +-
 tcg/tci/tcg-target.c.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.32.0

[PATCH v2 1/1] tcg: Set MAX_OPC_PARAM_IARGS to 7

[Ziqiao Kong]

The last entry of DEF_HELPERS_FLAGS_n is DEF_HELPER_FLAGS_7 and
thus the MAX_OPC_PARAM_IARGS should be 7.

Signed-off-by: Ziqiao Kong <ziqiaokong@gmail.com>
---
 include/tcg/tcg.h        | 2 +-
 tcg/tci/tcg-target.c.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 42f5b500ed..939041103e 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -43,7 +43,7 @@
 #else
 #define MAX_OPC_PARAM_PER_ARG 1
 #endif
-#define MAX_OPC_PARAM_IARGS 6
+#define MAX_OPC_PARAM_IARGS 7
 #define MAX_OPC_PARAM_OARGS 1
 #define MAX_OPC_PARAM_ARGS (MAX_OPC_PARAM_IARGS + MAX_OPC_PARAM_OARGS)
 
diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc
index 0cb16aaa81..3e17c0080b 100644
--- a/tcg/tci/tcg-target.c.inc
+++ b/tcg/tci/tcg-target.c.inc
@@ -197,7 +197,7 @@ static const int tcg_target_reg_alloc_order[] = {
     TCG_REG_R0,
 };
 
-#if MAX_OPC_PARAM_IARGS != 6
+#if MAX_OPC_PARAM_IARGS != 7
 # error Fix needed, number of supported input arguments changed!
 #endif
 
-- 
2.32.0

RE: [PATCH v2 1/1] tcg: Set MAX_OPC_PARAM_IARGS to 7

[Taylor Simpson]

> -----Original Message-----
> From: Ziqiao Kong <ziqiaokong@gmail.com>
> Sent: Sunday, February 27, 2022 5:32 AM
> To: qemu-devel@nongnu.org
> Cc: richard.henderson@linaro.org; sw@weilnetz.de; Taylor Simpson
> <tsimpson@quicinc.com>; Ziqiao Kong <ziqiaokong@gmail.com>
> Subject: [PATCH v2 1/1] tcg: Set MAX_OPC_PARAM_IARGS to 7
> 
> The last entry of DEF_HELPERS_FLAGS_n is DEF_HELPER_FLAGS_7 and thus
> the MAX_OPC_PARAM_IARGS should be 7.
> 
> Signed-off-by: Ziqiao Kong <ziqiaokong@gmail.com>
> ---
>  include/tcg/tcg.h        | 2 +-
>  tcg/tci/tcg-target.c.inc | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index
> 42f5b500ed..939041103e 100644
> --- a/include/tcg/tcg.h
> +++ b/include/tcg/tcg.h
> @@ -43,7 +43,7 @@
>  #else
>  #define MAX_OPC_PARAM_PER_ARG 1
>  #endif
> -#define MAX_OPC_PARAM_IARGS 6
> +#define MAX_OPC_PARAM_IARGS 7
>  #define MAX_OPC_PARAM_OARGS 1
>  #define MAX_OPC_PARAM_ARGS (MAX_OPC_PARAM_IARGS +
> MAX_OPC_PARAM_OARGS)
> 
> diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index
> 0cb16aaa81..3e17c0080b 100644
> --- a/tcg/tci/tcg-target.c.inc
> +++ b/tcg/tci/tcg-target.c.inc
> @@ -197,7 +197,7 @@ static const int tcg_target_reg_alloc_order[] = {
>      TCG_REG_R0,
>  };
> 
> -#if MAX_OPC_PARAM_IARGS != 6
> +#if MAX_OPC_PARAM_IARGS != 7
>  # error Fix needed, number of supported input arguments changed!
>  #endif

Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>

Re: [PATCH v2 1/1] tcg: Set MAX_OPC_PARAM_IARGS to 7

[Richard Henderson]

On 2/27/22 01:31, Ziqiao Kong wrote:
> The last entry of DEF_HELPERS_FLAGS_n is DEF_HELPER_FLAGS_7 and
> thus the MAX_OPC_PARAM_IARGS should be 7.
> 
> Signed-off-by: Ziqiao Kong <ziqiaokong@gmail.com>
> ---
>   include/tcg/tcg.h        | 2 +-
>   tcg/tci/tcg-target.c.inc | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

Thanks, applied to tcg-next.


r~