From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KERIz-0006Xg-QT for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:05:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KERIu-0006RK-SD for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:05:06 -0400 Received: from [199.232.76.173] (port=33025 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KERIt-0006RG-CP for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:05:03 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:19228) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KERIs-0002GH-0K for qemu-devel@nongnu.org; Thu, 03 Jul 2008 12:05:03 -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 m63G4oDZ005381 for ; Thu, 3 Jul 2008 18:04:50 +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 m63G4oWT022052 for ; Thu, 3 Jul 2008 18:04:50 +0200 Resent-To: qemu-devel@nongnu.org Resent-Message-Id: <486CF8A2.7060308@siemens.com> Message-ID: <486CF79C.8080308@siemens.com> Date: Thu, 03 Jul 2008 18:00:28 +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 7/13] Restore pc on watchpoint hits 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 In order to provide accurate information about the triggering instruction, this patch adds the required bits to restore the pc if the access happened inside a TB. With the BP_STOP_BEFORE_ACCESS flag, the watchpoint user can control if the debug trap should be issued on or after the accessing instruction. In contrast to the earlier posted version, this one makes use of next_cflags to ensure that the next TB contains just a single instruction. Signed-off-by: Jan Kiszka --- cpu-all.h | 1 + exec.c | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -2385,16 +2385,34 @@ static CPUWriteMemoryFunc *notdirty_mem_ static void check_watchpoint(int offset, int len_mask, int flags) { CPUState *env = cpu_single_env; + TranslationBlock *tb; target_ulong vaddr; CPUWatchpoint *wp; + if (env->watchpoint_hit) { + /* We re-entered the check after replacing the TB. Now raise + * the debug interrupt so that is will trigger after the + * current instruction. */ + cpu_interrupt(env, CPU_INTERRUPT_DEBUG); + return; + } vaddr = (env->mem_io_vaddr & TARGET_PAGE_MASK) + 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; - cpu_interrupt(env, CPU_INTERRUPT_DEBUG); - break; + 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); } } } Index: b/cpu-all.h =================================================================== --- a/cpu-all.h +++ b/cpu-all.h @@ -803,6 +803,7 @@ void cpu_reset_interrupt(CPUState *env, #define BP_MEM_READ 0x01 #define BP_MEM_WRITE 0x02 #define BP_MEM_ACCESS (BP_MEM_READ | BP_MEM_WRITE) +#define BP_STOP_BEFORE_ACCESS 0x04 #define BP_GDB 0x10 int cpu_breakpoint_insert(CPUState *env, target_ulong pc, int flags,