Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mips/mips Fix busted #if/endif
details: https://anonhg.NetBSD.org/src/rev/6a2e6106b738
branches: trunk
changeset: 346407:6a2e6106b738
user: matt <matt%NetBSD.org@localhost>
date: Tue Jul 12 03:34:50 2016 +0000
description:
Fix busted #if/endif
diffstat:
sys/arch/mips/mips/mipsX_subr.S | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (34 lines):
diff -r 57838ea3d61e -r 6a2e6106b738 sys/arch/mips/mips/mipsX_subr.S
--- a/sys/arch/mips/mips/mipsX_subr.S Tue Jul 12 03:34:25 2016 +0000
+++ b/sys/arch/mips/mips/mipsX_subr.S Tue Jul 12 03:34:50 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.70 2016/07/11 19:00:04 skrll Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.71 2016/07/12 03:34:50 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -1874,7 +1874,7 @@
PTR_L k1, (k1) # load segtab address
beqz k1, _C_LABEL(MIPSX(kern_gen_exception))
nop
-#endif
+#endif /* _LP64 */
#ifdef MIPSNNR2
_EXT k0, k0, SEGSHIFT, SEGLENGTH
_INS k1, k0, PTR_SCALESHIFT, SEGLENGTH
@@ -1900,7 +1900,6 @@
mfc0 k0, MIPS_COP_0_TLB_INDEX
MFC0_HAZARD
-#endif
bltz k0, _C_LABEL(MIPSX(kern_gen_exception)) # ASSERT(TLB entry exists)
nop # - delay slot -
@@ -2000,6 +1999,7 @@
#endif
eret
END(MIPSX(kern_tlb_invalid_exception))
+#endif /* (PGSHIFT & 1) == 0 */
/*
* Mark where code entered from exception hander jumptable
Home |
Main Index |
Thread Index |
Old Index