[src/trunk]: src/sys/arch/mips Move the NOP_L macro into asm.h

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

details:   https://anonhg.NetBSD.org/src/rev/a537a7bf9a83
branches:  trunk
changeset: 817231:a537a7bf9a83
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Aug 13 08:08:11 2016 +0000

description:
Move the NOP_L macro into asm.h

diffstat:

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

diffs (76 lines):

diff -r b999daceda11 -r a537a7bf9a83 sys/arch/mips/include/asm.h
--- a/sys/arch/mips/include/asm.h       Sat Aug 13 07:52:52 2016 +0000
+++ b/sys/arch/mips/include/asm.h       Sat Aug 13 08:08:11 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.50 2016/08/13 07:52:52 skrll Exp $   */
+/*     $NetBSD: asm.h,v 1.51 2016/08/13 08:08:11 skrll Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -504,6 +504,12 @@
 #define        REG_SCALESHIFT  3
 #endif
 
+#if (MIPS1 + MIPS2) > 0
+#define        NOP_L           nop
+#else
+#define        NOP_L           /* nothing */
+#endif
+
 #if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 || \
     _MIPS_ISA == _MIPS_ISA_MIPS32
 #define        MFC0            mfc0
diff -r b999daceda11 -r a537a7bf9a83 sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Sat Aug 13 07:52:52 2016 +0000
+++ b/sys/arch/mips/mips/locore.S       Sat Aug 13 08:08:11 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.204 2016/07/27 09:32:35 skrll Exp $       */
+/*     $NetBSD: locore.S,v 1.205 2016/08/13 08:08:11 skrll Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -62,16 +62,10 @@
 #include <mips/cpuregs.h>
 #include <mips/trap.h>
 
-RCSID("$NetBSD: locore.S,v 1.204 2016/07/27 09:32:35 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.205 2016/08/13 08:08:11 skrll Exp $")
 
 #include "assym.h"
 
-#if defined(MIPS1) || defined(MIPS2)
-#define        NOP_L           nop
-#else
-#define        NOP_L           /* nothing */
-#endif
-
 #if defined(MIPS1) || defined(MIPS2) || defined(MIPS3)
 #define MFC0_HAZARD    nop
 #else
diff -r b999daceda11 -r a537a7bf9a83 sys/arch/mips/mips/spl.S
--- a/sys/arch/mips/mips/spl.S  Sat Aug 13 07:52:52 2016 +0000
+++ b/sys/arch/mips/mips/spl.S  Sat Aug 13 08:08:11 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spl.S,v 1.11 2016/07/24 18:04:04 skrll Exp $   */
+/*     $NetBSD: spl.S,v 1.12 2016/08/13 08:08:11 skrll Exp $   */
 
 /*-
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -38,16 +38,10 @@
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
 
-RCSID("$NetBSD: spl.S,v 1.11 2016/07/24 18:04:04 skrll Exp $")
+RCSID("$NetBSD: spl.S,v 1.12 2016/08/13 08:08:11 skrll Exp $")
 
 #include "assym.h"
 
-#if (MIPS1 + MIPS2) > 0
-#define        NOP_L   nop
-#else
-#define        NOP_L   /* nothing */
-#endif
-
        .data
        .globl  _C_LABEL(ipl_sr_map)
        .type   _C_LABEL(ipl_sr_map),@object