@@ -567,7 +567,6 @@ struct TCGContext {
#endif
#ifdef CONFIG_DEBUG_TCG
- int temps_in_use;
int goto_tb_issue_mask;
const TCGOpcode *vecop_list;
#endif
@@ -958,19 +957,6 @@ static inline TCGv_ptr tcg_temp_new_ptr(void)
return temp_tcgv_ptr(t);
}
-#if defined(CONFIG_DEBUG_TCG)
-/* If you call tcg_clear_temp_count() at the start of a section of
- * code which is not supposed to leak any TCG temporaries, then
- * calling tcg_check_temp_count() at the end of the section will
- * return 1 if the section did in fact leak a temporary.
- */
-void tcg_clear_temp_count(void);
-int tcg_check_temp_count(void);
-#else
-#define tcg_clear_temp_count() do { } while (0)
-#define tcg_check_temp_count() 0
-#endif
-
int64_t tcg_cpu_exec_time(void);
void tcg_dump_info(GString *buf);
void tcg_dump_op_count(GString *buf);
@@ -18,17 +18,8 @@
#include "exec/plugin-gen.h"
#include "sysemu/replay.h"
-/* Pairs with tcg_clear_temp_count.
- To be called by #TranslatorOps.{translate_insn,tb_stop} if
- (1) the target is sufficiently clean to support reporting,
- (2) as and when all temporaries are known to be consumed.
- For most targets, (2) is at the end of translate_insn. */
void translator_loop_temp_check(DisasContextBase *db)
{
- if (tcg_check_temp_count()) {
- qemu_log("warning: TCG temporary leaks before "
- TARGET_FMT_lx "\n", db->pc_next);
- }
}
bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest)
@@ -67,9 +58,6 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
ops->init_disas_context(db, cpu);
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
- /* Reset the temp count so that we can identify leaks */
- tcg_clear_temp_count();
-
/* Start translating. */
gen_tb_start(db->tb);
ops->tb_start(db, cpu);
@@ -1272,7 +1272,7 @@ TCGTemp *tcg_temp_new_internal(TCGType type, TCGTempKind kind)
ts->temp_allocated = 1;
tcg_debug_assert(ts->base_type == type);
tcg_debug_assert(ts->kind == kind);
- goto done;
+ return ts;
}
} else {
tcg_debug_assert(kind == TEMP_TB);
@@ -1316,11 +1316,6 @@ TCGTemp *tcg_temp_new_internal(TCGType type, TCGTempKind kind)
ts2->kind = kind;
}
}
-
- done:
-#if defined(CONFIG_DEBUG_TCG)
- s->temps_in_use++;
-#endif
return ts;
}
@@ -1365,30 +1360,18 @@ void tcg_temp_free_internal(TCGTemp *ts)
switch (ts->kind) {
case TEMP_CONST:
- /*
- * In order to simplify users of tcg_constant_*,
- * silently ignore free.
- */
- return;
- case TEMP_EBB:
case TEMP_TB:
+ /* Silently ignore free. */
+ break;
+ case TEMP_EBB:
+ tcg_debug_assert(ts->temp_allocated != 0);
+ ts->temp_allocated = 0;
+ set_bit(temp_idx(ts), s->free_temps[ts->base_type].l);
break;
default:
+ /* It never made sense to free TEMP_FIXED or TEMP_GLOBAL. */
g_assert_not_reached();
}
-
- tcg_debug_assert(ts->temp_allocated != 0);
- ts->temp_allocated = 0;
-
-#if defined(CONFIG_DEBUG_TCG)
- assert(s->temps_in_use > 0);
- s->temps_in_use--;
-#endif
-
- if (ts->kind == TEMP_EBB) {
- int idx = temp_idx(ts);
- set_bit(idx, s->free_temps[ts->base_type].l);
- }
}
TCGTemp *tcg_constant_internal(TCGType type, int64_t val)
@@ -1476,27 +1459,6 @@ TCGv_i64 tcg_const_i64(int64_t val)
return t0;
}
-#if defined(CONFIG_DEBUG_TCG)
-void tcg_clear_temp_count(void)
-{
- TCGContext *s = tcg_ctx;
- s->temps_in_use = 0;
-}
-
-int tcg_check_temp_count(void)
-{
- TCGContext *s = tcg_ctx;
- if (s->temps_in_use) {
- /* Clear the count so that we don't give another
- * warning immediately next time around.
- */
- s->temps_in_use = 0;
- return 1;
- }
- return 0;
-}
-#endif
-
/* Return true if OP may appear in the opcode stream.
Test the runtime variable that controls each opcode. */
bool tcg_op_supported(TCGOpcode op)
Since all temps allocated by guest front-ends are now TEMP_TB, and we don't recycle TEMP_TB, there's no point in requiring that the front-ends free the temps at all. Begin by dropping the inner-most checks that all temps have been freed. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/tcg/tcg.h | 14 ----------- accel/tcg/translator.c | 12 ---------- tcg/tcg.c | 54 +++++++----------------------------------- 3 files changed, 8 insertions(+), 72 deletions(-)