Module Name: src
Committed By: thorpej
Date: Thu Mar 14 16:59:10 UTC 2019
Modified Files:
src/sys/arch/cesfic/conf: GENERIC
src/sys/arch/hp300/conf: GENERIC INSTALL
src/sys/arch/hp300/hp300: machdep.c
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/include: m68k.h
src/sys/arch/m68k/m68k: copy.s
src/sys/arch/mvme68k/mvme68k: machdep.c
src/sys/arch/news68k/news68k: machdep.c
src/sys/arch/next68k/next68k: machdep.c
src/sys/arch/x68k/conf: GENERIC INSTALL
src/sys/arch/x68k/x68k: machdep.c
Removed Files:
src/sys/arch/m68k/m68k: mappedcopy.c
Log Message:
G/C "MAPPECOPY". It is the deadest of wood, and never actually worked in
NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/cesfic/conf/GENERIC
cvs rdiff -u -r1.200 -r1.201 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hp300/conf/INSTALL
cvs rdiff -u -r1.229 -r1.230 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/m68k/include/m68k.h
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/m68k/m68k/copy.s
cvs rdiff -u -r1.27 -r0 src/sys/arch/m68k/m68k/mappedcopy.c
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/x68k/conf/INSTALL
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/x68k/x68k/machdep.c
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/cesfic/conf/GENERIC
diff -u src/sys/arch/cesfic/conf/GENERIC:1.70 src/sys/arch/cesfic/conf/GENERIC:1.71
--- src/sys/arch/cesfic/conf/GENERIC:1.70 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/cesfic/conf/GENERIC Thu Mar 14 16:59:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.70 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC,v 1.71 2019/03/14 16:59:09 thorpej Exp $
#
# GENERIC machine description file
#
@@ -90,10 +90,6 @@ options INET # Internet protocols
#options ALTQ_RIO # RED with IN/OUT
#options ALTQ_WFQ # Weighted Fair Queueing
-# This option enables a different copyin/copyout that uses page
-# mapping for large copies.
-#options MAPPEDCOPY # different copyin/copyout for large copies
-
options COMPAT_M68K4K # compat. with NetBSD/m68k4k binaries
options COMPAT_AOUT_M68K # support for NetBSD a.out executables
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.200 src/sys/arch/hp300/conf/GENERIC:1.201
--- src/sys/arch/hp300/conf/GENERIC:1.200 Wed Dec 19 13:57:47 2018
+++ src/sys/arch/hp300/conf/GENERIC Thu Mar 14 16:59:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.200 2018/12/19 13:57:47 maxv Exp $
+# $NetBSD: GENERIC,v 1.201 2019/03/14 16:59:09 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.200 $"
+#ident "GENERIC-$Revision: 1.201 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -149,7 +149,6 @@ options NFS_BOOT_DHCP # use dhcp for NF
options USELEDS # make the lights twinkle
#options PANICBUTTON # two fast <reset>s on HIL dump kernel
#options CONSCODE=9 # force console at this select code
-#options MAPPEDCOPY # different copyin/copyout for large copies
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
Index: src/sys/arch/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.63 src/sys/arch/hp300/conf/INSTALL:1.64
--- src/sys/arch/hp300/conf/INSTALL:1.63 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/hp300/conf/INSTALL Thu Mar 14 16:59:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.63 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: INSTALL,v 1.64 2019/03/14 16:59:09 thorpej Exp $
#
# INSTALL machine description file
#
@@ -89,10 +89,6 @@ options INET # Internet protocols
#options PANICBUTTON # two fast <reset>s on HIL dump kernel
#options CONSCODE=9 # force console at this select code
-# This option enables a different copyin/copyout that uses page
-# mapping for large copies.
-#options MAPPEDCOPY # different copyin/copyout for large copies
-
# Debugging options
#options DIAGNOSTIC # Extra kernel sanity checks
#options DEBUG # Enable misc. kernel debugging code
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.229 src/sys/arch/hp300/hp300/machdep.c:1.230
--- src/sys/arch/hp300/hp300/machdep.c:1.229 Sun Apr 20 04:12:54 2014
+++ src/sys/arch/hp300/hp300/machdep.c Thu Mar 14 16:59:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.229 2014/04/20 04:12:54 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.230 2019/03/14 16:59:09 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.229 2014/04/20 04:12:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.230 2019/03/14 16:59:09 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -868,17 +868,6 @@ static void
initcpu(void)
{
-#ifdef MAPPEDCOPY
- /*
- * Initialize lower bound for doing copyin/copyout using
- * page mapping (if not already set). We don't do this on
- * VAC machines as it loses big time.
- */
- if (ectype == EC_VIRT)
- mappedcopysize = -1; /* in case it was patched */
- else
- mappedcopysize = PAGE_SIZE;
-#endif
parityenable();
#ifdef USELEDS
ledinit();
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.48 src/sys/arch/m68k/conf/files.m68k:1.49
--- src/sys/arch/m68k/conf/files.m68k:1.48 Wed Dec 19 13:57:47 2018
+++ src/sys/arch/m68k/conf/files.m68k Thu Mar 14 16:59:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.48 2018/12/19 13:57:47 maxv Exp $
+# $NetBSD: files.m68k,v 1.49 2019/03/14 16:59:09 thorpej Exp $
#
defflag opt_fpsp.h FPSP
@@ -21,7 +21,6 @@ file arch/m68k/m68k/kgdb_m68k.c kgdb
file arch/m68k/m68k/kobj_machdep.c modular
file arch/m68k/m68k/lock_stubs.s
file arch/m68k/m68k/m68k_machdep.c
-file arch/m68k/m68k/mappedcopy.c mappedcopy
file arch/m68k/m68k/oc_cksum.s (inet | inet6) & cpu_in_cksum
file arch/m68k/m68k/process_machdep.c
file arch/m68k/m68k/reenter_syscall.s
Index: src/sys/arch/m68k/include/m68k.h
diff -u src/sys/arch/m68k/include/m68k.h:1.22 src/sys/arch/m68k/include/m68k.h:1.23
--- src/sys/arch/m68k/include/m68k.h:1.22 Sun Feb 19 21:06:13 2012
+++ src/sys/arch/m68k/include/m68k.h Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k.h,v 1.22 2012/02/19 21:06:13 rmind Exp $ */
+/* $NetBSD: m68k.h,v 1.23 2019/03/14 16:59:10 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -120,13 +120,6 @@ void w16copy(const void *, void *, u_int
/* fpu.c */
int fpu_probe(void);
-#ifdef MAPPEDCOPY
-/* mappedcopy.c */
-int mappedcopyin(void *fromp, void *top, size_t count);
-int mappedcopyout(void *fromp, void *top, size_t count);
-extern u_int mappedcopysize;
-#endif /* MAPPEDCOPY */
-
/* regdump.c */
void regdump(struct trapframe *, int);
Index: src/sys/arch/m68k/m68k/copy.s
diff -u src/sys/arch/m68k/m68k/copy.s:1.45 src/sys/arch/m68k/m68k/copy.s:1.46
--- src/sys/arch/m68k/m68k/copy.s:1.45 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/m68k/m68k/copy.s Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.s,v 1.45 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: copy.s,v 1.46 2019/03/14 16:59:10 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -122,10 +122,6 @@ ENTRY(copyin)
CHECK_SFC
movl 12(%sp),%d0 | check count
jeq .Lciret | == 0, don't do anything
-#ifdef MAPPEDCOPY
- cmpl _C_LABEL(mappedcopysize),%d0 | size >= mappedcopysize
- jcc _C_LABEL(mappedcopyin) | yes, go do it the new way
-#endif
movl %d2,-(%sp) | save scratch register
GETCURPCB(%a0) | set fault handler
movl #.Lcifault,PCB_ONFAULT(%a0)
@@ -187,10 +183,6 @@ ENTRY(copyout)
CHECK_DFC
movl 12(%sp),%d0 | check count
jeq .Lcoret | == 0, don't do anything
-#ifdef MAPPEDCOPY
- cmpl _C_LABEL(mappedcopysize),%d0 | size >= mappedcopysize
- jcc _C_LABEL(mappedcopyout) | yes, go do it the new way
-#endif
movl %d2,-(%sp) | save scratch register
GETCURPCB(%a0) | set fault handler
movl #.Lcofault,PCB_ONFAULT(%a0)
Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.154 src/sys/arch/mvme68k/mvme68k/machdep.c:1.155
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.154 Tue May 31 03:25:46 2016
+++ src/sys/arch/mvme68k/mvme68k/machdep.c Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.154 2016/05/31 03:25:46 dholland Exp $ */
+/* $NetBSD: machdep.c,v 1.155 2019/03/14 16:59:10 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.154 2016/05/31 03:25:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.155 2019/03/14 16:59:10 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
@@ -968,19 +968,6 @@ initcpu(void)
extern uint8_t fpfault;
#endif
-#ifdef MAPPEDCOPY
- extern u_int mappedcopysize;
-
- /*
- * Initialize lower bound for doing copyin/copyout using
- * page mapping (if not already set). We don't do this on
- * VAC machines as it loses big time.
- */
- if (mappedcopysize == 0) {
- mappedcopysize = PAGE_SIZE;
- }
-#endif
-
#if defined(M68060)
if (cputype == CPU_68060) {
#if defined(M060SP)
Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.103 src/sys/arch/news68k/news68k/machdep.c:1.104
--- src/sys/arch/news68k/news68k/machdep.c:1.103 Fri Sep 15 03:11:15 2017
+++ src/sys/arch/news68k/news68k/machdep.c Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.103 2017/09/15 03:11:15 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.104 2019/03/14 16:59:10 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.103 2017/09/15 03:11:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.104 2019/03/14 16:59:10 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -584,18 +584,6 @@ dumpsys(void)
static void
initcpu(void)
{
-
-#ifdef MAPPEDCOPY
- /*
- * Initialize lower bound for doing copyin/copyout using
- * page mapping (if not already set). We don't do this on
- * VAC machines as it loses big time.
- */
- if (ectype == EC_VIRT)
- mappedcopysize = -1; /* in case it was patched */
- else
- mappedcopysize = PAGE_SIZE;
-#endif
}
void
Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.111 src/sys/arch/next68k/next68k/machdep.c:1.112
--- src/sys/arch/next68k/next68k/machdep.c:1.111 Mon Mar 24 20:01:03 2014
+++ src/sys/arch/next68k/next68k/machdep.c Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.111 2014/03/24 20:01:03 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.112 2019/03/14 16:59:10 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2014/03/24 20:01:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2019/03/14 16:59:10 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -731,17 +731,6 @@ dumpsys(void)
void
initcpu(void)
{
-#ifdef MAPPEDCOPY
- /*
- * Initialize lower bound for doing copyin/copyout using
- * page mapping (if not already set). We don't do this on
- * VAC machines as it loses big time.
- */
- if (ectype == EC_VIRT)
- mappedcopysize = -1; /* in case it was patched */
- else
- mappedcopysize = PAGE_SIZE;
-#endif
}
void
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.193 src/sys/arch/x68k/conf/GENERIC:1.194
--- src/sys/arch/x68k/conf/GENERIC:1.193 Wed Feb 6 11:58:32 2019
+++ src/sys/arch/x68k/conf/GENERIC Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.193 2019/02/06 11:58:32 rin Exp $
+# $NetBSD: GENERIC,v 1.194 2019/03/14 16:59:10 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.193 $"
+#ident "GENERIC-$Revision: 1.194 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -49,7 +49,6 @@ options FPU_EMULATE # software fpu emu
options FPSP # floating point emulation for MC68040
options M060SP # int/fp emulation for MC68060
#options JUPITER # support for "Jupiter-X" accelerator
-#options MAPPEDCOPY # use page mapping for large copyin/copyout
#options ZSCONSOLE,ZSCN_SPEED="9600" # use serial console
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.117 src/sys/arch/x68k/conf/INSTALL:1.118
--- src/sys/arch/x68k/conf/INSTALL:1.117 Wed Dec 19 13:57:51 2018
+++ src/sys/arch/x68k/conf/INSTALL Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.117 2018/12/19 13:57:51 maxv Exp $
+# $NetBSD: INSTALL,v 1.118 2019/03/14 16:59:10 thorpej Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.117 $"
+#ident "INSTALL-$Revision: 1.118 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -42,7 +42,6 @@ options FPU_EMULATE # software fpu emu
options FPSP # floating point emulation for MC68040
options M060SP # int/fp emulation for MC68060
#options JUPITER # support for "Jupiter-X" accelerator
-#options MAPPEDCOPY # use page mapping for large copyin/copyout
#options ZSCONSOLE,ZSCN_SPEED="9600" # use serial console
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.197 src/sys/arch/x68k/x68k/machdep.c:1.198
--- src/sys/arch/x68k/x68k/machdep.c:1.197 Fri Sep 15 03:12:05 2017
+++ src/sys/arch/x68k/x68k/machdep.c Thu Mar 14 16:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.197 2017/09/15 03:12:05 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.198 2019/03/14 16:59:10 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.197 2017/09/15 03:12:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.198 2019/03/14 16:59:10 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -835,18 +835,6 @@ initcpu(void)
extern uint8_t fpfault;
#endif
-#ifdef MAPPEDCOPY
-
- /*
- * Initialize lower bound for doing copyin/copyout using
- * page mapping (if not already set). We don't do this on
- * VAC machines as it loses big time.
- */
- if ((int)mappedcopysize == -1) {
- mappedcopysize = PAGE_SIZE;
- }
-#endif
-
#if defined(M68060)
if (cputype == CPU_68060) {
#if defined(M060SP)
