Module Name: src
Committed By: cliff
Date: Mon Nov 9 10:01:14 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mipsX_subr.S
Log Message:
- in cacheException, pass L1D_CACHE_ERROR_LOG and L1D_CACHE_INTERRUPT,
to the panic call
>>> TBD make this runtime, not ifdef switched per PRID
To generate a diff of this commit:
cvs rdiff -u -r1.26.36.1.2.9 -r1.26.36.1.2.10 \
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/mipsX_subr.S
diff -u 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.10
--- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.9 Sun Sep 13 03:31:05 2009
+++ src/sys/arch/mips/mips/mipsX_subr.S Mon Nov 9 10:01:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.9 2009/09/13 03:31:05 cliff Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.10 2009/11/09 10:01:14 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -1054,9 +1054,12 @@
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
+ li k1, 0x309 /* L1D_CACHE_ERROR_LOG */
+ .word 0x73660018 /* mfcr a2, k1 */
+ li k1, 0x30b /* L1D_CACHE_INTERRUPT */
+ .word 0x73670018 /* mfcr a3, k1 */
+ mfc0 a4, MIPS_COP_0_STATUS
+ mfc0 a5, MIPS_COP_0_CAUSE
#else
mfc0 a2, MIPS_COP_0_ECC
mfc0 a3, MIPS_COP_0_CACHE_ERR
@@ -1076,7 +1079,11 @@
eret
+#if defined(MIPS64_XLS)
+ MSG("cache error @ EPC %#x\nL1D_CACHE_ERROR_LOG %#lx\nL1D_CACHE_INTERRUPT %#lx\nstatus %#x, cause %#x");
+#else
MSG("cache error @ EPC 0x%x ErrCtl 0x%x CacheErr 0x%x");
+#endif
.set at
END(MIPSX(cacheException))
