Module Name: src
Committed By: maya
Date: Sun Oct 2 09:06:35 UTC 2016
Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S
Log Message:
Simplify. LOONGSON2 and MIPSNNR2 not possible.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 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.93 src/sys/arch/mips/mips/mipsX_subr.S:1.94
--- src/sys/arch/mips/mips/mipsX_subr.S:1.93 Sat Aug 27 07:22:14 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S Sun Oct 2 09:06:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.93 2016/08/27 07:22:14 skrll Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.94 2016/10/02 09:06:35 maya Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -387,11 +387,7 @@ VECTOR(MIPSX(tlb_miss), unknown)
dmfc0 k0, MIPS_COP_0_BAD_VADDR #0d: k0=bad address (again)
PTR_L k1, 0(k1) #0e: k1=seg entry
b MIPSX(tlb_miss_common) #0f
-#ifdef MIPSNNR2
- _EXT k0, k0, SEGSHIFT, SEGLENGTH #10: k0=seg index
-#else
PTR_SRL k0, SEGSHIFT - PTR_SCALESHIFT #10: k0=seg offset (almost)
-#endif
#endif /* LP64 */
2: /* handle useg addresses */
lui k1, %hi(CPUVAR(PMAP_SEG0TAB)) #11: k1=hi of seg0tab
