tcg: Remove tcg_target_get_call_iarg_regs_count The TCG targets no longer need individual implementations. Since commit 6a18ae2d2947532d5c26439548afa0481c4529f9, 'flags' is no longer used in tcg_target_get_call_iarg_regs_count. The remaining tcg_target_get_call_iarg_regs_count is trivial and only called once. Therefore the patch eliminates it completely. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index aed3b53..2bad0a2 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c
@@ -145,12 +145,6 @@ } } -/* maximum number of register used for input function arguments */ -static inline int tcg_target_get_call_iarg_regs_count(int flags) -{ - return 4; -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c index 793b90d..2c79c10 100644 --- a/tcg/hppa/tcg-target.c +++ b/tcg/hppa/tcg-target.c
@@ -175,12 +175,6 @@ *insn_ptr = insn; } -/* maximum number of register used for input function arguments */ -static inline int tcg_target_get_call_iarg_regs_count(int flags) -{ - return 4; -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index 43c9719..122d636 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c
@@ -124,12 +124,6 @@ } } -/* maximum number of register used for input function arguments */ -static inline int tcg_target_get_call_iarg_regs_count(int flags) -{ - return ARRAY_SIZE(tcg_target_call_iarg_regs); -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 1745038..dc9c12c 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c
@@ -176,12 +176,6 @@ TCG_REG_R8 }; -/* maximum number of register used for input function arguments */ -static inline int tcg_target_get_call_iarg_regs_count(int flags) -{ - return 8; -} - /* * opcode formation */
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index c272b38..f70910a 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c
@@ -185,12 +185,6 @@ } } -/* maximum number of register used for input function arguments */ -static inline int tcg_target_get_call_iarg_regs_count(int flags) -{ - return 4; -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 26c4b33..ec02867 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c
@@ -221,12 +221,6 @@ } } -/* maximum number of register used for input function arguments */ -static int tcg_target_get_call_iarg_regs_count(int flags) -{ - return ARRAY_SIZE (tcg_target_call_iarg_regs); -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 337cd41..19944bc 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c
@@ -208,12 +208,6 @@ } } -/* maximum number of register used for input function arguments */ -static int tcg_target_get_call_iarg_regs_count (int flags) -{ - return ARRAY_SIZE (tcg_target_call_iarg_regs); -} - /* parse target specific constraints */ static int target_parse_constraint (TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index aac11d9..3b90605 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c
@@ -356,11 +356,6 @@ } } -static int tcg_target_get_call_iarg_regs_count(int flags) -{ - return sizeof(tcg_target_call_iarg_regs) / sizeof(int); -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index baed3b4..014bbfd 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c
@@ -133,12 +133,6 @@ } } -/* maximum number of register used for input function arguments */ -static inline int tcg_target_get_call_iarg_regs_count(int flags) -{ - return 6; -} - /* parse target specific constraints */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) {
diff --git a/tcg/tcg.c b/tcg/tcg.c index 4afd035..6edf170 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c
@@ -89,7 +89,6 @@ tcg_target_long arg2); static int tcg_target_const_match(tcg_target_long val, const TCGArgConstraint *arg_ct); -static int tcg_target_get_call_iarg_regs_count(int flags); TCGOpDef tcg_op_defs[] = { #define DEF(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags }, @@ -1853,7 +1852,7 @@ flags = args[nb_oargs + nb_iargs]; - nb_regs = tcg_target_get_call_iarg_regs_count(flags); + nb_regs = ARRAY_SIZE(tcg_target_call_iarg_regs); if (nb_regs > nb_params) nb_regs = nb_params;
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c index 003244c..3f4a24b 100644 --- a/tcg/tci/tcg-target.c +++ b/tcg/tci/tcg-target.c
@@ -863,12 +863,6 @@ return arg_ct->ct & TCG_CT_CONST; } -/* Maximum number of register used for input function arguments. */ -static int tcg_target_get_call_iarg_regs_count(int flags) -{ - return ARRAY_SIZE(tcg_target_call_iarg_regs); -} - static void tcg_target_init(TCGContext *s) { #if defined(CONFIG_DEBUG_TCG_INTERPRETER)