From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYrym-0001Y2-BZ for qemu-devel@nongnu.org; Mon, 07 Sep 2015 04:40:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYryl-0000Sg-Dj for qemu-devel@nongnu.org; Mon, 07 Sep 2015 04:40:44 -0400 Received: from mail.ispras.ru ([83.149.199.45]:52523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYryl-0000SV-5q for qemu-devel@nongnu.org; Mon, 07 Sep 2015 04:40:43 -0400 From: Pavel Dovgalyuk Date: Mon, 07 Sep 2015 11:40:42 +0300 Message-ID: <20150907084042.1664.89413.stgit@PASHA-ISP> In-Reply-To: <20150907084005.1664.19540.stgit@PASHA-ISP> References: <20150907084005.1664.19540.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v17 06/21] cpu-exec: allow temporary disabling icount List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, igor.rubinov@gmail.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, hines@cert.org, fred.konrad@greensocs.com This patch is required for deterministic replay to generate an exception by trying executing an instruction without changing icount. It adds new flag to TB for disabling icount while translating it. Signed-off-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk --- cpu-exec.c | 7 ++++--- include/exec/exec-all.h | 1 + translate-all.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 1f8046f..4bcd7a6 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -240,7 +240,7 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr) /* Execute the code without caching the generated code. An interpreter could be used if available. */ static void cpu_exec_nocache(CPUState *cpu, int max_cycles, - TranslationBlock *orig_tb) + TranslationBlock *orig_tb, bool ignore_icount) { TranslationBlock *tb; @@ -250,7 +250,8 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles, max_cycles = CF_COUNT_MASK; tb = tb_gen_code(cpu, orig_tb->pc, orig_tb->cs_base, orig_tb->flags, - max_cycles | CF_NOCACHE); + max_cycles | CF_NOCACHE + | (ignore_icount ? CF_IGNORE_ICOUNT : 0)); tb->orig_tb = tcg_ctx.tb_ctx.tb_invalidated_flag ? NULL : orig_tb; cpu->current_tb = tb; /* execute the generated code */ @@ -555,7 +556,7 @@ int cpu_exec(CPUState *cpu) if (insns_left > 0) { /* Execute remaining instructions. */ tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK); - cpu_exec_nocache(cpu, insns_left, tb); + cpu_exec_nocache(cpu, insns_left, tb, false); align_clocks(&sc, cpu); } cpu->exception_index = EXCP_INTERRUPT; diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index f500dff..878a16e 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -199,6 +199,7 @@ struct TranslationBlock { #define CF_LAST_IO 0x8000 /* Last insn may be an IO access. */ #define CF_NOCACHE 0x10000 /* To be freed after execution */ #define CF_USE_ICOUNT 0x20000 +#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */ void *tc_ptr; /* pointer to the translated code */ /* next matching tb for physical address. */ diff --git a/translate-all.c b/translate-all.c index 2a40530..c2ba423 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1007,7 +1007,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, int code_gen_size; phys_pc = get_page_addr_code(env, pc); - if (use_icount) { + if (use_icount && !(cflags & CF_IGNORE_ICOUNT)) { cflags |= CF_USE_ICOUNT; } tb = tb_alloc(pc);