From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHZrk-00008i-6c for qemu-devel@nongnu.org; Fri, 08 Jan 2016 11:26:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHZrf-00086m-VS for qemu-devel@nongnu.org; Fri, 08 Jan 2016 11:26:16 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHZrf-00086g-Qv for qemu-devel@nongnu.org; Fri, 08 Jan 2016 11:26:11 -0500 Received: by mail-pf0-x242.google.com with SMTP id 65so887402pff.2 for ; Fri, 08 Jan 2016 08:26:11 -0800 (PST) From: "Edgar E. Iglesias" Date: Fri, 8 Jan 2016 17:25:56 +0100 Message-Id: <1452270356-26373-3-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1452270356-26373-1-git-send-email-edgar.iglesias@gmail.com> References: <1452270356-26373-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [RFC 2/2] gen-icount: Use tcg_set_insn_param List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, rth@twiddle.net From: "Edgar E. Iglesias" Use tcg_set_insn_param() instead of directly accessing internal tcg data structures to update an insn param. Signed-off-by: Edgar E. Iglesias --- include/exec/gen-icount.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 05d89d3..a011324 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -5,14 +5,13 @@ /* Helpers for instruction counting code generation. */ -static TCGArg *icount_arg; +static int icount_start_insn_idx; static TCGLabel *icount_label; static TCGLabel *exitreq_label; static inline void gen_tb_start(TranslationBlock *tb) { TCGv_i32 count, flag, imm; - int i; exitreq_label = gen_new_label(); flag = tcg_temp_new_i32(); @@ -31,13 +30,12 @@ static inline void gen_tb_start(TranslationBlock *tb) -ENV_OFFSET + offsetof(CPUState, icount_decr.u32)); 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. */ + icount_start_insn_idx = tcg_op_buf_count(); tcg_gen_movi_i32(imm, 0xdeadbeef); - /* This is a horrid hack to allow fixing up the value later. */ - i = tcg_ctx.gen_last_op_idx; - i = tcg_ctx.gen_op_buf[i].args; - icount_arg = &tcg_ctx.gen_opparam_buf[i + 1]; - tcg_gen_sub_i32(count, count, imm); tcg_temp_free_i32(imm); @@ -53,7 +51,9 @@ static void gen_tb_end(TranslationBlock *tb, int num_insns) tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED); if (tb->cflags & CF_USE_ICOUNT) { - *icount_arg = num_insns; + /* Update the num_insn immediate parameter now that we know + * the actual insn count. */ + tcg_set_insn_param(icount_start_insn_idx, 1, num_insns); gen_set_label(icount_label); tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_ICOUNT_EXPIRED); } -- 1.9.1