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

Move debug exception handling out of cpu_exec

Browse Source 
To prepare splitting up KVM and TCG CPU entry/exit, move the debug
exception into cpus.c and invoke cpu_handle_debug_exception on return
from qemu_cpu_exec.

This also allows to clean up the debug request signaling: We can assign
the job of informing main-loop to qemu_system_debug_request and stop the
calling cpu directly in cpu_handle_debug_exception. That means a debug
stop will now only be signaled via debug_requested and not additionally
via vmstop_requested.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-02-07 12:19:17 +01:00 committed by Marcelo Tosatti
parent 8cf71710f0
commit 83f338f73e
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpu-exec.c
View File

@ -196,28 +196,6 @@ static inline TranslationBlock *tb_find_fast(void)
return tb; return tb;
} }
static CPUDebugExcpHandler *debug_excp_handler;
CPUDebugExcpHandler *cpu_set_debug_excp_handler(CPUDebugExcpHandler *handler)
{
CPUDebugExcpHandler *old_handler = debug_excp_handler;
debug_excp_handler = handler;
return old_handler;
}
static void cpu_handle_debug_exception(CPUState *env)
{
CPUWatchpoint *wp;
if (!env->watchpoint_hit)
QTAILQ_FOREACH(wp, &env->watchpoints, entry)
wp->flags &= ~BP_WATCHPOINT_HIT;
if (debug_excp_handler)
debug_excp_handler(env);
}
/* main execution loop */ /* main execution loop */
volatile sig_atomic_t exit_request; volatile sig_atomic_t exit_request;
@ -287,8 +265,6 @@ int cpu_exec(CPUState *env1)
if (env->exception_index >= EXCP_INTERRUPT) { if (env->exception_index >= EXCP_INTERRUPT) {
/* exit request from the cpu execution loop */ /* exit request from the cpu execution loop */
ret = env->exception_index; ret = env->exception_index;
if (ret == EXCP_DEBUG)
cpu_handle_debug_exception(env);
break; break;
} else { } else {
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)

35
cpus.c
View File

@ -165,10 +165,34 @@ static bool all_cpu_threads_idle(void)
return true; return true;
} }
static void cpu_debug_handler(CPUState *env) static CPUDebugExcpHandler *debug_excp_handler;
CPUDebugExcpHandler *cpu_set_debug_excp_handler(CPUDebugExcpHandler *handler)
{ {
CPUDebugExcpHandler *old_handler = debug_excp_handler;
debug_excp_handler = handler;
return old_handler;
}
static void cpu_handle_debug_exception(CPUState *env)
{
CPUWatchpoint *wp;
if (!env->watchpoint_hit) {
QTAILQ_FOREACH(wp, &env->watchpoints, entry) {
wp->flags &= ~BP_WATCHPOINT_HIT;
}
}
if (debug_excp_handler) {
debug_excp_handler(env);
}
gdb_set_stop_cpu(env); gdb_set_stop_cpu(env);
qemu_system_debug_request(); qemu_system_debug_request();
#ifdef CONFIG_IOTHREAD
env->stopped = 1;
#endif
} }
#ifdef CONFIG_LINUX #ifdef CONFIG_LINUX
@ -479,7 +503,6 @@ int qemu_init_main_loop(void)
return ret; return ret;
} }
#endif #endif
cpu_set_debug_excp_handler(cpu_debug_handler);
qemu_init_sigbus(); qemu_init_sigbus();
@ -653,8 +676,6 @@ int qemu_init_main_loop(void)
int ret; int ret;
sigset_t blocked_signals; sigset_t blocked_signals;
cpu_set_debug_excp_handler(cpu_debug_handler);
qemu_init_sigbus(); qemu_init_sigbus();
blocked_signals = block_io_signals(); blocked_signals = block_io_signals();
@ -808,7 +829,10 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
while (1) { while (1) {
if (cpu_can_run(env)) { if (cpu_can_run(env)) {
qemu_cpu_exec(env); r = qemu_cpu_exec(env);
if (r == EXCP_DEBUG) {
cpu_handle_debug_exception(env);
}
} }
qemu_kvm_wait_io_event(env); qemu_kvm_wait_io_event(env);
} }
@ -1076,6 +1100,7 @@ bool cpu_exec_all(void)
qemu_kvm_eat_signals(env); qemu_kvm_eat_signals(env);
} }
if (r == EXCP_DEBUG) { if (r == EXCP_DEBUG) {
cpu_handle_debug_exception(env);
break; break;
} }
} else if (env->stop) { } else if (env->stop) {

2
vl.c
View File

@ -1315,7 +1315,7 @@ void qemu_system_powerdown_request(void)
void qemu_system_debug_request(void) void qemu_system_debug_request(void)
{ {
debug_requested = 1; debug_requested = 1;
vm_stop(VMSTOP_DEBUG); qemu_notify_event();
} }
void qemu_system_vmstop_request(int reason) void qemu_system_vmstop_request(int reason)