Module Name: src
Committed By: simonb
Date: Mon Apr 5 07:28:19 UTC 2021
Modified Files:
src/sys/arch/mips/include: mips_opcode.h
src/sys/arch/mips/mips: db_disasm.c
Log Message:
Some QED instructions are included in MIPS32 and MIPS64 instruction sets.
Update a few comments.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/include/mips_opcode.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mips/mips/db_disasm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/mips_opcode.h
diff -u src/sys/arch/mips/include/mips_opcode.h:1.25 src/sys/arch/mips/include/mips_opcode.h:1.26
--- src/sys/arch/mips/include/mips_opcode.h:1.25 Mon Apr 5 07:00:06 2021
+++ src/sys/arch/mips/include/mips_opcode.h Mon Apr 5 07:28:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_opcode.h,v 1.25 2021/04/05 07:00:06 simonb Exp $ */
+/* $NetBSD: mips_opcode.h,v 1.26 2021/04/05 07:28:19 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -169,7 +169,7 @@ typedef union {
#define OP_LDL 032 /* MIPS-II, for r4000 port */
#define OP_LDR 033 /* MIPS-II, for r4000 port */
-#define OP_SPECIAL2 034 /* QED opcodes */
+#define OP_SPECIAL2 034 /* QED and MIPS32/MIPS64 opcodes */
#define OP_JALX 035
#define OP_MDMX 036
#define OP_SPECIAL3 037
@@ -303,9 +303,9 @@ typedef union {
/*
* Values for the 'func' field when 'op' == OP_SPECIAL2.
*/
-#define OP_MADD 000 /* QED */
-#define OP_MADDU 001 /* QED */
-#define OP_MUL 002 /* QED */
+#define OP_MADD 000 /* QED, MIPS32/64 */
+#define OP_MADDU 001 /* QED, MIPS32/64 */
+#define OP_MUL 002 /* QED, MIPS32/64 */
#define OP_CVM_DMUL 003 /* OCTEON */
#define OP_MSUB 004 /* MIPS32/64 */
#define OP_MSUBU 005 /* MIPS32/64 */
Index: src/sys/arch/mips/mips/db_disasm.c
diff -u src/sys/arch/mips/mips/db_disasm.c:1.39 src/sys/arch/mips/mips/db_disasm.c:1.40
--- src/sys/arch/mips/mips/db_disasm.c:1.39 Mon Apr 5 07:27:11 2021
+++ src/sys/arch/mips/mips/db_disasm.c Mon Apr 5 07:28:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.39 2021/04/05 07:27:11 simonb Exp $ */
+/* $NetBSD: db_disasm.c,v 1.40 2021/04/05 07:28:19 simonb Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.39 2021/04/05 07:27:11 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.40 2021/04/05 07:28:19 simonb Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -80,7 +80,7 @@ static const char * const spec_name[64]
/*56 */ "dsll","spec71","dsrl","dsra","dsll32","spec75","dsrl32","dsra32"
};
-static const char * const spec2_name[64] = { /* QED RM4650, R5000, etc. */
+static const char * const spec2_name[64] = { /* QED, MIPS32/64, etc. */
[OP_MADD] = "madd",
[OP_MADDU] = "maddu",
[OP_MUL] = "mul",
