Module Name: src
Committed By: matt
Date: Fri Aug 20 03:21:42 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mipsX_subr.S
Log Message:
Save and restore TLB_HI in cpu_switch_resume
To generate a diff of this commit:
cvs rdiff -u -r1.26.36.1.2.34 -r1.26.36.1.2.35 \
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.34 src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.35
--- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.34 Thu Aug 19 07:21:37 2010
+++ src/sys/arch/mips/mips/mipsX_subr.S Fri Aug 20 03:21:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.34 2010/08/19 07:21:37 matt Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.35 2010/08/20 03:21:41 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -2171,6 +2171,7 @@
PANIC("USPACE sat on odd page boundary")
MIPSX(entry0):
+ _MFC0 t3, MIPS_COP_0_TLB_HI # save TLB_HI
_MTC0 v0, MIPS_COP_0_TLB_HI # VPN = va
COP0_SYNC
nop
@@ -2219,6 +2220,10 @@
COP0_SYNC
nop
nop
+ _MTC0 t3, MIPS_COP_0_TLB_HI # restore TLB_HI
+ COP0_SYNC
+ nop
+ nop
MIPSX(resume):
#endif /* !ENABLE_MIPS_16KB_PAGE || VMSWAP_UAREA */
