Tue Nov 21 22:25:16 2023 UTC ()

pal_opname(): Make the static buffer for unknown PALcode ops large enough
to hold all possible values.
alpha_print_instruction(): Make this private if not-_KERNEL.


(thorpej)

diff -r1.19 -r1.20 src/sys/arch/alpha/alpha/db_disasm.c

--- src/sys/arch/alpha/alpha/db_disasm.c 2023/11/21 22:19:12	1.19
+++ src/sys/arch/alpha/alpha/db_disasm.c 2023/11/21 22:25:16	1.20

 @@ -1,14 +1,14 @@
-/* $NetBSD: db_disasm.c,v 1.19 2023/11/21 22:19:12 thorpej Exp $ */
+/* $NetBSD: db_disasm.c,v 1.20 2023/11/21 22:25:16 thorpej Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 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"
 @@ -38,27 +38,27 @@
  *	Christopher G. Demetriou, Carnegie Mellon University
+ *
  *	Jason R. Thorpe, Numerical Aerospace Simulation Facility,
  *	NASA Ames Research Center
+ *
  *	This code was derived exclusively from information available in
  *	"Alpha Architecture Reference Manual", Richard L. Sites ed.
  *	Digital Press, Burlington, MA 01803
  *	ISBN 1-55558-098-X, Order no. EY-L520E-DP
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.19 2023/11/21 22:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.20 2023/11/21 22:25:16 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <machine/db_machdep.h>
 #include <machine/alpha_instruction.h>
 #include <machine/pal.h>
 #include <ddb/db_access.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_output.h>
 #include <ddb/db_interface.h>
 @@ -181,35 +181,35 @@ static const struct tbl pal_op_tbl[] = {
 	{ "osf1_wrperfmon",	PAL_OSF1_wrperfmon },
 	{ "osf1_rdusp",		PAL_OSF1_rdusp },
 	{ "osf1_whami",		PAL_OSF1_whami },
 	{ "osf1_retsys",	PAL_OSF1_retsys },
 	{ "osf1_rti",		PAL_OSF1_rti },
 	{ "osf1_callsys",	PAL_OSF1_callsys },
 	{ NULL,			-1 },
 };
 static const char *
 pal_opname(int op)
+{
-	static char unk[8];
+	static char unk[11];
 	int i;
 	for (i = 0; pal_op_tbl[i].name != NULL; i++) {
 		if (pal_op_tbl[i].code == op)
 			return (pal_op_tbl[i].name);
+	}
-	snprintf(unk, sizeof(unk), "0x%x", op);
+	snprintf(unk, sizeof(unk), "0x%08x", op);
 	return (unk);
+}
 /* HW (PAL) instruction qualifiers, stright tables */
 static const char * const mXpr_name[8] = {
 	"", "/i", "/a", "/ai", "/p", "/pi", "/pa", "/pai"
 };
 static const char * const hwlds_name[8] = {
 	"", "/r", "/a", "/ar", "/p", "/p?r", "_l-c", "_l-c/?r"
 };
 /*
  * For this one we take the low nibble (valid values 0/2/9/b/d)
 @@ -803,26 +803,29 @@ insn_printf(struct alpha_print_instructi
 	} else {
 		db_vprintf(fmt, ap);
+	}
 	va_end(ap);
+}
 /*
  * Disassemble instruction at 'loc'.  'altfmt' specifies an
  * (optional) alternate format.  Return address of start of
  * next instruction.
  */
 #ifndef _KERNEL
 static
 #endif
 int
 alpha_print_instruction(struct alpha_print_instruction_context *ctx)
+{
 	const char	*opcode;
 	long		signed_immediate;
 	bool		fstore;
 	pal_instruction	p;
 	fstore = false;
 	opcode = op_name[ctx->insn.mem_format.opcode];
 	/*
 	 *	Dispatch directly on the opcode, save code