Module Name: src
Committed By: matt
Date: Thu Aug 18 21:04:24 UTC 2011
Modified Files:
src/sys/arch/arc/arc: minidebug.c
src/sys/arch/mips/include: mips_opcode.h
src/sys/arch/mips/mips: db_disasm.c db_interface.c mips_emul.c trap.c
Log Message:
Change bcond/BCOND to regimm/REGIMM to better match the MIPS nomenclature.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arc/arc/minidebug.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/include/mips_opcode.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mips/mips/db_disasm.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/mips/mips/db_interface.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mips/mips/mips_emul.c
cvs rdiff -u -r1.232 -r1.233 src/sys/arch/mips/mips/trap.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/arc/arc/minidebug.c
diff -u src/sys/arch/arc/arc/minidebug.c:1.20 src/sys/arch/arc/arc/minidebug.c:1.21
--- src/sys/arch/arc/arc/minidebug.c:1.20 Fri Nov 27 03:23:04 2009
+++ src/sys/arch/arc/arc/minidebug.c Thu Aug 18 21:04:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: minidebug.c,v 1.20 2009/11/27 03:23:04 rmind Exp $ */
+/* $NetBSD: minidebug.c,v 1.21 2011/08/18 21:04:23 matt Exp $ */
/* $OpenBSD: minidebug.c,v 1.2 1998/03/16 09:03:36 pefo Exp $ */
/*-
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: minidebug.c,v 1.20 2009/11/27 03:23:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: minidebug.c,v 1.21 2011/08/18 21:04:23 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@
/*56 */ "dsll","spec71","dsrl","dsra","dsll32","spec75","dsrl32","dsra32"
};
-static char *bcond_name[32] = {
+static char *regimm_name[32] = {
/* 0 */ "bltz", "bgez", "bltzl", "bgezl", "?", "?", "?", "?",
/* 8 */ "tgei", "tgeiu", "tlti", "tltiu", "teqi", "?", "tnei", "?",
/*16 */ "bltzal", "bgezal", "bltzall", "bgezall", "?", "?", "?", "?",
@@ -759,8 +759,8 @@
};
break;
- case OP_BCOND:
- printf("%s\t%s,", bcond_name[i.IType.rt],
+ case OP_REGIMM:
+ printf("%s\t%s,", regimm_name[i.IType.rt],
reg_name[i.IType.rs]);
goto pr_displ;
Index: src/sys/arch/mips/include/mips_opcode.h
diff -u src/sys/arch/mips/include/mips_opcode.h:1.17 src/sys/arch/mips/include/mips_opcode.h:1.18
--- src/sys/arch/mips/include/mips_opcode.h:1.17 Wed Aug 17 06:59:28 2011
+++ src/sys/arch/mips/include/mips_opcode.h Thu Aug 18 21:04:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_opcode.h,v 1.17 2011/08/17 06:59:28 matt Exp $ */
+/* $NetBSD: mips_opcode.h,v 1.18 2011/08/18 21:04:23 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -115,7 +115,7 @@
* Values for the 'op' field.
*/
#define OP_SPECIAL 000
-#define OP_BCOND 001
+#define OP_REGIMM 001
#define OP_J 002
#define OP_JAL 003
#define OP_BEQ 004
@@ -275,7 +275,7 @@
#define OP_LX_LDX 8 /* ldx */
/*
- * Values for the 'func' field when 'op' == OP_BCOND.
+ * Values for the 'func' field when 'op' == OP_REGIMM.
*/
#define OP_BLTZ 000
#define OP_BGEZ 001
Index: src/sys/arch/mips/mips/db_disasm.c
diff -u src/sys/arch/mips/mips/db_disasm.c:1.23 src/sys/arch/mips/mips/db_disasm.c:1.24
--- src/sys/arch/mips/mips/db_disasm.c:1.23 Sun Jul 10 23:21:58 2011
+++ src/sys/arch/mips/mips/db_disasm.c Thu Aug 18 21:04:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.23 2011/07/10 23:21:58 matt Exp $ */
+/* $NetBSD: db_disasm.c,v 1.24 2011/08/18 21:04:23 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.23 2011/07/10 23:21:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.24 2011/08/18 21:04:23 matt Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -52,7 +52,7 @@
#include <ddb/db_sym.h>
static const char * const op_name[64] = {
-/* 0 */ "spec", "bcond","j", "jal", "beq", "bne", "blez", "bgtz",
+/* 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",
@@ -77,11 +77,11 @@
/* 0 */ "mad", "madu", "mul", "spec3"
};
-static const char * const bcond_name[32] = {
+static const char * const regimm_name[32] = {
/* 0 */ "bltz", "bgez", "bltzl", "bgezl", "?", "?", "?", "?",
/* 8 */ "tgei", "tgeiu", "tlti", "tltiu", "teqi", "?", "tnei", "?",
/*16 */ "bltzal", "bgezal", "bltzall", "bgezall", "?", "?", "?", "?",
-/*24 */ "?", "?", "?", "?", "?", "?", "?", "?",
+/*24 */ "?", "?", "?", "?", "bposge32", "?", "?", "?",
};
static const char * const cop1_name[64] = {
@@ -296,8 +296,8 @@
break;
- case OP_BCOND:
- db_printf("%s\t%s,", bcond_name[i.IType.rt],
+ case OP_REGIMM:
+ db_printf("%s\t%s,", regimm_name[i.IType.rt],
reg_name[i.IType.rs]);
goto pr_displ;
Index: src/sys/arch/mips/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.74 src/sys/arch/mips/mips/db_interface.c:1.75
--- src/sys/arch/mips/mips/db_interface.c:1.74 Fri Apr 29 22:14:35 2011
+++ src/sys/arch/mips/mips/db_interface.c Thu Aug 18 21:04:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.74 2011/04/29 22:14:35 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.75 2011/08/18 21:04:23 matt Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.74 2011/04/29 22:14:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.75 2011/08/18 21:04:23 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_cputype.h" /* which mips CPUs do we support? */
@@ -753,7 +753,7 @@
i.word = inst;
delslt = 0;
switch (i.JType.op) {
- case OP_BCOND:
+ case OP_REGIMM:
case OP_J:
case OP_JAL:
case OP_BEQ:
Index: src/sys/arch/mips/mips/mips_emul.c
diff -u src/sys/arch/mips/mips/mips_emul.c:1.24 src/sys/arch/mips/mips/mips_emul.c:1.25
--- src/sys/arch/mips/mips/mips_emul.c:1.24 Wed Aug 17 06:59:29 2011
+++ src/sys/arch/mips/mips/mips_emul.c Thu Aug 18 21:04:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_emul.c,v 1.24 2011/08/17 06:59:29 matt Exp $ */
+/* $NetBSD: mips_emul.c,v 1.25 2011/08/18 21:04:23 matt Exp $ */
/*
* Copyright (c) 1999 Shuichiro URATA. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.24 2011/08/17 06:59:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.25 2011/08/18 21:04:23 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@
__func__, "non-branch", inst.word, instpc);
break;
- case OP_BCOND:
+ case OP_REGIMM:
switch ((int)inst.IType.rt) {
case OP_BLTZ:
case OP_BLTZAL:
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.232 src/sys/arch/mips/mips/trap.c:1.233
--- src/sys/arch/mips/mips/trap.c:1.232 Tue Aug 16 06:58:15 2011
+++ src/sys/arch/mips/mips/trap.c Thu Aug 18 21:04:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.232 2011/08/16 06:58:15 matt Exp $ */
+/* $NetBSD: trap.c,v 1.233 2011/08/18 21:04:23 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.232 2011/08/16 06:58:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.233 2011/08/18 21:04:23 matt Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -1016,7 +1016,7 @@
}
break;
- case OP_BCOND:
+ case OP_REGIMM:
case OP_J:
case OP_JAL:
case OP_BEQ:
