From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L2XKg-00025c-GI for qemu-devel@nongnu.org; Tue, 18 Nov 2008 15:37:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L2XKf-00025M-Ov for qemu-devel@nongnu.org; Tue, 18 Nov 2008 15:37:58 -0500 Received: from [199.232.76.173] (port=52640 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L2XKf-00025J-KA for qemu-devel@nongnu.org; Tue, 18 Nov 2008 15:37:57 -0500 Received: from savannah.gnu.org ([199.232.41.3]:56844 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L2XKf-0000hV-IG for qemu-devel@nongnu.org; Tue, 18 Nov 2008 15:37:57 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L2XKe-0000pM-EK for qemu-devel@nongnu.org; Tue, 18 Nov 2008 20:37:56 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L2XKe-0000pI-2q for qemu-devel@nongnu.org; Tue, 18 Nov 2008 20:37:56 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Tue, 18 Nov 2008 20:37:56 +0000 Subject: [Qemu-devel] [5744] Introduce BP_WATCHPOINT_HIT flag (Jan Kiszka) 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 Revision: 5744 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5744 Author: aliguori Date: 2008-11-18 20:37:55 +0000 (Tue, 18 Nov 2008) Log Message: ----------- 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 Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/cpu-all.h trunk/cpu-exec.c trunk/exec.c Modified: trunk/cpu-all.h =================================================================== --- trunk/cpu-all.h 2008-11-18 20:30:24 UTC (rev 5743) +++ trunk/cpu-all.h 2008-11-18 20:37:55 UTC (rev 5744) @@ -766,6 +766,7 @@ #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, Modified: trunk/cpu-exec.c =================================================================== --- trunk/cpu-exec.c 2008-11-18 20:30:24 UTC (rev 5743) +++ trunk/cpu-exec.c 2008-11-18 20:37:55 UTC (rev 5744) @@ -183,6 +183,15 @@ 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 @@ 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 Modified: trunk/exec.c =================================================================== --- trunk/exec.c 2008-11-18 20:30:24 UTC (rev 5743) +++ trunk/exec.c 2008-11-18 20:37:55 UTC (rev 5744) @@ -1340,7 +1340,7 @@ 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,21 +2519,26 @@ 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 { + cpu_get_tb_cpu_state(env, &pc, &cs_base, &cpu_flags); + tb_gen_code(env, pc, cs_base, cpu_flags, 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 { - cpu_get_tb_cpu_state(env, &pc, &cs_base, &cpu_flags); - tb_gen_code(env, pc, cs_base, cpu_flags, 1); - } - cpu_resume_from_signal(env, NULL); + } else { + wp->flags &= ~BP_WATCHPOINT_HIT; } } }