| Message ID | 20201223060204.576856-13-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tcg: backend constraints cleanup | expand |
On Tue, Dec 22, 2020 at 10:21 PM Richard Henderson <richard.henderson@linaro.org> wrote: > > All backends have now been converted to tcg-target-constr.h, > so we can remove the fallback code. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > tcg/aarch64/tcg-target.h | 1 - > tcg/arm/tcg-target.h | 1 - > tcg/i386/tcg-target.h | 1 - > tcg/mips/tcg-target.h | 1 - > tcg/ppc/tcg-target.h | 1 - > tcg/riscv/tcg-target.h | 1 - > tcg/s390/tcg-target.h | 1 - > tcg/sparc/tcg-target.h | 1 - > tcg/tci/tcg-target.h | 2 -- > tcg/tcg.c | 16 ---------------- > 10 files changed, 26 deletions(-) > > diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h > index ca7af5a589..663dd0b95e 100644 > --- a/tcg/aarch64/tcg-target.h > +++ b/tcg/aarch64/tcg-target.h > @@ -159,6 +159,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); > #define TCG_TARGET_NEED_LDST_LABELS > #endif > #define TCG_TARGET_NEED_POOL_LABELS > -#define TCG_TARGET_CONSTR_H > > #endif /* AARCH64_TCG_TARGET_H */ > diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h > index 6f058d6d9b..17e771374d 100644 > --- a/tcg/arm/tcg-target.h > +++ b/tcg/arm/tcg-target.h > @@ -146,6 +146,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); > #define TCG_TARGET_NEED_LDST_LABELS > #endif > #define TCG_TARGET_NEED_POOL_LABELS > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h > index 7c405e166d..abd4ac7fc0 100644 > --- a/tcg/i386/tcg-target.h > +++ b/tcg/i386/tcg-target.h > @@ -235,6 +235,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, > #define TCG_TARGET_NEED_LDST_LABELS > #endif > #define TCG_TARGET_NEED_POOL_LABELS > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h > index f4a79bcad1..c6b091d849 100644 > --- a/tcg/mips/tcg-target.h > +++ b/tcg/mips/tcg-target.h > @@ -217,6 +217,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); > #ifdef CONFIG_SOFTMMU > #define TCG_TARGET_NEED_LDST_LABELS > #endif > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h > index 78d3470f3c..be10363956 100644 > --- a/tcg/ppc/tcg-target.h > +++ b/tcg/ppc/tcg-target.h > @@ -185,6 +185,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); > #define TCG_TARGET_NEED_LDST_LABELS > #endif > #define TCG_TARGET_NEED_POOL_LABELS > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv/tcg-target.h > index ff8ff43a46..032439d806 100644 > --- a/tcg/riscv/tcg-target.h > +++ b/tcg/riscv/tcg-target.h > @@ -175,6 +175,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); > #define TCG_TARGET_NEED_POOL_LABELS > > #define TCG_TARGET_HAS_MEMORY_BSWAP 0 > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h > index 3aff3cc572..63c8797bd3 100644 > --- a/tcg/s390/tcg-target.h > +++ b/tcg/s390/tcg-target.h > @@ -162,6 +162,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, > #define TCG_TARGET_NEED_LDST_LABELS > #endif > #define TCG_TARGET_NEED_POOL_LABELS > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h > index bfee6191b3..633841ebf2 100644 > --- a/tcg/sparc/tcg-target.h > +++ b/tcg/sparc/tcg-target.h > @@ -179,6 +179,5 @@ static inline void flush_icache_range(uintptr_t start, uintptr_t stop) > void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); > > #define TCG_TARGET_NEED_POOL_LABELS > -#define TCG_TARGET_CONSTR_H > > #endif > diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h > index cd3dee51bb..8c1c1d265d 100644 > --- a/tcg/tci/tcg-target.h > +++ b/tcg/tci/tcg-target.h > @@ -210,6 +210,4 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, > /* no need to flush icache explicitly */ > } > > -#define TCG_TARGET_CONSTR_H > - > #endif /* TCG_TARGET_H */ > diff --git a/tcg/tcg.c b/tcg/tcg.c > index f5b53d739e..2bde926315 100644 > --- a/tcg/tcg.c > +++ b/tcg/tcg.c > @@ -102,10 +102,6 @@ static void tcg_register_jit_int(void *buf, size_t size, > __attribute__((unused)); > > /* Forward declarations for functions declared and used in tcg-target.c.inc. */ > -#ifndef TCG_TARGET_CONSTR_H > -static const char *target_parse_constraint(TCGArgConstraint *ct, > - const char *ct_str, TCGType type); > -#endif > static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, > intptr_t arg2); > static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg); > @@ -2288,7 +2284,6 @@ static void process_op_defs(TCGContext *s) > ct_str++; > break; > > -#ifdef TCG_TARGET_CONSTR_H > /* Include all of the target-specific constraints. */ > > #undef CONST > @@ -2304,17 +2299,6 @@ static void process_op_defs(TCGContext *s) > default: > /* Typo in TCGTargetOpDef constraint. */ > g_assert_not_reached(); > -#else > - default: > - { > - TCGType type = (def->flags & TCG_OPF_64BIT > - ? TCG_TYPE_I64 : TCG_TYPE_I32); > - ct_str = target_parse_constraint(&def->args_ct[i], > - ct_str, type); > - /* Typo in TCGTargetOpDef constraint. */ > - tcg_debug_assert(ct_str != NULL); > - } > -#endif > } > } > } > -- > 2.25.1 > >
diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h index ca7af5a589..663dd0b95e 100644 --- a/tcg/aarch64/tcg-target.h +++ b/tcg/aarch64/tcg-target.h @@ -159,6 +159,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_CONSTR_H #endif /* AARCH64_TCG_TARGET_H */ diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index 6f058d6d9b..17e771374d 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -146,6 +146,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index 7c405e166d..abd4ac7fc0 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -235,6 +235,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h index f4a79bcad1..c6b091d849 100644 --- a/tcg/mips/tcg-target.h +++ b/tcg/mips/tcg-target.h @@ -217,6 +217,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS #endif -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index 78d3470f3c..be10363956 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -185,6 +185,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv/tcg-target.h index ff8ff43a46..032439d806 100644 --- a/tcg/riscv/tcg-target.h +++ b/tcg/riscv/tcg-target.h @@ -175,6 +175,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_HAS_MEMORY_BSWAP 0 -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h index 3aff3cc572..63c8797bd3 100644 --- a/tcg/s390/tcg-target.h +++ b/tcg/s390/tcg-target.h @@ -162,6 +162,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h index bfee6191b3..633841ebf2 100644 --- a/tcg/sparc/tcg-target.h +++ b/tcg/sparc/tcg-target.h @@ -179,6 +179,5 @@ static inline void flush_icache_range(uintptr_t start, uintptr_t stop) void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_CONSTR_H #endif diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index cd3dee51bb..8c1c1d265d 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -210,6 +210,4 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, /* no need to flush icache explicitly */ } -#define TCG_TARGET_CONSTR_H - #endif /* TCG_TARGET_H */ diff --git a/tcg/tcg.c b/tcg/tcg.c index f5b53d739e..2bde926315 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -102,10 +102,6 @@ static void tcg_register_jit_int(void *buf, size_t size, __attribute__((unused)); /* Forward declarations for functions declared and used in tcg-target.c.inc. */ -#ifndef TCG_TARGET_CONSTR_H -static const char *target_parse_constraint(TCGArgConstraint *ct, - const char *ct_str, TCGType type); -#endif static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, intptr_t arg2); static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg); @@ -2288,7 +2284,6 @@ static void process_op_defs(TCGContext *s) ct_str++; break; -#ifdef TCG_TARGET_CONSTR_H /* Include all of the target-specific constraints. */ #undef CONST @@ -2304,17 +2299,6 @@ static void process_op_defs(TCGContext *s) default: /* Typo in TCGTargetOpDef constraint. */ g_assert_not_reached(); -#else - default: - { - TCGType type = (def->flags & TCG_OPF_64BIT - ? TCG_TYPE_I64 : TCG_TYPE_I32); - ct_str = target_parse_constraint(&def->args_ct[i], - ct_str, type); - /* Typo in TCGTargetOpDef constraint. */ - tcg_debug_assert(ct_str != NULL); - } -#endif } } }
All backends have now been converted to tcg-target-constr.h, so we can remove the fallback code. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- tcg/aarch64/tcg-target.h | 1 - tcg/arm/tcg-target.h | 1 - tcg/i386/tcg-target.h | 1 - tcg/mips/tcg-target.h | 1 - tcg/ppc/tcg-target.h | 1 - tcg/riscv/tcg-target.h | 1 - tcg/s390/tcg-target.h | 1 - tcg/sparc/tcg-target.h | 1 - tcg/tci/tcg-target.h | 2 -- tcg/tcg.c | 16 ---------------- 10 files changed, 26 deletions(-) -- 2.25.1