Module Name: src
Committed By: skrll
Date: Sat Aug 13 08:08:11 UTC 2016
Modified Files:
src/sys/arch/mips/include: asm.h
src/sys/arch/mips/mips: locore.S spl.S
Log Message:
Move the NOP_L macro into asm.h
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/include/asm.h
cvs rdiff -u -r1.204 -r1.205 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/mips/spl.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/asm.h
diff -u src/sys/arch/mips/include/asm.h:1.50 src/sys/arch/mips/include/asm.h:1.51
--- src/sys/arch/mips/include/asm.h:1.50 Sat Aug 13 07:52:52 2016
+++ src/sys/arch/mips/include/asm.h Sat Aug 13 08:08:11 2016
@@ -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 @@ _C_LABEL(x):
#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
Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.204 src/sys/arch/mips/mips/locore.S:1.205
--- src/sys/arch/mips/mips/locore.S:1.204 Wed Jul 27 09:32:35 2016
+++ src/sys/arch/mips/mips/locore.S Sat Aug 13 08:08:11 2016
@@ -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
Index: src/sys/arch/mips/mips/spl.S
diff -u src/sys/arch/mips/mips/spl.S:1.11 src/sys/arch/mips/mips/spl.S:1.12
--- src/sys/arch/mips/mips/spl.S:1.11 Sun Jul 24 18:04:04 2016
+++ src/sys/arch/mips/mips/spl.S Sat Aug 13 08:08:11 2016
@@ -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
