[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v7 06/21] cpu-exec: allow temporary disabling ic
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v7 06/21] cpu-exec: allow temporary disabling icount |
Date: |
Mon, 12 Jan 2015 15:00:21 +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 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 b04ada1..c9abb55 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 v7 03/21] sysemu: system functions for replay, Pavel Dovgalyuk, 2015/01/12
[Qemu-devel] [RFC PATCH v7 04/21] replay: internal functions for replay log, Pavel Dovgalyuk, 2015/01/12
[Qemu-devel] [RFC PATCH v7 05/21] replay: introduce icount event, Pavel Dovgalyuk, 2015/01/12
[Qemu-devel] [RFC PATCH v7 07/21] cpu: replay instructions sequence, Pavel Dovgalyuk, 2015/01/12
[Qemu-devel] [RFC PATCH v7 06/21] cpu-exec: allow temporary disabling icount,
Pavel Dovgalyuk <=
[Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Pavel Dovgalyuk, 2015/01/12
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Paolo Bonzini, 2015/01/12
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Pavel Dovgaluk, 2015/01/12
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Paolo Bonzini, 2015/01/12
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Pavel Dovgaluk, 2015/01/14
- Message not available
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Paolo Bonzini, 2015/01/14
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Pavel Dovgaluk, 2015/01/14
- Message not available
- Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions, Paolo Bonzini, 2015/01/14
[Qemu-devel] [RFC PATCH v7 10/21] cpus: make icount warp deterministic in replay mode, Pavel Dovgalyuk, 2015/01/12