mirror of https://gitee.com/openkylin/qemu.git
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. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
63b29fda4e
commit
0c823e5968
|
@ -155,6 +155,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
|||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif /* AARCH64_TCG_TARGET_H */
|
||||
|
|
|
@ -142,6 +142,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
|||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
|
@ -235,6 +235,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx,
|
|||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
|
@ -207,6 +207,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
|||
#ifdef CONFIG_SOFTMMU
|
||||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
|
@ -185,6 +185,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
|||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
|
@ -171,6 +171,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
|||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
|
||||
#define TCG_TARGET_HAS_MEMORY_BSWAP 0
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
|
@ -159,6 +159,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx,
|
|||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
|
@ -168,6 +168,5 @@ extern bool use_vis3_instructions;
|
|||
void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
||||
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif
|
||||
|
|
12
tcg/tcg.c
12
tcg/tcg.c
|
@ -69,9 +69,6 @@
|
|||
/* Forward declarations for functions declared in tcg-target.c.inc and
|
||||
used here. */
|
||||
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 bool patch_reloc(tcg_insn_unit *code_ptr, int type,
|
||||
intptr_t value, intptr_t addend);
|
||||
|
@ -349,7 +346,6 @@ static void set_jmp_reset_offset(TCGContext *s, int which)
|
|||
s->tb_jmp_reset_offset[which] = tcg_current_code_size(s);
|
||||
}
|
||||
|
||||
#ifdef TCG_TARGET_CON_SET_H
|
||||
#define C_PFX1(P, A) P##A
|
||||
#define C_PFX2(P, A, B) P##A##_##B
|
||||
#define C_PFX3(P, A, B, C) P##A##_##B##_##C
|
||||
|
@ -453,8 +449,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_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.c.inc"
|
||||
|
||||
/* compare a pointer @ptr and a tb_tc @s */
|
||||
|
@ -2532,7 +2526,6 @@ static void process_op_defs(TCGContext *s)
|
|||
continue;
|
||||
}
|
||||
|
||||
#ifdef TCG_TARGET_CON_SET_H
|
||||
/*
|
||||
* Macro magic should make it impossible, but double-check that
|
||||
* the array index is in range. Since the signness of an enum
|
||||
|
@ -2541,11 +2534,6 @@ static void process_op_defs(TCGContext *s)
|
|||
unsigned con_set = tcg_target_op_def(op);
|
||||
tcg_debug_assert(con_set < ARRAY_SIZE(constraint_sets));
|
||||
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++) {
|
||||
const char *ct_str = tdefs->args_ct_str[i];
|
||||
|
|
|
@ -207,6 +207,4 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx,
|
|||
/* no need to flush icache explicitly */
|
||||
}
|
||||
|
||||
#define TCG_TARGET_CON_SET_H
|
||||
|
||||
#endif /* TCG_TARGET_H */
|
||||
|
|
Loading…
Reference in New Issue