 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_disasm.c,v 1.42 2021/04/12 11:35:22 simonb Exp $	*/
+/*	$NetBSD: db_disasm.c,v 1.43 2021/05/23 23:22:55 dholland Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * 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.
 @@ -25,38 +25,39 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	from: @(#)kadb.c	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.42 2021/04/12 11:35:22 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.43 2021/05/23 23:22:55 dholland Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/systm.h>
 #include <mips/locore.h>
 #include <mips/mips_opcode.h>
 #include <mips/reg.h>
 #include <machine/db_machdep.h>
 #include <ddb/db_access.h>
 #include <ddb/db_user.h>
 #include <ddb/db_interface.h>
 #include <ddb/db_output.h>
 #include <ddb/db_extern.h>
 #include <ddb/db_sym.h>
 static const char * const op_name[64] = {
 /* 0 */ "spec", "regimm","j",	"jal",	"beq",	"bne",	"blez", "bgtz",
 /* 8 */ "addi", "addiu","slti", "sltiu","andi", "ori",	"xori", "lui",
 /*16 */ "cop0", "cop1", "cop2", "cop3", "beql", "bnel", "blezl","bgtzl",
 /*24 */ "daddi","daddiu","ldl", "ldr",	"op34", "op35", "op36", "op37",
 /*32 */ "lb",	"lh",	"lwl",	"lw",	"lbu",	"lhu",	"lwr",	"lwu",
 /*40 */ "sb",	"sh",	"swl",	"sw",	"sdl",	"sdr",	"swr",	"cache",
 @@ -208,53 +209,43 @@ static const char * const c0_reg[32] = {
 };
 static void print_addr(db_addr_t);
 /*
  * Disassemble instruction at 'loc'.  'altfmt' specifies an
  * (optional) alternate format (altfmt for vax: don't assume
  * that each external label is a procedure entry mask).
  * Return address of start of next instruction.
  * Since this function is used by 'examine' and by 'step'
  * "next instruction" does NOT mean the next instruction to
  * be executed but the 'linear' next instruction.
  */
 #ifdef _LP64
 #define	DISASM_KERN_START	MIPS_XKSEG_START
 #else
 #define	DISASM_KERN_START	MIPS_KSEG0_START
 #endif
 db_addr_t
 db_disasm(db_addr_t loc, bool altfmt)
+{
 	uint32_t instr;
 	/*
 	 * Take some care with addresses to not UTLB here as it
 	 * loses the current debugging context.  KSEG2 and XKSEG
 	 * are not checked.
 	 * Update: db_read_bytes is supposed to do that, and now
 	 * does, so we can use that.
+	 *
 	 * XXX db_read_bytes_can't return failure but instead zeros
 	 * the output. That's ok here, but if ever improved the
 	 * proper thing here on error is to return the original loc.
 	 */
-	if (loc < (db_addr_t)DISASM_KERN_START) {
+	db_read_bytes(loc, sizeof(instr), (void *)&instr);
 #ifdef _KERNEL
 		if (ufetch_32((void *)loc, &instr) != 0) {
 			db_printf("invalid address.\n");
 			return loc;
 #else
 		return loc;
 #endif
 	} else {
 		instr =  *(uint32_t *)loc;
 	return (db_disasm_insn(instr, loc, altfmt));
+}
 /*
  * Disassemble instruction 'insn' nominally at 'loc'.
  * 'loc' may in fact contain a breakpoint instruction.
  */
 db_addr_t
 db_disasm_insn(int insn, db_addr_t loc, bool altfmt)
+{
 	bool bdslot = false;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_interface.c,v 1.93 2021/04/12 02:23:41 mrg Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.94 2021/05/23 23:22:55 dholland Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -17,27 +17,27 @@
+ *
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.93 2021/04/12 02:23:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.94 2021/05/23 23:22:55 dholland Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
 #include "opt_cputype.h"	/* which mips CPUs do we support? */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #endif
 #define __PMAP_PRIVATE
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
 @@ -170,51 +170,80 @@ cpu_Debugger(void)
+{
 	__asm("break");
+}
 #endif	/* !KGDB */
 /*
  * Read bytes from kernel address space for debugger.
  */
 void
 db_read_bytes(vaddr_t addr, size_t size, char *data)
+{
 	const char *src = (char *)addr;
 	int err;
 	/*
 	 * If asked to fetch from userspace, do it safely.
 	 * Note that MIPS_KSEG0_START is the proper address for
 	 * both 32-bit and 64-bit kernels.
 	 */
 	if (addr < (vaddr_t)MIPS_KSEG0_START) {
 		err = copyin(src, data, size);
 		if (err) {
 #ifdef DDB
 			db_printf("address %p is invalid\n", src);
 #endif
 			memset(data, 0, size);
+		}
 		return;
+	}
 	if (size <= 8 && (size & (size-1)) == 0 && (addr & (size-1)) == 0
 	    && ((uintptr_t)data & (size-1)) == 0) {
 		if (size == sizeof(uint8_t))
 			*(uint8_t *)data = *(const uint8_t *)src;
 		else if (size == sizeof(uint16_t))
 			*(uint16_t *)data = *(const uint16_t *)src;
 		else if (size == sizeof(uint32_t))
 			*(uint32_t *)data = *(const uint32_t *)src;
 		else
 			*(uint64_t *)data = *(const uint64_t *)src;
 		return;
+	}
 	while (size--)
 		*data++ = *src++;
+}
 /*
  * Write bytes to kernel address space for debugger.
  */
 void
 db_write_bytes(vaddr_t addr, size_t size, const char *data)
+{
 	char *p = (char *)addr;
 	size_t n = size;
 	int err;
 	/* If asked to fetch from userspace, do it safely */
 	if (addr < (vaddr_t)MIPS_KSEG0_START) {
 		err = copyout(data, p, size);
 		if (err) {
 #ifdef DDB
 			db_printf("address %p is invalid\n", p);
 #endif
+		}
 		return;
+	}
 	if (size <= 8 && (size & (size-1)) == 0 && (addr & (size-1)) == 0
 	    && ((uintptr_t)data & (size-1)) == 0) {
 		if (size == sizeof(uint8_t))
 			*(uint8_t *)p = *(const uint8_t *)data;
 		else if (size == sizeof(uint16_t))
 			*(uint16_t *)p = *(const uint16_t *)data;
 		else if (size == sizeof(uint32_t))
 			*(uint32_t *)p = *(const uint32_t *)data;
 		else
 			*(uint64_t *)p = *(const uint64_t *)data;
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_disasm.c,v 1.7 2021/05/01 06:48:51 skrll Exp $	*/
+/*	$NetBSD: db_disasm.c,v 1.8 2021/05/23 23:22:55 dholland 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.
 @@ -21,34 +21,35 @@
  * 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>
-__RCSID("$NetBSD: db_disasm.c,v 1.7 2021/05/01 06:48:51 skrll Exp $");
+__RCSID("$NetBSD: db_disasm.c,v 1.8 2021/05/23 23:22:55 dholland Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <riscv/db_machdep.h>
 #include <riscv/insn.h>
 #include <ddb/db_access.h>
 #include <ddb/db_user.h>
 #include <ddb/db_interface.h>
 #include <ddb/db_output.h>
 #include <ddb/db_extern.h>
 #include <ddb/db_sym.h>
 ////////////////////////////////////////////////////////////
 // registers
 static const char *riscv_registers[32] = {
 	"zero", "ra", "sp", "gp", "tp",
 	"t0", "t1", "t2",
 	"s0", "s1",
 @@ -1453,43 +1454,36 @@ db_disasm_unknown(const uint16_t *insn,
 		db_printf("%02x", insn[i]);
+	}
 	db_printf("\n");
+}
 db_addr_t
 db_disasm(db_addr_t loc, bool altfmt)
+{
 	/* instructions are up to 5 halfwords */
 	uint16_t insn[5];
 	unsigned n, i;
 	uint32_t insn32;
 #ifdef _KERNEL
 	if ((intptr_t) loc >= 0) {
 		db_printf("%s: %#"PRIxVADDR" is not a kernel address\n",
 		    __func__, loc);
 		return loc;
 #endif
 	/*
 	 * Fetch the instruction. The first halfword tells us how many
 	 * more there are, and they're always in little-endian order.
 	 */
-	insn[0] = ((const uint16_t *)loc)[0];
+	db_read_bytes(loc, sizeof(insn[0]), (void *)&insn[0]);
 	n = INSN_HALFWORDS(insn[0]);
 	KASSERT(n > 0 && n <= 5);
 	for (i = 1; i < n; i++) {
-		insn[i] = ((const uint16_t *)loc)[i];
+		db_read_bytes(loc + i * sizeof(insn[i]), sizeof(insn[i]),
 			      (void *)&insn[i]);
+	}
 	switch (n) {
 	    case 1:
 		if (db_disasm_16(loc, insn[0], altfmt) != 0) {
 			db_disasm_unknown(insn, n);
+		}
 		break;
 	    case 2:
 		insn32 = ((uint32_t)insn[1] << 16) | insn[0];
 		if (db_disasm_32(loc, insn32, altfmt) != 0) {
 			db_disasm_unknown(insn, n);
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_machdep.c,v 1.7 2021/04/14 06:32:20 dholland Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.8 2021/05/23 23:22:55 dholland 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.
 @@ -21,37 +21,38 @@
  * 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>
-__RCSID("$NetBSD: db_machdep.c,v 1.7 2021/04/14 06:32:20 dholland Exp $");
+__RCSID("$NetBSD: db_machdep.c,v 1.8 2021/05/23 23:22:55 dholland Exp $");
 #include <sys/param.h>
 #include <riscv/insn.h>
 #include <riscv/db_machdep.h>
 #include <ddb/db_access.h>
 #include <ddb/db_interface.h>
 #include <ddb/db_extern.h>
 #include <ddb/db_variables.h>
 #include <ddb/db_output.h>
 int db_active = 0;
 static int db_rw_ddbreg(const struct db_variable *, db_expr_t *, int);
 const struct db_variable db_regs[] = {
 	{ "ra", (void *)offsetof(struct trapframe, tf_ra), db_rw_ddbreg, NULL },
 	{ "sp", (void *)offsetof(struct trapframe, tf_sp), db_rw_ddbreg, NULL },
 	{ "gp", (void *)offsetof(struct trapframe, tf_gp), db_rw_ddbreg, NULL },
 	{ "tp", (void *)offsetof(struct trapframe, tf_tp), db_rw_ddbreg, NULL },
 	{ "s0", (void *)offsetof(struct trapframe, tf_s0), db_rw_ddbreg, NULL },
 	{ "s1", (void *)offsetof(struct trapframe, tf_s1), db_rw_ddbreg, NULL },
 	{ "s2", (void *)offsetof(struct trapframe, tf_s2), db_rw_ddbreg, NULL },
 @@ -215,39 +216,66 @@ branch_taken(uint32_t insn, db_addr_t pc
 	return pc + displacement;
+}
 db_addr_t
 next_instr_address(db_addr_t pc, bool bdslot_p)
+{
 	return pc + (bdslot_p ? 0 : 4);
+}
 void
 db_read_bytes(db_addr_t addr, size_t len, char *data)
+{
 	const char *src = (char *)addr;
 	int err;
 	/* If asked to fetch from userspace, do it safely */
 	if ((intptr_t)addr >= 0) {
 		err = copyin(src, data, len);
 		if (err) {
 #ifdef DDB
 			db_printf("address %p is invalid\n", src);
 #endif
 			memset(data, 0, len);
+		}
 		return;
+	}
 	while (len--) {
 		*data++ = *src++;
+	}
+}
 /*
  * Write bytes to kernel address space for debugger.
  */
 void
 db_write_bytes(vaddr_t addr, size_t len, const char *data)
+{
 	int err;
 	/* If asked to fetch from userspace, do it safely */
 	if ((intptr_t)addr >= 0) {
 		err = copyout(data, (char *)addr, len);
 		if (err) {
 #ifdef DDB
 			db_printf("address %p is invalid\n", (char *)addr);
 #endif
+		}
 		return;
+	}
 	if (len == 8) {
 		*(uint64_t *)addr = *(const uint64_t *) data;
 	} else if (len == 4) {
 		*(uint32_t *)addr = *(const uint32_t *) data;
 	} else if (len == 2) {
 		*(uint16_t *)addr = *(const uint16_t *) data;
 	} else {
 		KASSERT(len == 1);
 		*(uint8_t *)addr = *(const uint8_t *) data;
+	}
 	__asm("fence rw,rw; fence.i");
+}