[src/trunk]: src/sys/arch/mips/mips include locore.h for MIPS3_PLUS, while th...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3770752b6e3e
branches:  trunk
changeset: 818432:3770752b6e3e
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Oct 13 18:58:00 2016 +0000

description:
include locore.h for MIPS3_PLUS, while there annotate some #else and #endif

diffstat:

 sys/arch/mips/mips/locore.S |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 13363e8f287f -r 3770752b6e3e sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Thu Oct 13 18:54:46 2016 +0000
+++ b/sys/arch/mips/mips/locore.S       Thu Oct 13 18:58:00 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.206 2016/08/19 10:05:35 skrll Exp $       */
+/*     $NetBSD: locore.S,v 1.207 2016/10/13 18:58:00 macallan Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -61,8 +61,9 @@
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
 #include <mips/trap.h>
+#include <mips/locore.h>
 
-RCSID("$NetBSD: locore.S,v 1.206 2016/08/19 10:05:35 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.207 2016/10/13 18:58:00 macallan Exp $")
 
 #include "assym.h"
 
@@ -143,10 +144,10 @@
        li      t0, MIPS_SR_KX | MIPS_SR_UX     # turn on XKSEG and XKPHYS
 #else
        li      t0, 0                           # Disable interrupts and
-#endif
+#endif /* n32 */
        mtc0    t0, MIPS_COP_0_STATUS           # the fp coprocessor
        COP0_SYNC
-#endif
+#endif /* !emips */
 #ifdef HPCMIPS_L1CACHE_DISABLE
        mfc0    t0, MIPS_COP_0_CONFIG
        li      t1, 0xfffffff8
@@ -155,7 +156,7 @@
        mtc0    t0, MIPS_COP_0_CONFIG
        COP0_SYNC
 #endif /* HPCMIPS_L1CACHE_DISABLE */
-#else
+#else /* NOFPU */
        mfc0    t0, MIPS_COP_0_STATUS
        MFC0_HAZARD
 #if defined(_LP64) || defined(__mips_n32)