Module Name: src
Committed By: matt
Date: Thu Jun 4 05:58:17 UTC 2015
Modified Files:
src/sys/arch/mips/mips: locore_mips3.S
Log Message:
Don't .set mips3 if we are >= mips3 already
Use dins if we have it rather than two shifts.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/mips/mips/locore_mips3.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/locore_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.104 src/sys/arch/mips/mips/locore_mips3.S:1.105
--- src/sys/arch/mips/mips/locore_mips3.S:1.104 Tue Jun 2 05:09:15 2015
+++ src/sys/arch/mips/mips/locore_mips3.S Thu Jun 4 05:58:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_mips3.S,v 1.104 2015/06/02 05:09:15 matt Exp $ */
+/* $NetBSD: locore_mips3.S,v 1.105 2015/06/04 05:58:17 matt Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -122,7 +122,9 @@
*============================================================================
*/
.set noreorder
+#if __mips < 3
.set mips3
+#endif
#ifdef _LP64
#define _MFC0 dmfc0
@@ -639,8 +641,12 @@ END(baderr64)
LEAF(mips3_cp0_tlb_entry_hi_probe)
dmfc0 t0, MIPS_COP_0_TLB_HI
li v0, -1 /* all 1s */
+#if defined(__mips_isa_rev) && __mips_isa_rev >= 2
+ dinsu v0, zero, 62, 2
+#else
dsll v0, v0, 2 /* except the top 2 */
dsrl v0, v0, 2
+#endif
dmtc0 v0, MIPS_COP_0_TLB_HI
COP0_SYNC
dmfc0 v0, MIPS_COP_0_TLB_HI
