[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v11 07/23] cpu-exec: allow temporary disabling i
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v11 07/23] cpu-exec: allow temporary disabling icount |
Date: |
Mon, 27 Apr 2015 10:32:51 +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 8f93df7..f728b4c 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -227,7 +227,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;
@@ -243,7 +243,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);
@@ -548,7 +549,7 @@ int cpu_exec(CPUArchState *env)
if (insns_left > 0) {
/* Execute remaining instructions. */
tb = (TranslationBlock *)(next_tb &
~TB_EXIT_MASK);
- 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 e7c3328..e771762 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -150,6 +150,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 1e02ae5..0957ce1 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);
- [Qemu-devel] [RFC PATCH v11 00/23] Deterministic replay core, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 01/23] i386: partial revert of interrupt poll fix, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 02/23] replay: global variables and function stubs, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 03/23] sysemu: system functions for replay, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 04/23] replay: internal functions for replay log, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 05/23] replay: introduce mutex to protect the replay log, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 06/23] replay: introduce icount event, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 07/23] cpu-exec: allow temporary disabling icount,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v11 08/23] cpu: replay instructions sequence, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 09/23] i386: interrupt poll processing, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 10/23] replay: interrupts and exceptions, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 11/23] replay: asynchronous events infrastructure, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 12/23] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 13/23] replay: shutdown event, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 14/23] replay: checkpoints, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 15/23] aio: replace stack of bottom halves with queue, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 16/23] replay: bottom halves, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 17/23] replay: replay aio requests, Pavel Dovgalyuk, 2015/04/27