[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 07/21] cpu-exec: allow temporary disabling icoun
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v16 07/21] cpu-exec: allow temporary disabling icount |
Date: |
Tue, 04 Aug 2015 11:44:29 +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 fd59a52..eef8288 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -237,7 +237,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;
target_ulong pc = orig_tb->pc;
@@ -252,7 +252,8 @@ static void cpu_exec_nocache(CPUState *cpu, 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);
@@ -556,7 +557,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 8080bb4..1daa3a5 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -152,6 +152,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 a45cd44..4c4c72a 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -1014,7 +1014,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 v16 00/21] Deterministic replay core, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 01/21] i386: partial revert of interrupt poll fix, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 02/21] replay: global variables and function stubs, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 03/21] sysemu: system functions for replay, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 04/21] replay: internal functions for replay log, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 05/21] replay: introduce mutex to protect the replay log, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 06/21] replay: introduce icount event, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 07/21] cpu-exec: allow temporary disabling icount,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v16 08/21] cpu: replay instructions sequence, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 09/21] i386: interrupt poll processing, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 10/21] replay: interrupts and exceptions, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 11/21] replay: asynchronous events infrastructure, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 12/21] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 18/21] replay: initialization and deinitialization, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 19/21] replay: replay blockers for devices, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 20/21] replay: command line options, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 21/21] replay: recording of the user input, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 15/21] bottom halves: introduce bh call function, Pavel Dovgalyuk, 2015/08/04