aboutsummaryrefslogtreecommitdiff
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorPavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>2014-12-08 10:53:17 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2014-12-15 12:21:02 +0100
commit626cf8f4c6157ed133f0daa89b90d4169060bc97 (patch)
tree23512ce2d0b23dbed95062559c7f5fef6029c8cf /cpu-exec.c
parente511b4d783c47a32420da802104cfb0eb974b22f (diff)
downloadqemu-626cf8f4c6157ed133f0daa89b90d4169060bc97.zip
qemu-626cf8f4c6157ed133f0daa89b90d4169060bc97.tar.gz
qemu-626cf8f4c6157ed133f0daa89b90d4169060bc97.tar.bz2
icount: set can_do_io outside TB execution
This patch sets can_do_io function to allow reading icount within cpu-exec, but outside TB execution. Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 4df9856..cce80f0 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -168,7 +168,9 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr)
}
#endif /* DEBUG_DISAS */
+ cpu->can_do_io = 0;
next_tb = tcg_qemu_tb_exec(env, tb_ptr);
+ cpu->can_do_io = 1;
trace_exec_tb_exit((void *) (next_tb & ~TB_EXIT_MASK),
next_tb & TB_EXIT_MASK);
@@ -543,6 +545,7 @@ int cpu_exec(CPUArchState *env)
cpu = current_cpu;
env = cpu->env_ptr;
cc = CPU_GET_CLASS(cpu);
+ cpu->can_do_io = 1;
#ifdef TARGET_I386
x86_cpu = X86_CPU(cpu);
#endif