Module Name: src
Committed By: matt
Date: Tue Mar 9 02:02:53 UTC 2010
Modified Files:
src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: machdep.c
Log Message:
Use dmfc0 k0,cop0_osscratch if _LP64
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/sys/arch/evbmips/rmixl/machdep.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/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.22 src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.23
--- src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.22 Sat Feb 27 21:26:28 2010
+++ src/sys/arch/evbmips/rmixl/machdep.c Tue Mar 9 02:02:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1.2.22 2010/02/27 21:26:28 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.1.2.23 2010/03/09 02:02:53 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.2.22 2010/02/27 21:26:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.2.23 2010/03/09 02:02:53 matt Exp $");
#include "opt_ddb.h"
#include "opt_com.h"
@@ -469,8 +469,11 @@
* relative from the start of struct cpu_info.
*/
- /* [0] = mfc0 rX, $22 (OSScratch) */
+ /* [0] = [d]mfc0 rX, $22 (OSScratch) */
new_insns[0] = (020 << 26)
+#ifdef _LP64
+ | (1 << 21) /* double move */
+#endif
| (new_insns[0] & 0x001f0000)
| (MIPS_COP_0_OSSCRATCH << 11) | (0 << 0);