OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

icount: set can_do_io outside TB execution

Browse Source 
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>
This commit is contained in:
Pavel Dovgalyuk 2014-12-08 10:53:17 +03:00 committed by Paolo Bonzini
parent e511b4d783
commit 626cf8f4c6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu-exec.c
View File

@ -168,7 +168,9 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr)
} }
#endif /* DEBUG_DISAS */ #endif /* DEBUG_DISAS */
cpu->can_do_io = 0;
next_tb = tcg_qemu_tb_exec(env, tb_ptr); next_tb = tcg_qemu_tb_exec(env, tb_ptr);
cpu->can_do_io = 1;
trace_exec_tb_exit((void *) (next_tb & ~TB_EXIT_MASK), trace_exec_tb_exit((void *) (next_tb & ~TB_EXIT_MASK),
next_tb & TB_EXIT_MASK); next_tb & TB_EXIT_MASK);
@ -543,6 +545,7 @@ int cpu_exec(CPUArchState *env)
cpu = current_cpu; cpu = current_cpu;
env = cpu->env_ptr; env = cpu->env_ptr;
cc = CPU_GET_CLASS(cpu); cc = CPU_GET_CLASS(cpu);
cpu->can_do_io = 1;
#ifdef TARGET_I386 #ifdef TARGET_I386
x86_cpu = X86_CPU(cpu); x86_cpu = X86_CPU(cpu);
#endif #endif

3
cpus.c
View File

@ -935,6 +935,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
qemu_thread_get_self(cpu->thread); qemu_thread_get_self(cpu->thread);
cpu->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
cpu->exception_index = -1; cpu->exception_index = -1;
cpu->can_do_io = 1;
current_cpu = cpu; current_cpu = cpu;
r = kvm_init_vcpu(cpu); r = kvm_init_vcpu(cpu);
@ -976,6 +977,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
qemu_thread_get_self(cpu->thread); qemu_thread_get_self(cpu->thread);
cpu->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
cpu->exception_index = -1; cpu->exception_index = -1;
cpu->can_do_io = 1;
sigemptyset(&waitset); sigemptyset(&waitset);
sigaddset(&waitset, SIG_IPI); sigaddset(&waitset, SIG_IPI);
@ -1019,6 +1021,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
cpu->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
cpu->created = true; cpu->created = true;
cpu->exception_index = -1; cpu->exception_index = -1;
cpu->can_do_io = 1;
} }
qemu_cond_signal(&qemu_cpu_cond); qemu_cond_signal(&qemu_cpu_cond);