From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEDUn-0000mP-2p for qemu-devel@nongnu.org; Thu, 22 Jan 2015 03:52:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEDUl-00059m-Nz for qemu-devel@nongnu.org; Thu, 22 Jan 2015 03:52:08 -0500 Received: from mail.ispras.ru ([83.149.199.45]:36325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEDUl-00059Q-Fx for qemu-devel@nongnu.org; Thu, 22 Jan 2015 03:52:07 -0500 From: Pavel Dovgalyuk Date: Thu, 22 Jan 2015 11:52:10 +0300 Message-ID: <20150122085210.5276.82002.stgit@PASHA-ISP.def.inno> In-Reply-To: <20150122085127.5276.53895.stgit@PASHA-ISP.def.inno> References: <20150122085127.5276.53895.stgit@PASHA-ISP.def.inno> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH v8 07/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: peter.maydell@linaro.org, peter.crosthwaite@xilinx.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, afaerber@suse.de, 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 0a485bb..49f01f5 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -200,7 +200,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(CPUArchState *env, int max_cycles, - TranslationBlock *orig_tb) + TranslationBlock *orig_tb, bool ignore_icount) { CPUState *cpu = ENV_GET_CPU(env); TranslationBlock *tb; @@ -216,7 +216,8 @@ static void cpu_exec_nocache(CPUArchState *env, int max_cycles, /* tb_gen_code can flush our orig_tb, invalidate it now */ tb_phys_invalidate(orig_tb, -1); tb = tb_gen_code(cpu, pc, cs_base, flags, - max_cycles | CF_NOCACHE); + max_cycles | CF_NOCACHE + | (ignore_icount ? CF_IGNORE_ICOUNT : 0)); cpu->current_tb = tb; /* execute the generated code */ trace_exec_tb_nocache(tb, tb->pc); @@ -525,7 +526,7 @@ int cpu_exec(CPUArchState *env) } else { if (insns_left > 0) { /* Execute remaining instructions. */ - cpu_exec_nocache(env, insns_left, tb); + cpu_exec_nocache(env, 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 63fb1a3..48a7541 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -148,6 +148,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 c0cba7d..49b3403 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1053,7 +1053,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);