[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/19] tcg: Use tcg_constant_i32 with icount expander
From: |
Richard Henderson |
Subject: |
[PATCH v3 04/19] tcg: Use tcg_constant_i32 with icount expander |
Date: |
Fri, 8 May 2020 08:17:32 -0700 |
We must do this before we adjust how tcg_out_movi_i32,
lest the under-the-hood poking that we do be broken.
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/gen-icount.h | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h
index 822c43cfd3..404732518a 100644
--- a/include/exec/gen-icount.h
+++ b/include/exec/gen-icount.h
@@ -34,7 +34,7 @@ static inline void gen_io_end(void)
static inline void gen_tb_start(TranslationBlock *tb)
{
- TCGv_i32 count, imm;
+ TCGv_i32 count;
tcg_ctx->exitreq_label = gen_new_label();
if (tb_cflags(tb) & CF_USE_ICOUNT) {
@@ -48,15 +48,13 @@ static inline void gen_tb_start(TranslationBlock *tb)
offsetof(ArchCPU, env));
if (tb_cflags(tb) & CF_USE_ICOUNT) {
- imm = tcg_temp_new_i32();
- /* We emit a movi with a dummy immediate argument. Keep the insn index
- * of the movi so that we later (when we know the actual insn count)
- * can update the immediate argument with the actual insn count. */
- tcg_gen_movi_i32(imm, 0xdeadbeef);
+ /*
+ * We emit a sub with a dummy immediate argument. Keep the insn index
+ * of the sub so that we later (when we know the actual insn count)
+ * can update the argument with the actual insn count.
+ */
+ tcg_gen_sub_i32(count, count, tcg_constant_i32(0));
icount_start_insn = tcg_last_op();
-
- tcg_gen_sub_i32(count, count, imm);
- tcg_temp_free_i32(imm);
}
tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, tcg_ctx->exitreq_label);
@@ -74,9 +72,12 @@ static inline void gen_tb_start(TranslationBlock *tb)
static inline void gen_tb_end(TranslationBlock *tb, int num_insns)
{
if (tb_cflags(tb) & CF_USE_ICOUNT) {
- /* Update the num_insn immediate parameter now that we know
- * the actual insn count. */
- tcg_set_insn_param(icount_start_insn, 1, num_insns);
+ /*
+ * Update the num_insn immediate parameter now that we know
+ * the actual insn count.
+ */
+ tcg_set_insn_param(icount_start_insn, 2,
+ tcgv_i32_arg(tcg_constant_i32(num_insns)));
}
gen_set_label(tcg_ctx->exitreq_label);
--
2.20.1
- [PATCH v3 00/19] tcg: Better handling of constants, Richard Henderson, 2020/05/08
- [PATCH v3 01/19] tcg: Consolidate 3 bits into enum TCGTempKind, Richard Henderson, 2020/05/08
- [PATCH v3 02/19] tcg: Add temp_readonly, Richard Henderson, 2020/05/08
- [PATCH v3 04/19] tcg: Use tcg_constant_i32 with icount expander,
Richard Henderson <=
- [PATCH v3 03/19] tcg: Introduce TYPE_CONST temporaries, Richard Henderson, 2020/05/08
- [PATCH v3 05/19] tcg: Use tcg_constant_{i32, i64} with tcg int expanders, Richard Henderson, 2020/05/08
- [PATCH v3 06/19] tcg: Use tcg_constant_{i32, vec} with tcg vec expanders, Richard Henderson, 2020/05/08
- [PATCH v3 07/19] tcg: Use tcg_constant_{i32, i64, vec} with tcg gvec expanders, Richard Henderson, 2020/05/08
- [PATCH v3 08/19] tcg: Use tcg_constant_{i32,i64} with tcg plugins, Richard Henderson, 2020/05/08
- [PATCH v3 10/19] tcg/optimize: Improve find_better_copy, Richard Henderson, 2020/05/08
- [PATCH v3 11/19] tcg/optimize: Adjust TempOptInfo allocation, Richard Henderson, 2020/05/08
- [PATCH v3 09/19] tcg: Rename struct tcg_temp_info to TempOptInfo, Richard Henderson, 2020/05/08
- [PATCH v3 13/19] tcg/tci: Add special tci_movi_{i32,i64} opcodes, Richard Henderson, 2020/05/08
- [PATCH v3 12/19] tcg/optimize: Use tcg_constant_internal with constant folding, Richard Henderson, 2020/05/08