Module Name:    src
Committed By:   matt
Date:           Thu Dec 31 00:53:00 UTC 2009

Modified Files:
        src/sys/arch/mips/mips [matt-nb5-mips64]: mipsX_subr.S
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_subr.S

Log Message:
Indicate that some RMI mfcr/mtcr can't be used in O32


To generate a diff of this commit:
cvs rdiff -u -r1.26.36.1.2.15 -r1.26.36.1.2.16 \
    src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_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.15 src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.16
--- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.15	Fri Dec  4 04:42:09 2009
+++ src/sys/arch/mips/mips/mipsX_subr.S	Thu Dec 31 00:53:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.26.36.1.2.15 2009/12/04 04:42:09 matt Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.26.36.1.2.16 2009/12/31 00:53:00 matt Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -1079,6 +1079,9 @@
 	mfcr	a2, k1
 	li	k1, 0x30b	/* L1D_CACHE_INTERRUPT */
 	mfcr	a3, k1
+#if defined(__mips_o32)
+#error O32 not supported.
+#endif
 	mfc0	a4, MIPS_COP_0_STATUS
 	mfc0	a5, MIPS_COP_0_CAUSE
 #else

Index: src/sys/arch/mips/rmi/rmixl_subr.S
diff -u src/sys/arch/mips/rmi/rmixl_subr.S:1.1.2.1 src/sys/arch/mips/rmi/rmixl_subr.S:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_subr.S:1.1.2.1	Fri Nov 13 05:22:19 2009
+++ src/sys/arch/mips/rmi/rmixl_subr.S	Thu Dec 31 00:53:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_subr.S,v 1.1.2.1 2009/11/13 05:22:19 cliff Exp $	*/
+/*	$NetBSD: rmixl_subr.S,v 1.1.2.2 2009/12/31 00:53:00 matt Exp $	*/
 
 #include "opt_cputype.h"
 
@@ -18,6 +18,9 @@
  * uint64_t rmixl_mfcr(u_int cr);
  */
 LEAF(rmixl_mfcr)
+#if defined(__mips_o32)
+#error O32 not supported
+#endif
 	j	ra
 	mfcr	v0, a0
 END(rmixl_mfcr)
@@ -28,6 +31,9 @@
  * void rmixl_mtcr(u_int cr, uint64_t val);
  */
 LEAF(rmixl_mtcr)
+#if defined(__mips_o32)
+#error O32 not supported
+#endif
 	j	ra
 	mtcr	a1, a0
 END(rmixl_mtcr)

Reply via email to