From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KERIw-0006U6-3u for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:05:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KERIo-0006Mm-FS for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:05:01 -0400 Received: from [199.232.76.173] (port=33017 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KERIo-0006MU-3m for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:04:58 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:19225) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KERIl-0002F8-Kg for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:04:57 -0400 Received: from mail2.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m63G4n5D005368 for ; Thu, 3 Jul 2008 18:04:49 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m63G4ni1022038 for ; Thu, 3 Jul 2008 18:04:49 +0200 Resent-To: qemu-devel@nongnu.org Resent-Message-Id: <486CF8A1.4000401@siemens.com> Message-ID: <486CF801.5090309@siemens.com> Date: Thu, 03 Jul 2008 18:02:09 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <486CF559.5090805@siemens.com> In-Reply-To: <486CF559.5090805@siemens.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 10/13] Introduce BP_WATCHPOINT_HIT flag Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- cpu-all.h | 1 + cpu-exec.c | 11 +++++++++++ exec.c | 31 ++++++++++++++++++------------- 3 files changed, 30 insertions(+), 13 deletions(-) Index: b/cpu-all.h =================================================================== --- a/cpu-all.h +++ b/cpu-all.h @@ -804,6 +804,7 @@ void cpu_reset_interrupt(CPUState *env, #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, Index: b/cpu-exec.c =================================================================== --- a/cpu-exec.c +++ b/cpu-exec.c @@ -232,6 +232,15 @@ static inline TranslationBlock *tb_find_ 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) @@ -286,6 +295,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 Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -1272,7 +1272,7 @@ int cpu_watchpoint_remove(CPUState *env, 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; } @@ -2396,19 +2396,24 @@ static void check_watchpoint(int offset, for (wp = env->watchpoints; wp != NULL; wp = wp->next) { if ((vaddr == (wp->vaddr & len_mask) || (vaddr & wp->len_mask) == wp->vaddr) && (wp->flags & flags)) { - 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); + 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_restore_state(tb, env, env->mem_io_pc, NULL); + tb_phys_invalidate(tb, -1); + if (wp->flags & BP_STOP_BEFORE_ACCESS) + env->exception_index = EXCP_DEBUG; + else + env->next_cflags = 1; + cpu_resume_from_signal(env, NULL); } - cpu_restore_state(tb, env, env->mem_io_pc, NULL); - tb_phys_invalidate(tb, -1); - if (wp->flags & BP_STOP_BEFORE_ACCESS) - env->exception_index = EXCP_DEBUG; - else - env->next_cflags = 1; - cpu_resume_from_signal(env, NULL); + } else { + wp->flags &= ~BP_WATCHPOINT_HIT; } } }