Numeric modifiers conflict with the syntax interpretation of ddb, so use 'b', 'w', 'l', 'q' instead. Also, change load/store('l','s') to 'r','w' like the other arch. >db{0}> machine watch/1 hostname >Bad modifier >db{0}> machine watch/s1 hostname >add watchpoint 0 as ffffc00001087848

(ryo)

 @@ -1,14 +1,14 @@
-/* $NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $ */
+/* $NetBSD: db_machdep.c,v 1.39 2021/03/11 10:34:34 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.38 2021/03/11 09:48:40 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.39 2021/03/11 10:34:34 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>
 @@ -169,30 +169,31 @@ const struct db_command db_machine_comma
 	},
+	{
 		DDB_ADD_CMD(
 		    "ttbr", db_md_ttbr_cmd, 0,
 		    "Dump or count TTBR table",
 		    "[/apc] address | pid",
 		    "\taddress:\taddress of pmap to display\n"
 		    "\tpid:\t\tpid of pmap to display")
 	},
+	{
 		DDB_ADD_CMD(
 		    "watch", db_md_watch_cmd, 0,
 		    "set or clear watchpoint",
-		    "[/12345678] [address|#]",
+		    "[/rwbhlq] [address|#]",
 		    "\taddress: watchpoint address to set\n"
-		    "\t#: watchpoint number to remove"
+		    "\t#: watchpoint number to remove\n"
-		    "\t/1..8: size of data\n")
+		    "\t/rw: read or write access\n"
 		    "\t/bhlq: size of access\n")
 	},
+	{
 		DDB_ADD_CMD(
 		    "meminfo", db_md_meminfo_cmd, 0,
 		    "Dump info about memory ranges",
 		    NULL, NULL)
 	},
 #endif
+	{
 		DDB_END_CMD
 	},
 };
 @@ -968,40 +969,42 @@ db_md_watch_cmd(db_expr_t addr, bool hav
 	if (!have_addr) {
 		show_watchpoints();
 		return;
+	}
 	accesstype = watchsize = 0;
 	if ((modif != NULL) && (*modif != '\0')) {
 		int ch;
 		for (; *modif != '\0'; modif++) {
 			ch = *modif;
 			switch (ch) {
-			case '1':
+			case 'b':
-			case '2':
+				watchsize = 1;
-			case '3':
+				break;
-			case '4':
+			case 'h':
-			case '5':
+				watchsize = 2;
 			case '6':
 			case '7':
 			case '8':
 				watchsize = ch - '0';
 				break;
 			case 'l':
 				watchsize = 4;
 				break;
 			case 'q':
 				watchsize = 8;
 				break;
 			case 'r':
 				accesstype |= WATCHPOINT_ACCESS_LOAD;
 				break;
-			case 's':
+			case 'w':
 				accesstype |= WATCHPOINT_ACCESS_STORE;
 				break;
+			}
+		}
+	}
 	if (watchsize == 0)
 		watchsize = 4;	/* default: 4byte */
 	if (accesstype == 0)
 		accesstype = WATCHPOINT_ACCESS_LOADSTORE; /* default */
 	added = -1;
 	cleared = -1;
 	if (0 <= addr && addr <= max_watchpoint) {

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: ddb.4,v 1.198 2021/02/19 08:57:56 msaitoh Exp $
+.\"	$NetBSD: ddb.4,v 1.199 2021/03/11 10:34:34 ryo Exp $
 .\"
 .\" Copyright (c) 1997 - 2019 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Luke Mewburn
 .\"
 .\" 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.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -46,27 +46,27 @@
 .\" CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 .\" ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
 .\"
 .\" Carnegie Mellon requests users of this software to return to
 .\"
 .\"  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
 .\"  School of Computer Science
 .\"  Carnegie Mellon University
 .\"  Pittsburgh PA 15213-3890
 .\"
 .\" any improvements or extensions that they make and grant Carnegie Mellon
 .\" the rights to redistribute these changes.
 .\"
-.Dd February 19, 2021
+.Dd March 11, 2021
 .Dt DDB 4
 .Os
 .Sh NAME
 .Nm ddb
 .Nd in-kernel debugger
 .Sh SYNOPSIS
 .Cd options DDB
 .Pp
 To enable history editing:
 .Cd options DDB_HISTORY_SIZE=integer
 .Pp
 To disable entering
 .\" XXX: hack; .Nm automatically introduces newline in SYNOPSIS
 @@ -1007,64 +1007,58 @@ into the
 .Nx
 kernel for any given port can also add machine specific commands
 to the
 .Nm
 command parser.
 All of these commands are preceded by the command word
 .Em machine
 to indicate that they are part of the machine-specific command
 set (e.g.
 .Ic machine reboot ) .
 Some of these commands are:
 .Ss AARCH64
 .Bl -tag -width "traptrace" -compact
 .It Ic break
 Set or clear a hardware breakpoint.
 .It Ic cpu
 Switch to another CPU.
 .It Ic cpuinfo
 Print CPU information about the ``struct cpuinfo''.
 .It Ic frame
 Given a trap frame address, print out the trap frame.
 .It Ic lwp
 Print lwp information about the ``struct lwp''.
 .It Ic pte
 Print PTE information.
 .It Ic reset
 Reset the system.
 .It Ic sysreg
 Print system registers.
 .It Ic watch
 Set or clear a hardware watchpoint.
 Pass the address to be watched, or watchpoint number to clear the watchpoint.
 Optional modifiers are
-.Dq l
+.Dq r
-for load access,
+for read access,
-.Dq s
+.Dq w
-for store access,
+for write access (default: trap on read or write access),
-.Dq 1
+.Dq b
 for 8 bit width,
-.Dq 2
+.Dq h
 for 16 bit,
-.Dq 3
+.Dq l
-for 24 bit,
+for 32 bit or,
-.Dq 4
+.Dq q
-for 32 bit,
+for 64 bit (default: 32 bit).
 .Dq 5
 for 40 bit,
 .Dq 6
 for 48 bit,
 .Dq 7
 for 56 bit,
 .Dq 8
 for 64 bit.
 .El
 .Ss ALPHA
 .Bl -tag -width "traptrace" -compact
 .It Ic cpu
 Switch to another CPU.
 .\" .It Ic halt
 .\" Call the PROM monitor to halt the CPU.
 .\" .It Ic reboot
 .\" Call the PROM monitor to reboot the CPU.
 .El
 .Ss AMD64
 .Bl -tag -width "traptrace" -compact
 .It Ic cpu