Module Name: src
Committed By: cliff
Date: Sun Sep 13 03:31:05 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: db_interface.c mipsX_subr.S
Log Message:
CP0 ECC and CACHE_ERR "not implemented" on RMI XLS, so avoid accessing them
To generate a diff of this commit:
cvs rdiff -u -r1.64.16.4 -r1.64.16.5 src/sys/arch/mips/mips/db_interface.c
cvs rdiff -u -r1.26.36.1.2.8 -r1.26.36.1.2.9 \
src/sys/arch/mips/mips/mipsX_subr.S
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/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.64.16.4 src/sys/arch/mips/mips/db_interface.c:1.64.16.5
--- src/sys/arch/mips/mips/db_interface.c:1.64.16.4 Mon Sep 7 21:54:39 2009
+++ src/sys/arch/mips/mips/db_interface.c Sun Sep 13 03:31:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.64.16.4 2009/09/07 21:54:39 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.64.16.5 2009/09/13 03:31:05 cliff Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64.16.4 2009/09/07 21:54:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64.16.5 2009/09/13 03:31:05 cliff Exp $");
#include "opt_cputype.h" /* which mips CPUs do we support? */
#include "opt_ddb.h"
@@ -508,8 +508,10 @@
if (MIPS_HAS_LLSC) {
if (CPUISMIPS64) {
+#if !defined(MIPS64_XLS) /* CP0 reg #17 "reserved" */
SHOW64(MIPS_COP_0_LLADDR, "lladdr");
SHOW64(MIPS_COP_0_WATCH_LO, "watchlo");
+#endif
} else {
SHOW32(MIPS_COP_0_LLADDR, "lladdr");
SHOW32(MIPS_COP_0_WATCH_LO, "watchlo");
@@ -529,8 +531,10 @@
}
}
+#if !defined(MIPS64_XLS) /* CP0 ECC and CACHE_ERR "not implemented" */
SHOW32(MIPS_COP_0_ECC, "ecc");
SHOW32(MIPS_COP_0_CACHE_ERR, "cacherr");
+#endif
SHOW32(MIPS_COP_0_TAG_LO, "cachelo");
SHOW32(MIPS_COP_0_TAG_HI, "cachehi");
Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.8 src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.9
--- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.8 Tue Sep 8 00:51:14 2009
+++ src/sys/arch/mips/mips/mipsX_subr.S Sun Sep 13 03:31:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.8 2009/09/08 00:51:14 matt Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.9 2009/09/13 03:31:05 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -1053,8 +1053,14 @@
PTR_LA k0, panic # return to panic
PTR_LA a0, 9f # panicstr
_MFC0 a1, MIPS_COP_0_ERROR_PC
+#if defined(MIPS64_XLS)
+ # CP0 ECC and CACHE_ERR "not implemented"
+ move a2, $0
+ move a3, $0
+#else
mfc0 a2, MIPS_COP_0_ECC
mfc0 a3, MIPS_COP_0_CACHE_ERR
+#endif
_MTC0 k0, MIPS_COP_0_ERROR_PC # set return address
COP0_SYNC
