 @@ -1,14 +1,14 @@
-/* $NetBSD: db_machdep.c,v 1.37 2021/03/09 16:44:27 ryo Exp $ */
+/* $NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.37 2021/03/09 16:44:27 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/lwp.h>
 #include <sys/intr.h>
 #include <uvm/uvm.h>
 @@ -689,97 +689,114 @@ aarch64_set_wcr_wvr(int n, uint64_t wcr,
 	case 15:	DBG_WCR_WVR_SET(15, wcr, wvr);	break;
+	}
+}
 void
 aarch64_breakpoint_set(int n, vaddr_t addr)
+{
 	uint64_t bcr, bvr;
 	if (addr == 0) {
 		bvr = 0;
 		bcr = 0;
 	} else {
-		bvr = addr;
+		bvr = addr & DBGBVR_MASK;
 		bcr =
 		    __SHIFTIN(0, DBGBCR_BT) |
 		    __SHIFTIN(0, DBGBCR_LBN) |
 		    __SHIFTIN(0, DBGBCR_SSC) |
 		    __SHIFTIN(0, DBGBCR_HMC) |
 		    __SHIFTIN(15, DBGBCR_BAS) |
 		    __SHIFTIN(3, DBGBCR_PMC) |
 		    __SHIFTIN(1, DBGBCR_E);
+	}
 	aarch64_set_bcr_bvr(n, bcr, bvr);
+}
 void
-aarch64_watchpoint_set(int n, vaddr_t addr, int size, int accesstype)
+aarch64_watchpoint_set(int n, vaddr_t addr, u_int size, u_int accesstype)
+{
 	uint64_t wvr, wcr;
 	uint32_t matchbytebit;
 	KASSERT(size <= 8);
 	if (size > 8)
 		size = 8;
-	/* BAS must be all of whose set bits are contiguous */
+	/*
 	 * It is always watched in 8byte units, and
 	 * BAS is a bit field of byte offset in 8byte units.
 	 */
 	matchbytebit = 0xff >> (8 - size);
 	matchbytebit <<= (addr & 7);
 	addr &= ~7UL;
 	/* load, store, or both */
 	accesstype &= WATCHPOINT_ACCESS_MASK;
 	if (accesstype == 0)
 		accesstype = WATCHPOINT_ACCESS_LOADSTORE;
 	if (addr == 0) {
 		wvr = 0;
 		wcr = 0;
 	} else {
 		wvr = addr;
 		wcr =
 		    __SHIFTIN(0, DBGWCR_MASK) |		/* MASK: no mask */
 		    __SHIFTIN(0, DBGWCR_WT) |		/* WT: 0 */
 		    __SHIFTIN(0, DBGWCR_LBN) |		/* LBN: 0 */
 		    __SHIFTIN(0, DBGWCR_SSC) |		/* SSC: 00 */
 		    __SHIFTIN(0, DBGWCR_HMC) |		/* HMC: 0 */
 		    __SHIFTIN(matchbytebit, DBGWCR_BAS) | /* BAS: 0-8byte */
 		    __SHIFTIN(accesstype, DBGWCR_LSC) |	/* LSC: Load/Store */
 		    __SHIFTIN(3, DBGWCR_PAC) |		/* PAC: 11 */
 		    __SHIFTIN(1, DBGWCR_E);		/* Enable */
+	}
 	aarch64_set_wcr_wvr(n, wcr, wvr);
+}
-static void
+static int
 db_md_breakpoint_set(int n, vaddr_t addr)
+{
 	if (n >= __arraycount(breakpoint_buf))
-		return;
+		return -1;
 	if ((addr & 3) != 0) {
 		db_printf("address must be 4bytes aligned\n");
 		return -1;
+	}
 	breakpoint_buf[n].addr = addr;
 	return 0;
+}
-static void
+static int
-db_md_watchpoint_set(int n, vaddr_t addr, int size, int accesstype)
+db_md_watchpoint_set(int n, vaddr_t addr, u_int size, u_int accesstype)
+{
 	if (n >= __arraycount(watchpoint_buf))
-		return;
+		return -1;
 	if (size != 0 && ((addr) & ~7UL) != ((addr + size - 1) & ~7UL)) {
 		db_printf(
 		    "address and size must fit within a block of 8bytes\n");
 		return -1;
+	}
 	watchpoint_buf[n].addr = addr;
 	watchpoint_buf[n].size = size;
 	watchpoint_buf[n].accesstype = accesstype;
 	return 0;
+}
 static void
 db_md_breakwatchpoints_clear(void)
+{
 	int i;
 	for (i = 0; i <= max_breakpoint; i++)
 		aarch64_breakpoint_set(i, 0);
 	for (i = 0; i <= max_watchpoint; i++)
 		aarch64_watchpoint_set(i, 0, 0, 0);
+}
 @@ -883,87 +900,87 @@ show_watchpoints(void)
 				break;
+			}
 			db_printf("\n");
 			nused++;
+		}
+	}
 	db_printf("watchpoint used %d/%d\n", nused, max_watchpoint + 1);
+}
 void
 db_md_break_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
+{
-	int i;
+	int i, rc;
 	int added, cleared;
 	if (!have_addr) {
 		show_breakpoints();
 		return;
+	}
 	addr &= DBGBVR_MASK;
 	added = -1;
 	cleared = -1;
 	if (0 <= addr && addr <= max_breakpoint) {
 		i = addr;
 		if (breakpoint_buf[i].addr != 0) {
 			db_md_breakpoint_set(i, 0);
 			cleared = i;
+		}
 	} else {
 		for (i = 0; i <= max_breakpoint; i++) {
 			if (breakpoint_buf[i].addr == addr) {
 				db_md_breakpoint_set(i, 0);
 				cleared = i;
+			}
+		}
 		if (cleared == -1) {
 			for (i = 0; i <= max_breakpoint; i++) {
 				if (breakpoint_buf[i].addr == 0) {
-					db_md_breakpoint_set(i, addr);
+					rc = db_md_breakpoint_set(i, addr);
 					if (rc != 0)
 						return;
 					added = i;
 					break;
+				}
+			}
 			if (i > max_breakpoint) {
 				db_printf("no more available breakpoint\n");
+			}
+		}
+	}
 	if (added >= 0)
 		db_printf("add breakpoint %d as %016"DDB_EXPR_FMT"x\n",
 		    added, addr);
 	if (cleared >= 0)
 		db_printf("clear breakpoint %d\n", cleared);
 	show_breakpoints();
+}
 void
 db_md_watch_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
+{
-	int i;
+	int i, rc;
 	int added, cleared;
-	int accesstype, watchsize;
+	u_int accesstype, watchsize;
 	if (!have_addr) {
 		show_watchpoints();
 		return;
+	}
 	addr &= DBGWVR_MASK;
 	accesstype = watchsize = 0;
 	if ((modif != NULL) && (*modif != '\0')) {
 		int ch;
 		for (; *modif != '\0'; modif++) {
 			ch = *modif;
 			switch (ch) {
 			case '1':
 			case '2':
 			case '3':
 			case '4':
 			case '5':
 			case '6':
 @@ -993,28 +1010,30 @@ db_md_watch_cmd(db_expr_t addr, bool hav
 			db_md_watchpoint_set(i, 0, 0, 0);
 			cleared = i;
+		}
 	} else {
 		for (i = 0; i <= max_watchpoint; i++) {
 			if (watchpoint_buf[i].addr == addr) {
 				db_md_watchpoint_set(i, 0, 0, 0);
 				cleared = i;
+			}
+		}
 		if (cleared == -1) {
 			for (i = 0; i <= max_watchpoint; i++) {
 				if (watchpoint_buf[i].addr == 0) {
-					db_md_watchpoint_set(i, addr, watchsize,
+					rc = db_md_watchpoint_set(i, addr,
-					    accesstype);
+					    watchsize, accesstype);
 					if (rc != 0)
 						return;
 					added = i;
 					break;
+				}
+			}
 			if (i > max_watchpoint) {
 				db_printf("no more available watchpoint\n");
+			}
+		}
+	}
 	if (added >= 0)
 		db_printf("add watchpoint %d as %016"DDB_EXPR_FMT"x\n",
 		    added, addr);

 @@ -1,14 +1,14 @@
-/* $NetBSD: db_machdep.h,v 1.12 2021/03/09 16:44:27 ryo Exp $ */
+/* $NetBSD: db_machdep.h,v 1.13 2021/03/11 09:48:40 ryo Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -208,27 +208,27 @@ db_addr_t db_branch_taken(db_expr_t, db_
 #define inst_unconditional_flow_transfer(ins)	\
 	    db_inst_unconditional_flow_transfer(ins)
 #endif /* SOFTWARE_SSTEP */
 #define DB_MACHINE_COMMANDS
 void dump_trapframe(struct trapframe *, void (*)(const char *, ...));
 void dump_switchframe(struct trapframe *, void (*)(const char *, ...));
 const char *strdisasm(vaddr_t, uint64_t);
 void db_machdep_init(void);
 /* hardware breakpoint/watchpoint functions */
 void aarch64_breakpoint_set(int, vaddr_t);
-void aarch64_watchpoint_set(int, vaddr_t, int, int);
+void aarch64_watchpoint_set(int, vaddr_t, u_int, u_int);
 #define WATCHPOINT_ACCESS_LOAD		0x01
 #define WATCHPOINT_ACCESS_STORE		0x02
 #define WATCHPOINT_ACCESS_LOADSTORE	0x03
 #define WATCHPOINT_ACCESS_MASK		0x03
 #define DB_ELF_SYMBOLS
 #elif defined(__arm__)
 #include <arm/db_machdep.h>
 #endif