From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KAn9A-000563-Bz for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:35:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KAn99-000552-9c for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:35:55 -0400 Received: from [199.232.76.173] (port=57327 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KAn98-00054j-Qj for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:35:54 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:22799) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KAn97-0004sd-7X for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:35:53 -0400 Received: from mail1.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m5NEZnBX002430 for ; Mon, 23 Jun 2008 16:35:49 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail1.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m5NEZmce017912 for ; Mon, 23 Jun 2008 16:35:49 +0200 Resent-To: qemu-devel@nongnu.org Resent-Message-Id: <485FB4C4.1030204@siemens.com> Message-ID: <485FB320.5060406@siemens.com> Date: Mon, 23 Jun 2008 16:28:48 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <485FB18E.1090801@siemens.com> In-Reply-To: <485FB18E.1090801@siemens.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 8/15] Respect length of watchpoints 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 This adds length support for watchpoints. To keep things simple, only aligned watchpoints are accepted. Signed-off-by: Jan Kiszka --- cpu-defs.h | 2 +- exec.c | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -1145,14 +1145,19 @@ static void breakpoint_invalidate(CPUSta int cpu_watchpoint_insert(CPUState *env, target_ulong addr, target_ulong len, int flags, CPUWatchpoint **watchpoint) { + target_ulong len_mask = ~(len - 1); CPUWatchpoint *wp; + /* sanity checks: allow power-of-2 lengths, deny unaligned watchpoints */ + if ((len != 1 && len != 2 && len != 4) || (addr & ~len_mask)) + return -EINVAL; + wp = qemu_malloc(sizeof(*wp)); if (!wp) return -ENOBUFS; wp->vaddr = addr; - wp->len = len; + wp->len_mask = len_mask; wp->flags = flags; wp->next = env->watchpoints; @@ -1176,10 +1181,12 @@ int cpu_watchpoint_insert(CPUState *env, int cpu_watchpoint_remove(CPUState *env, target_ulong addr, target_ulong len, int flags) { + target_ulong len_mask = ~(len - 1); CPUWatchpoint *wp; for (wp = env->watchpoints; wp != NULL; wp = wp->next) { - if (addr == wp->vaddr && len == wp->len && flags == wp->flags) { + if (addr == wp->vaddr && len_mask == wp->len_mask + && flags == wp->flags) { cpu_watchpoint_remove_by_ref(env, wp); return 0; } @@ -2273,7 +2280,7 @@ static CPUWriteMemoryFunc *notdirty_mem_ }; /* Generate a debug exception if a watchpoint has been hit. */ -static void check_watchpoint(int offset, int flags) +static void check_watchpoint(int offset, int len_mask, int flags) { CPUState *env = cpu_single_env; target_ulong vaddr; @@ -2281,7 +2288,8 @@ static void check_watchpoint(int offset, vaddr = (env->mem_access_vaddr & TARGET_PAGE_MASK) + offset; for (wp = env->watchpoints; wp != NULL; wp = wp->next) { - if (vaddr == wp->vaddr && (wp->flags & flags)) { + 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; @@ -2294,40 +2302,40 @@ static void check_watchpoint(int offset, phys routines. */ static uint32_t watch_mem_readb(void *opaque, target_phys_addr_t addr) { - check_watchpoint(addr & ~TARGET_PAGE_MASK, BP_MEM_READ); + check_watchpoint(addr & ~TARGET_PAGE_MASK, ~0x0, BP_MEM_READ); return ldub_phys(addr); } static uint32_t watch_mem_readw(void *opaque, target_phys_addr_t addr) { - check_watchpoint(addr & ~TARGET_PAGE_MASK, BP_MEM_READ); + check_watchpoint(addr & ~TARGET_PAGE_MASK, ~0x1, BP_MEM_READ); return lduw_phys(addr); } static uint32_t watch_mem_readl(void *opaque, target_phys_addr_t addr) { - check_watchpoint(addr & ~TARGET_PAGE_MASK, BP_MEM_READ); + check_watchpoint(addr & ~TARGET_PAGE_MASK, ~0x3, BP_MEM_READ); return ldl_phys(addr); } static void watch_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { - check_watchpoint(addr & ~TARGET_PAGE_MASK, BP_MEM_WRITE); + check_watchpoint(addr & ~TARGET_PAGE_MASK, ~0x0, BP_MEM_WRITE); stb_phys(addr, val); } static void watch_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val) { - check_watchpoint(addr & ~TARGET_PAGE_MASK, BP_MEM_WRITE); + check_watchpoint(addr & ~TARGET_PAGE_MASK, ~0x1, BP_MEM_WRITE); stw_phys(addr, val); } static void watch_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { - check_watchpoint(addr & ~TARGET_PAGE_MASK, BP_MEM_WRITE); + check_watchpoint(addr & ~TARGET_PAGE_MASK, ~0x3, BP_MEM_WRITE); stl_phys(addr, val); } Index: b/cpu-defs.h =================================================================== --- a/cpu-defs.h +++ b/cpu-defs.h @@ -136,7 +136,7 @@ typedef struct CPUBreakpoint { typedef struct CPUWatchpoint { target_ulong vaddr; - target_ulong len; + target_ulong len_mask; int flags; /* BP_* */ struct CPUWatchpoint *prev, *next; } CPUWatchpoint;