tcg: Remove TCG_TARGET_CON_SET_H

All backends have now been converted to tcg-target-con-set.h,
so we can remove the fallback code.

Backports 0c823e596877a30fd6c17a1ae9f98218a53055ea
This commit is contained in:
Richard Henderson 2021-03-04 16:29:10 -05:00 committed by Lioncash
parent 5fc6840277
commit 3e81f9dd20
4 changed files with 0 additions and 15 deletions

View file

@ -160,6 +160,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t);
#define TCG_TARGET_NEED_LDST_LABELS #define TCG_TARGET_NEED_LDST_LABELS
#endif #endif
#define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_NEED_POOL_LABELS
#define TCG_TARGET_CON_SET_H
#endif /* AARCH64_TCG_TARGET_H */ #endif /* AARCH64_TCG_TARGET_H */

View file

@ -148,6 +148,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t);
#define TCG_TARGET_NEED_LDST_LABELS #define TCG_TARGET_NEED_LDST_LABELS
#endif #endif
#define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_NEED_POOL_LABELS
#define TCG_TARGET_CON_SET_H
#endif #endif

View file

@ -272,6 +272,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
#define TCG_TARGET_NEED_LDST_LABELS #define TCG_TARGET_NEED_LDST_LABELS
#endif #endif
#define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_NEED_POOL_LABELS
#define TCG_TARGET_CON_SET_H
#endif #endif

View file

@ -61,9 +61,6 @@
/* Forward declarations for functions declared in tcg-target.inc.c and /* Forward declarations for functions declared in tcg-target.inc.c and
used here. */ used here. */
static void tcg_target_init(TCGContext *s); static void tcg_target_init(TCGContext *s);
#ifndef TCG_TARGET_CON_SET_H
static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode);
#endif
static void tcg_target_qemu_prologue(TCGContext *s); static void tcg_target_qemu_prologue(TCGContext *s);
static bool patch_reloc(tcg_insn_unit *code_ptr, int type, static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
intptr_t value, intptr_t addend); intptr_t value, intptr_t addend);
@ -278,7 +275,6 @@ static bool tcg_resolve_relocs(TCGContext *s)
return true; return true;
} }
#ifdef TCG_TARGET_CON_SET_H
#define C_PFX1(P, A) P##A #define C_PFX1(P, A) P##A
#define C_PFX2(P, A, B) P##A##_##B #define C_PFX2(P, A, B) P##A##_##B
#define C_PFX3(P, A, B, C) P##A##_##B##_##C #define C_PFX3(P, A, B, C) P##A##_##B##_##C
@ -382,8 +378,6 @@ static const TCGTargetOpDef constraint_sets[] = {
#define C_O2_I3(O1, O2, I1, I2, I3) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3) #define C_O2_I3(O1, O2, I1, I2, I3) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3)
#define C_O2_I4(O1, O2, I1, I2, I3, I4) C_PFX6(c_o2_i4_, O1, O2, I1, I2, I3, I4) #define C_O2_I4(O1, O2, I1, I2, I3, I4) C_PFX6(c_o2_i4_, O1, O2, I1, I2, I3, I4)
#endif /* TCG_TARGET_CON_SET_H */
#include "tcg-target.inc.c" #include "tcg-target.inc.c"
/* pool based memory allocation */ /* pool based memory allocation */
@ -1872,7 +1866,6 @@ static void process_op_defs(TCGContext *s)
continue; continue;
} }
#ifdef TCG_TARGET_CON_SET_H
/* /*
* Macro magic should make it impossible, but double-check that * Macro magic should make it impossible, but double-check that
* the array index is in range. Since the signness of an enum * the array index is in range. Since the signness of an enum
@ -1881,11 +1874,6 @@ static void process_op_defs(TCGContext *s)
unsigned con_set = tcg_target_op_def(op); unsigned con_set = tcg_target_op_def(op);
tcg_debug_assert(con_set < ARRAY_SIZE(constraint_sets)); tcg_debug_assert(con_set < ARRAY_SIZE(constraint_sets));
tdefs = &constraint_sets[con_set]; tdefs = &constraint_sets[con_set];
#else
tdefs = tcg_target_op_def(op);
/* Missing TCGTargetOpDef entry. */
tcg_debug_assert(tdefs != NULL);
#endif
for (i = 0; i < nb_args; i++) { for (i = 0; i < nb_args; i++) {
const char *ct_str = tdefs->args_ct_str[i]; const char *ct_str = tdefs->args_ct_str[i];