Module Name: src
Committed By: maya
Date: Wed Nov 9 11:50:09 UTC 2016
Modified Files:
src/sys/arch/mips/include: asm.h
src/sys/arch/mips/mips: locore.S mipsX_subr.S
Log Message:
Move MFC0_HAZARD definition to asm.h instead of defining it twice
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mips/include/asm.h
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/mips/mips/mipsX_subr.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.51 src/sys/arch/mips/include/asm.h:1.52
--- src/sys/arch/mips/include/asm.h:1.51 Sat Aug 13 08:08:11 2016
+++ src/sys/arch/mips/include/asm.h Wed Nov 9 11:50:09 2016
@@ -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 @@ _C_LABEL(x):
#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
Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.207 src/sys/arch/mips/mips/locore.S:1.208
--- src/sys/arch/mips/mips/locore.S:1.207 Thu Oct 13 18:58:00 2016
+++ src/sys/arch/mips/mips/locore.S Wed Nov 9 11:50:09 2016
@@ -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
Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.94 src/sys/arch/mips/mips/mipsX_subr.S:1.95
--- src/sys/arch/mips/mips/mipsX_subr.S:1.94 Sun Oct 2 09:06:35 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S Wed Nov 9 11:50:09 2016
@@ -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
