Module Name: src
Committed By: matt
Date: Sun Jun 7 06:07:49 UTC 2015
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_dwctwo.c
src/sys/arch/mips/include: cpu.h mips_param.h pmap.h regdef.h
src/sys/arch/mips/mips: bds_emul.S copy.S fp.S genassym.cf
lock_stubs_llsc.S lock_stubs_ras.S
Log Message:
assembly no longer include <machine/cpu.h>. Instead MIPS_CURLWP is gotten
from regdef.h and everything else from assym.h. <mips/mips_param.h> no
longer include <machine/cpu.h>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mips/include/mips_param.h
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/mips/include/pmap.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/include/regdef.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/mips/bds_emul.S
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/mips/copy.S
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mips/mips/fp.S
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mips/mips/genassym.cf
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/mips/lock_stubs_llsc.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/mips/lock_stubs_ras.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/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.2 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.3
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.2 Mon Jun 1 22:55:12 2015
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dwctwo.c,v 1.2 2015/06/01 22:55:12 matt Exp $ */
+/* $NetBSD: octeon_dwctwo.c,v 1.3 2015/06/07 06:07:49 matt Exp $ */
/*
* Copyright (c) 2015 Masao Uebayashi <[email protected]>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.2 2015/06/01 22:55:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.3 2015/06/07 06:07:49 matt Exp $");
#include "opt_octeon.h"
#include "opt_usb.h"
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: octeon_dwctw
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/workqueue.h>
#include <dev/usb/usb.h>
Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.114 src/sys/arch/mips/include/cpu.h:1.115
--- src/sys/arch/mips/include/cpu.h:1.114 Sat Jun 6 21:38:47 2015
+++ src/sys/arch/mips/include/cpu.h Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.114 2015/06/06 21:38:47 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.115 2015/06/07 06:07:49 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -226,11 +226,10 @@ struct cpu_info {
#define CPU_ARCH_MIPS64R2 (1 << 8)
/* Note: must be kept in sync with -ffixed-?? Makefile.mips. */
-#define MIPS_CURLWP $24
+// MIPS_CURLWP moved to <mips/regdef.h>
#define MIPS_CURLWP_QUOTED "$24"
#define MIPS_CURLWP_LABEL _L_T8
#define MIPS_CURLWP_REG _R_T8
-#define TF_MIPS_CURLWP(x) TF_REG_T8(x)
#ifndef _LOCORE
Index: src/sys/arch/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.34 src/sys/arch/mips/include/mips_param.h:1.35
--- src/sys/arch/mips/include/mips_param.h:1.34 Thu May 23 21:39:49 2013
+++ src/sys/arch/mips/include/mips_param.h Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_param.h,v 1.34 2013/05/23 21:39:49 christos Exp $ */
+/* $NetBSD: mips_param.h,v 1.35 2015/06/07 06:07:49 matt Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -25,10 +25,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef _KERNEL
-#include <machine/cpu.h>
-#endif
-
/*
* No reason this can't be common
*/
Index: src/sys/arch/mips/include/pmap.h
diff -u src/sys/arch/mips/include/pmap.h:1.63 src/sys/arch/mips/include/pmap.h:1.64
--- src/sys/arch/mips/include/pmap.h:1.63 Sun May 11 07:53:28 2014
+++ src/sys/arch/mips/include/pmap.h Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.63 2014/05/11 07:53:28 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.64 2015/06/07 06:07:49 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,6 +78,8 @@
#include "opt_multiprocessor.h"
#endif
+#include <sys/evcnt.h>
+
#include <mips/cpuregs.h> /* for KSEG0 below */
//#include <mips/pte.h>
Index: src/sys/arch/mips/include/regdef.h
diff -u src/sys/arch/mips/include/regdef.h:1.12 src/sys/arch/mips/include/regdef.h:1.13
--- src/sys/arch/mips/include/regdef.h:1.12 Sun Dec 11 12:18:09 2005
+++ src/sys/arch/mips/include/regdef.h Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: regdef.h,v 1.12 2005/12/11 12:18:09 christos Exp $ */
+/* $NetBSD: regdef.h,v 1.13 2015/06/07 06:07:49 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -104,4 +104,8 @@
#define ta3 $15
#endif /* __mips_n32 || __mips_n64 */
+#ifdef _KERNEL
+#define MIPS_CURLWP t8 /* needs to synced with cpu.h */
+#endif
+
#endif /* _MIPS_REGDEF_H */
Index: src/sys/arch/mips/mips/bds_emul.S
diff -u src/sys/arch/mips/mips/bds_emul.S:1.6 src/sys/arch/mips/mips/bds_emul.S:1.7
--- src/sys/arch/mips/mips/bds_emul.S:1.6 Sun Dec 25 11:51:15 2011
+++ src/sys/arch/mips/mips/bds_emul.S Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bds_emul.S,v 1.6 2011/12/25 11:51:15 kiyohara Exp $ */
+/* $NetBSD: bds_emul.S,v 1.7 2015/06/07 06:07:49 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -37,7 +37,6 @@
#include <sys/cdefs.h>
#include <mips/asm.h>
-#include <mips/cpu.h> /* for MIPS_CURLWP */
#include <mips/trap.h> /* for T_RES_INST */
#include "assym.h"
Index: src/sys/arch/mips/mips/copy.S
diff -u src/sys/arch/mips/mips/copy.S:1.15 src/sys/arch/mips/mips/copy.S:1.16
--- src/sys/arch/mips/mips/copy.S:1.15 Tue Aug 16 06:55:11 2011
+++ src/sys/arch/mips/mips/copy.S Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.S,v 1.15 2011/08/16 06:55:11 matt Exp $ */
+/* $NetBSD: copy.S,v 1.16 2015/06/07 06:07:49 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -57,7 +57,6 @@
#include <sys/errno.h>
#include <mips/asm.h>
-#include <mips/cpu.h>
#include "assym.h"
.set noreorder
Index: src/sys/arch/mips/mips/fp.S
diff -u src/sys/arch/mips/mips/fp.S:1.44 src/sys/arch/mips/mips/fp.S:1.45
--- src/sys/arch/mips/mips/fp.S:1.44 Tue Aug 16 06:55:11 2011
+++ src/sys/arch/mips/mips/fp.S Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fp.S,v 1.44 2011/08/16 06:55:11 matt Exp $ */
+/* $NetBSD: fp.S,v 1.45 2015/06/07 06:07:49 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -37,7 +37,6 @@
#include <sys/cdefs.h>
#include <mips/asm.h>
-#include <mips/cpu.h>
#include <mips/trap.h>
#include "assym.h"
Index: src/sys/arch/mips/mips/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.58 src/sys/arch/mips/mips/genassym.cf:1.59
--- src/sys/arch/mips/mips/genassym.cf:1.58 Sat Jun 6 21:44:16 2015
+++ src/sys/arch/mips/mips/genassym.cf Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.58 2015/06/06 21:44:16 matt Exp $
+# $NetBSD: genassym.cf,v 1.59 2015/06/07 06:07:49 matt Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -196,6 +196,7 @@ define TF_REG_S5 offsetof(struct trapfr
define TF_REG_S6 offsetof(struct trapframe, tf_regs[_R_S6])
define TF_REG_S7 offsetof(struct trapframe, tf_regs[_R_S7])
define TF_REG_T8 offsetof(struct trapframe, tf_regs[_R_T8])
+define TF_MIPS_CURLWP offsetof(struct trapframe, tf_regs[_R_T8])
define TF_REG_T9 offsetof(struct trapframe, tf_regs[_R_T9])
define TF_REG_K0 offsetof(struct trapframe, tf_regs[_R_K0])
define TF_REG_K1 offsetof(struct trapframe, tf_regs[_R_K1])
@@ -330,3 +331,6 @@ define MO_FPU_ID offsetof(struct mips_o
define MO_NUM_TLB_ENTRIES offsetof(struct mips_options, mips_num_tlb_entries)
define MCI_SDCACHE_SIZE offsetof(struct mips_cache_info, mci_sdcache_size)
+
+define MIPS_CURLWP_LABEL MIPS_CURLWP_LABEL
+define MIPS_CURLWP_REG MIPS_CURLWP_REG
Index: src/sys/arch/mips/mips/lock_stubs_llsc.S
diff -u src/sys/arch/mips/mips/lock_stubs_llsc.S:1.3 src/sys/arch/mips/mips/lock_stubs_llsc.S:1.4
--- src/sys/arch/mips/mips/lock_stubs_llsc.S:1.3 Thu Jun 4 02:28:06 2015
+++ src/sys/arch/mips/mips/lock_stubs_llsc.S Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs_llsc.S,v 1.3 2015/06/04 02:28:06 matt Exp $ */
+/* $NetBSD: lock_stubs_llsc.S,v 1.4 2015/06/07 06:07:49 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
#include <sys/errno.h>
#include <machine/asm.h>
-#include <machine/cpu.h> /* MIPS_CURLWP */
#include "assym.h"
Index: src/sys/arch/mips/mips/lock_stubs_ras.S
diff -u src/sys/arch/mips/mips/lock_stubs_ras.S:1.4 src/sys/arch/mips/mips/lock_stubs_ras.S:1.5
--- src/sys/arch/mips/mips/lock_stubs_ras.S:1.4 Sat Aug 27 13:23:52 2011
+++ src/sys/arch/mips/mips/lock_stubs_ras.S Sun Jun 7 06:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs_ras.S,v 1.4 2011/08/27 13:23:52 bouyer Exp $ */
+/* $NetBSD: lock_stubs_ras.S,v 1.5 2015/06/07 06:07:49 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
#include <sys/errno.h>
#include <machine/asm.h>
-#include <machine/cpu.h>
#include "assym.h"
