david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gen-icount: fold exitreq_label into TCGContext

Browse Source 
Groundwork for supporting multiple TCG contexts.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Emilio G. Cota 2017-07-04 13:54:21 -04:00 committed by Richard Henderson
parent b1311c4acf
commit 26689780f8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/exec/gen-icount.h
View File

@ -6,13 +6,12 @@
/* Helpers for instruction counting code generation. */ /* Helpers for instruction counting code generation. */
static int icount_start_insn_idx; static int icount_start_insn_idx;
static TCGLabel *exitreq_label;
static inline void gen_tb_start(TranslationBlock *tb) static inline void gen_tb_start(TranslationBlock *tb)
{ {
TCGv_i32 count, imm; TCGv_i32 count, imm;
exitreq_label = gen_new_label(); tcg_ctx->exitreq_label = gen_new_label();
if (tb_cflags(tb) & CF_USE_ICOUNT) { if (tb_cflags(tb) & CF_USE_ICOUNT) {
count = tcg_temp_local_new_i32(); count = tcg_temp_local_new_i32();
} else { } else {
@ -34,7 +33,7 @@ static inline void gen_tb_start(TranslationBlock *tb)
tcg_temp_free_i32(imm); tcg_temp_free_i32(imm);
} }
tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, exitreq_label); tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, tcg_ctx->exitreq_label);
if (tb_cflags(tb) & CF_USE_ICOUNT) { if (tb_cflags(tb) & CF_USE_ICOUNT) {
tcg_gen_st16_i32(count, tcg_ctx->tcg_env, tcg_gen_st16_i32(count, tcg_ctx->tcg_env,
@ -52,7 +51,7 @@ static inline void gen_tb_end(TranslationBlock *tb, int num_insns)
tcg_set_insn_param(icount_start_insn_idx, 1, num_insns); tcg_set_insn_param(icount_start_insn_idx, 1, num_insns);
} }
gen_set_label(exitreq_label); gen_set_label(tcg_ctx->exitreq_label);
tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED); tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED);
/* Terminate the linked list. */ /* Terminate the linked list. */

2
tcg/tcg.h
View File

@ -675,6 +675,8 @@ struct TCGContext {
struct TCGLabelPoolData *pool_labels; struct TCGLabelPoolData *pool_labels;
#endif #endif
TCGLabel *exitreq_label;
TCGTempSet free_temps[TCG_TYPE_COUNT * 2]; TCGTempSet free_temps[TCG_TYPE_COUNT * 2];
TCGTemp temps[TCG_MAX_TEMPS]; /* globals first, temps after */ TCGTemp temps[TCG_MAX_TEMPS]; /* globals first, temps after */