[src/trunk]: src/sys/arch/mips Move MFC0_HAZARD definition to asm.h instead o...

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

details:   https://anonhg.NetBSD.org/src/rev/1d65dfdb4c83
branches:  trunk
changeset: 818956:1d65dfdb4c83
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Nov 09 11:50:09 2016 +0000

description:
Move MFC0_HAZARD definition to asm.h instead of defining it twice

diffstat:

 sys/arch/mips/include/asm.h     |   9 ++++++++-
 sys/arch/mips/mips/locore.S     |  10 ++--------
 sys/arch/mips/mips/mipsX_subr.S |   8 +-------
 3 files changed, 11 insertions(+), 16 deletions(-)

diffs (72 lines):

diff -r 6e8472608de2 -r 1d65dfdb4c83 sys/arch/mips/include/asm.h
--- a/sys/arch/mips/include/asm.h       Wed Nov 09 09:00:46 2016 +0000
+++ b/sys/arch/mips/include/asm.h       Wed Nov 09 11:50:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.51 2016/08/13 08:08:11 skrll Exp $   */
+/*     $NetBSD: asm.h,v 1.52 2016/11/09 11:50:09 maya Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -510,6 +510,13 @@
 #define        NOP_L           /* nothing */
 #endif
 
+/* CPU dependent hook for cp0 load delays */
+#if defined(MIPS1) || defined(MIPS2) || defined(MIPS3)
+#define MFC0_HAZARD    nop
+#else
+#define MFC0_HAZARD    /* nothing */
+#endif
+
 #if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 || \
     _MIPS_ISA == _MIPS_ISA_MIPS32
 #define        MFC0            mfc0
diff -r 6e8472608de2 -r 1d65dfdb4c83 sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Wed Nov 09 09:00:46 2016 +0000
+++ b/sys/arch/mips/mips/locore.S       Wed Nov 09 11:50:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.207 2016/10/13 18:58:00 macallan Exp $    */
+/*     $NetBSD: locore.S,v 1.208 2016/11/09 11:50:09 maya Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -63,16 +63,10 @@
 #include <mips/trap.h>
 #include <mips/locore.h>
 
-RCSID("$NetBSD: locore.S,v 1.207 2016/10/13 18:58:00 macallan Exp $")
+RCSID("$NetBSD: locore.S,v 1.208 2016/11/09 11:50:09 maya Exp $")
 
 #include "assym.h"
 
-#if defined(MIPS1) || defined(MIPS2) || defined(MIPS3)
-#define MFC0_HAZARD    nop
-#else
-#define MFC0_HAZARD    /* nothing */
-#endif
-
        .set    noreorder
 
        .globl  start
diff -r 6e8472608de2 -r 1d65dfdb4c83 sys/arch/mips/mips/mipsX_subr.S
--- a/sys/arch/mips/mips/mipsX_subr.S   Wed Nov 09 09:00:46 2016 +0000
+++ b/sys/arch/mips/mips/mipsX_subr.S   Wed Nov 09 11:50:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mipsX_subr.S,v 1.94 2016/10/02 09:06:35 maya Exp $     */
+/*     $NetBSD: mipsX_subr.S,v 1.95 2016/11/09 11:50:09 maya Exp $     */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -138,12 +138,6 @@
 #error use locore_mips1.S
 #endif
 
-#if defined(MIPS3)
-#define        MFC0_HAZARD     nop
-#else
-#define        MFC0_HAZARD     /* nothing */
-#endif
-
 #if defined(__mips_o32)
 #define        RESET_EXCEPTION_LEVEL_DISABLE_INTERRUPTS(reg) \
        mtc0 zero, MIPS_COP_0_STATUS