[src/trunk]: src/sys/arch/mips/mips Don't try to interpret MIPS3-specific sta...

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

details:   https://anonhg.NetBSD.org/src/rev/818bb41513f5
branches:  trunk
changeset: 814095:818bb41513f5
user:      tnn <tnn%NetBSD.org@localhost>
date:      Sun Mar 06 21:03:01 2016 +0000

description:
Don't try to interpret MIPS3-specific status register bit on MIPS1.
Fixes boot of NetBSD/pmax in gxemul 3max emulation mode.

diffstat:

 sys/arch/mips/mips/trap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b8f804d390d5 -r 818bb41513f5 sys/arch/mips/mips/trap.c
--- a/sys/arch/mips/mips/trap.c Sun Mar 06 19:47:41 2016 +0000
+++ b/sys/arch/mips/mips/trap.c Sun Mar 06 21:03:01 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.238 2015/06/11 15:50:17 matt Exp $  */
+/*     $NetBSD: trap.c,v 1.239 2016/03/06 21:03:01 tnn Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.238 2015/06/11 15:50:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.239 2016/03/06 21:03:01 tnn Exp $");
 
 #include "opt_cputype.h"       /* which mips CPU levels do we support? */
 #include "opt_ddb.h"
@@ -167,7 +167,7 @@
        KSI_INIT_TRAP(&ksi);
 
        curcpu()->ci_data.cpu_ntrap++;
-       if (status & MIPS3_SR_NMI) {
+       if (CPUISMIPS3 && (status & MIPS3_SR_NMI)) {
                type = T_NMI;
        } else {
                type = TRAPTYPE(cause);