Introduce BP_WATCHPOINT_HIT flag (Jan Kiszka)
When one watchpoint is hit, others might have triggered as well. To support users of the watchpoint API which need to detect such cases, the BP_WATCHPOINT_HIT flag is introduced and maintained. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5744 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
880a757838
commit
6e140f28c6
@ -766,6 +766,7 @@ void cpu_reset_interrupt(CPUState *env, int mask);
|
||||
#define BP_MEM_WRITE 0x02
|
||||
#define BP_MEM_ACCESS (BP_MEM_READ | BP_MEM_WRITE)
|
||||
#define BP_STOP_BEFORE_ACCESS 0x04
|
||||
#define BP_WATCHPOINT_HIT 0x08
|
||||
#define BP_GDB 0x10
|
||||
|
||||
int cpu_breakpoint_insert(CPUState *env, target_ulong pc, int flags,
|
||||
|
11
cpu-exec.c
11
cpu-exec.c
@ -183,6 +183,15 @@ static inline TranslationBlock *tb_find_fast(void)
|
||||
return tb;
|
||||
}
|
||||
|
||||
static void cpu_handle_debug_exception(CPUState *env)
|
||||
{
|
||||
CPUWatchpoint *wp;
|
||||
|
||||
if (!env->watchpoint_hit)
|
||||
for (wp = env->watchpoints; wp != NULL; wp = wp->next)
|
||||
wp->flags &= ~BP_WATCHPOINT_HIT;
|
||||
}
|
||||
|
||||
/* main execution loop */
|
||||
|
||||
int cpu_exec(CPUState *env1)
|
||||
@ -237,6 +246,8 @@ int cpu_exec(CPUState *env1)
|
||||
if (env->exception_index >= EXCP_INTERRUPT) {
|
||||
/* exit request from the cpu execution loop */
|
||||
ret = env->exception_index;
|
||||
if (ret == EXCP_DEBUG)
|
||||
cpu_handle_debug_exception(env);
|
||||
break;
|
||||
} else if (env->user_mode_only) {
|
||||
/* if user mode only, we simulate a fake exception
|
||||
|
11
exec.c
11
exec.c
@ -1340,7 +1340,7 @@ int cpu_watchpoint_remove(CPUState *env, target_ulong addr, target_ulong len,
|
||||
|
||||
for (wp = env->watchpoints; wp != NULL; wp = wp->next) {
|
||||
if (addr == wp->vaddr && len_mask == wp->len_mask
|
||||
&& flags == wp->flags) {
|
||||
&& flags == (wp->flags & ~BP_WATCHPOINT_HIT)) {
|
||||
cpu_watchpoint_remove_by_ref(env, wp);
|
||||
return 0;
|
||||
}
|
||||
@ -2519,11 +2519,13 @@ static void check_watchpoint(int offset, int len_mask, int flags)
|
||||
for (wp = env->watchpoints; wp != NULL; wp = wp->next) {
|
||||
if ((vaddr == (wp->vaddr & len_mask) ||
|
||||
(vaddr & wp->len_mask) == wp->vaddr) && (wp->flags & flags)) {
|
||||
wp->flags |= BP_WATCHPOINT_HIT;
|
||||
if (!env->watchpoint_hit) {
|
||||
env->watchpoint_hit = wp;
|
||||
tb = tb_find_pc(env->mem_io_pc);
|
||||
if (!tb) {
|
||||
cpu_abort(env, "check_watchpoint: could not find TB for pc=%p",
|
||||
(void *)env->mem_io_pc);
|
||||
cpu_abort(env, "check_watchpoint: could not find TB for "
|
||||
"pc=%p", (void *)env->mem_io_pc);
|
||||
}
|
||||
cpu_restore_state(tb, env, env->mem_io_pc, NULL);
|
||||
tb_phys_invalidate(tb, -1);
|
||||
@ -2535,6 +2537,9 @@ static void check_watchpoint(int offset, int len_mask, int flags)
|
||||
}
|
||||
cpu_resume_from_signal(env, NULL);
|
||||
}
|
||||
} else {
|
||||
wp->flags &= ~BP_WATCHPOINT_HIT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user