[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v18 06/21] cpu-exec: allow temporary disabling icoun
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v18 06/21] cpu-exec: allow temporary disabling icount |
Date: |
Thu, 17 Sep 2015 19:23:59 +0300 |
User-agent: |
StGit/0.16 |
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 <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
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 b247a23..d88ea4f 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 */
@@ -577,7 +578,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 72d4012..21f4206 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 0b8b34b..5b3cf10 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -1039,7 +1039,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);
- [Qemu-devel] [PATCH v18 00/21] Deterministic replay core, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 01/21] i386: partial revert of interrupt poll fix, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 02/21] replay: global variables and function stubs, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 03/21] replay: internal functions for replay log, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 04/21] replay: introduce mutex to protect the replay log, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 05/21] replay: introduce icount event, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 06/21] cpu-exec: allow temporary disabling icount,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v18 07/21] cpu: replay instructions sequence, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 08/21] i386: interrupt poll processing, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 09/21] replay: interrupts and exceptions, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 10/21] replay: asynchronous events infrastructure, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 11/21] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 12/21] replay: shutdown event, Pavel Dovgalyuk, 2015/09/17
- [Qemu-devel] [PATCH v18 13/21] icount: improve counting for record/replay, Pavel Dovgalyuk, 2015/09/17