From 97d7c635b0972849afaf5cdb721ec2233e29be99 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Thu, 12 Jul 2001 23:35:42 +0000
Subject: [PATCH] bcopy -> memcpy

---
 sys/arch/alpha/a12/if_ade.c              | 39 ++++++++++++------------
 sys/arch/alpha/a12/if_xb.c               | 20 ++++++------
 sys/arch/alpha/alpha/autoconf.c          |  6 ++--
 sys/arch/alpha/alpha/compat_13_machdep.c |  6 ++--
 sys/arch/alpha/alpha/machdep.c           | 12 ++++----
 sys/arch/alpha/alpha/process_machdep.c   |  8 ++---
 sys/arch/alpha/alpha/prom.c              |  8 ++---
 sys/arch/alpha/alpha/trap.c              |  6 ++--
 sys/arch/alpha/alpha/vm_machdep.c        |  6 ++--
 sys/arch/alpha/common/sgmap_typedep.c    |  6 ++--
 sys/arch/alpha/tc/tc_dma_3000_500.c      |  6 ++--
 11 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/sys/arch/alpha/a12/if_ade.c b/sys/arch/alpha/a12/if_ade.c
index 1ce86ff9f5a4..26293585d76a 100644
--- a/sys/arch/alpha/a12/if_ade.c
+++ b/sys/arch/alpha/a12/if_ade.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ade.c,v 1.11 2001/07/12 23:26:30 thorpej Exp $	*/
+/*	$NetBSD: if_ade.c,v 1.12 2001/07/12 23:35:42 thorpej Exp $	*/
 
 /*
  * NOTE: this version of if_de was modified for bounce buffers prior
@@ -267,7 +267,7 @@ static void a12r2pb(void *vsrc, void *vdst, int len) {
 		 */
 		if(offset)
 			bounce[0] = dst[0];
-		bcopy(src,(int8_t *)bounce+offset,t);
+		memcpy((int8_t *)bounce+offset,src,t);
 		for(i=llw; i>=0; --i) {	/* reverse so d_status is last */
 			alpha_mb();
 			dst[i] = bounce[i];
@@ -292,7 +292,7 @@ static void a12r2pb(void *vsrc, void *vdst, int len) {
 	alpha_wmb();
 }
 
-#define BEGIN(p) do { tulip_desc_t t; bcopy((p),&t,sizeof(t))
+#define BEGIN(p) do { tulip_desc_t t; memcpy(&t,(p),sizeof(t))
 #define	END(p)			   a12r2pb(&t,(p),sizeof(t)); } while(0)
 
 static void setstatus(tulip_desc_t *t, u_int32_t val) {
@@ -374,8 +374,8 @@ tulip_txprobe(
     /*
      * Construct a LLC TEST message which will point to ourselves.
      */
-    bcopy(sc->tulip_enaddr, mtod(m, struct ether_header *)->ether_dhost, 6);
-    bcopy(sc->tulip_enaddr, mtod(m, struct ether_header *)->ether_shost, 6);
+    memcpy(mtod(m, struct ether_header *)->ether_dhost, sc->tulip_enaddr, 6);
+    memcpy(mtod(m, struct ether_header *)->ether_shost, sc->tulip_enaddr, 6);
     mtod(m, struct ether_header *)->ether_type = htons(3);
     mtod(m, unsigned char *)[14] = 0;
     mtod(m, unsigned char *)[15] = 0;
@@ -2134,7 +2134,7 @@ tulip_identify_dec_nic(
 	return;
     if (memcmp(sc->tulip_rombuf + 29, "DE500", 5) == 0
 	|| memcmp(sc->tulip_rombuf + 29, "DE450", 5) == 0) {
-	bcopy(sc->tulip_rombuf + 29, &sc->tulip_boardid[D0], 8);
+	memcpy(&sc->tulip_boardid[D0], sc->tulip_rombuf + 29, 8);
 	sc->tulip_boardid[D0+8] = ' ';
     }
 #undef D0
@@ -2382,7 +2382,7 @@ tulip_srom_decode(
     /*
      * Save the hardware address.
      */
-    bcopy((caddr_t) shp->sh_ieee802_address, (caddr_t) sc->tulip_enaddr, 6);
+    memcpy((caddr_t) sc->tulip_enaddr, (caddr_t) shp->sh_ieee802_address, 6);
     /*
      * If this is a multiple port card, add the adapter index to the last
      * byte of the hardware address.  (if it isn't multiport, adding 0
@@ -2803,7 +2803,7 @@ tulip_read_macaddr(
 #if 0
 		printf("ade%d: Warning: reinit srom! Old Avalon format!",
 			cf->cf_unit);
-		bcopy(sc->tulip_rombuf + 4, sc->tulip_enaddr, 6);
+		memcpy(sc->tulip_enaddr, sc->tulip_rombuf + 4, 6);
 		sc->tulip_flags |= TULIP_ROMOK;
 		goto check_oui;
 #endif
@@ -2828,7 +2828,7 @@ tulip_read_macaddr(
 	if (sc->tulip_rombuf[0] == 0 && sc->tulip_rombuf[1] == 0
 		&& sc->tulip_rombuf[2] == 0)
 	    return -4;
-	bcopy(sc->tulip_rombuf, sc->tulip_enaddr, 6);
+	memcpy(sc->tulip_enaddr, sc->tulip_rombuf, 6);
 	sc->tulip_flags |= TULIP_ROMOK;
 	goto check_oui;
     } else {
@@ -2862,12 +2862,12 @@ tulip_read_macaddr(
 		sc->tulip_boardsw = root_sc->tulip_boardsw;
 		strcpy(sc->tulip_boardid, root_sc->tulip_boardid);
 		if (sc->tulip_boardsw->bd_type == TULIP_21140_ISV) {
-		    bcopy(root_sc->tulip_rombuf, sc->tulip_rombuf,
+		    memcpy(sc->tulip_rombuf, root_sc->tulip_rombuf,
 			  sizeof(sc->tulip_rombuf));
 		    if (!tulip_srom_decode(sc))
 			return -5;
 		} else {
-		    bcopy(root_sc->tulip_enaddr, sc->tulip_enaddr, 6);
+		    memcpy(sc->tulip_enaddr, root_sc->tulip_enaddr, 6);
 		    sc->tulip_enaddr[5] += sc->tulip_unit - root_sc->tulip_unit;
 		}
 		/*
@@ -2901,7 +2901,7 @@ tulip_read_macaddr(
     if (memcmp(&sc->tulip_rombuf[0], tmpbuf, 8) != 0)
 	return -2;
 
-    bcopy(sc->tulip_rombuf, sc->tulip_enaddr, 6);
+    memcpy(sc->tulip_enaddr, sc->tulip_rombuf, 6);
 
     cksum = *(u_int16_t *) &sc->tulip_enaddr[0];
     cksum *= 2;
@@ -3958,9 +3958,9 @@ tulip_ifioctl(
 			ina->x_host = *(union ns_host *)(sc->tulip_enaddr);
 		    } else {
 			ifp->if_flags &= ~IFF_RUNNING;
-			bcopy((caddr_t)ina->x_host.c_host,
-			      (caddr_t)sc->tulip_enaddr,
-			      sizeof(sc->tulip_enaddr));
+			memcpy((caddr_t)sc->tulip_enaddr,
+			    (caddr_t)ina->x_host.c_host,
+			    sizeof(sc->tulip_enaddr));
 		    }
 		    tulip_init(sc);
 		    break;
@@ -3975,9 +3975,8 @@ tulip_ifioctl(
 	    break;
 	}
 	case SIOCGIFADDR: {
-	    bcopy((caddr_t) sc->tulip_enaddr,
-		  (caddr_t) ((struct sockaddr *)&ifr->ifr_data)->sa_data,
-		  6);
+	    memcpy((caddr_t) ((struct sockaddr *)&ifr->ifr_data)->sa_data,
+		(caddr_t) sc->tulip_enaddr, 6);
 	    break;
 	}
 
@@ -4102,7 +4101,7 @@ tulip_ifstart(
 		ifp->if_flags |= IFF_OACTIVE;
 		return;
 	    }
-	    bcopy(sc->tulip_setupdata, sc->tulip_setupbuf,
+	    memcpy(sc->tulip_setupbuf, sc->tulip_setupdata,
 		   sizeof(sc->tulip_setupdata));
 	    sc->tulip_flags &= ~TULIP_WANTSETUP;
 	    sc->tulip_flags |= TULIP_DOINGSETUP;
@@ -5149,7 +5148,7 @@ tulip_pci_attach(
 
 
 #if defined(__NetBSD__)
-    bcopy(self->dv_xname, sc->tulip_if.if_xname, IFNAMSIZ);
+    strcpy(sc->tulip_if.if_xname, self->dv_xname);
     sc->tulip_if.if_softc = sc;
     sc->tulip_pc = pa->pa_pc;
 #else
diff --git a/sys/arch/alpha/a12/if_xb.c b/sys/arch/alpha/a12/if_xb.c
index 6b584783ffbf..90c28f6cbeda 100644
--- a/sys/arch/alpha/a12/if_xb.c
+++ b/sys/arch/alpha/a12/if_xb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xb.c,v 1.7 2001/06/14 05:44:28 itojun Exp $ */
+/* $NetBSD: if_xb.c,v 1.8 2001/07/12 23:35:42 thorpej Exp $ */
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -74,7 +74,7 @@
 #include "opt_avalon_a12.h"		/* Config options headers */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.7 2001/06/14 05:44:28 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.8 2001/07/12 23:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -230,11 +230,11 @@ xbattach(parent, self, aux)
 {
 	struct xb_config *ccp;
 
-	bcopy(self->dv_xname, xbi.if_xname, IFNAMSIZ);
+	strcpy(xbi.if_xname, self->dv_xname);
 	xbfound = 1;
 	ccp = &xb_configuration;
 	xb_init_config(ccp, 1);
-	printf(": driver %s mtu %d\n", "$Revision: 1.7 $", xbi.if_mtu);
+	printf(": driver %s mtu %d\n", "$Revision: 1.8 $", xbi.if_mtu);
 }
 
 static void
@@ -552,10 +552,10 @@ xb_output(ifp, m0, dst, rt0)
 		xbaddr = (lladdr[i] & 0xff) - 1;
 		if (!(0 <= xbaddr && xbaddr <= 11))	/* XXX */
 			DIE();		/* 12 or 13 will be OK later */
-		bcopy(&channel[xbaddr].lo64, xbh, 16);
+		memcpy(xbh, &channel[xbaddr].lo64, 16);
 		xbh += 16;
 	}
-	bcopy(&xbo_framesize, xbh, 8);
+	memcpy(xbh, &xbo_framesize, 8);
 	s = splnet();
 	if (IF_QFULL(&ifp->if_snd)) {
 		IF_DROP(&ifp->if_snd);
@@ -674,14 +674,14 @@ restart:
 		/* See function intro comment regarding padding */
 		if (leftover_len + len < sizeof leftover) {
 			/* Heh, not even enough to write out */
-			bcopy(blk, XFERADJ(), len);
+			memcpy(XFERADJ(), blk, len);
 			leftover_len += len;
 			return 1;
 		}
 		xfertmp[0] = leftover[0];
 		xfertmp[1] = leftover[1];
 		fillin = sizeof leftover - leftover_len;
-		bcopy(blk, XFERADJ(), fillin);
+		memcpy(XFERADJ(), blk, fillin);
 		blk += fillin;
 		len -= fillin;
 		xb_mcrp_write(xfertmp, 1, 0);
@@ -700,7 +700,7 @@ restart:
 			full = 1;
 		}
 		frag_len &= ~0xf;
-		bcopy(blk, xfertmp, frag_len);
+		memcpy(xfertmp, blk, frag_len);
 		frag_len >>= 4;		/* Round down to switch word size */
 		xb_mcrp_write(xfertmp, frag_len, 0);
 		fifo_free -= frag_len;
@@ -712,7 +712,7 @@ restart:
 			goto restart;
 		}
 	}
-	bcopy(blk, leftover, len);
+	memcpy(leftover, blk, len);
 	leftover_len = len;
 	return 1;
 }
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index a09b4ea08a7d..21da34594dd5 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.37 2000/06/03 20:47:36 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.38 2001/07/12 23:35:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.37 2000/06/03 20:47:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.38 2001/07/12 23:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -121,7 +121,7 @@ parse_prom_bootdev()
 	booted_partition = 0;
 	bootdev_data = NULL;
 
-	bcopy(bootinfo.booted_dev, hacked_boot_dev,
+	memcpy(hacked_boot_dev, bootinfo.booted_dev,
 	    min(sizeof bootinfo.booted_dev, sizeof hacked_boot_dev));
 #if 0
 	printf("parse_prom_bootdev: boot dev = \"%s\"\n", hacked_boot_dev);
diff --git a/sys/arch/alpha/alpha/compat_13_machdep.c b/sys/arch/alpha/alpha/compat_13_machdep.c
index 545ca5bff4f6..a0b591f94670 100644
--- a/sys/arch/alpha/alpha/compat_13_machdep.c
+++ b/sys/arch/alpha/alpha/compat_13_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_machdep.c,v 1.9 2000/12/22 22:58:52 jdolecek Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.10 2001/07/12 23:35:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.9 2000/12/22 22:58:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.10 2001/07/12 23:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +94,7 @@ compat_13_sys_sigreturn(p, v, retval)
 	/* XXX ksc.sc_ownedfp ? */
 	if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
 		fpusave_proc(p, 0);
-	bcopy((struct fpreg *)ksc.sc_fpregs, &p->p_addr->u_pcb.pcb_fp,
+	memcpy(&p->p_addr->u_pcb.pcb_fp, (struct fpreg *)ksc.sc_fpregs,
 	    sizeof(struct fpreg));
 	/* XXX ksc.sc_fp_control ? */
 
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 2bf0ea398612..f4919e451522 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.246 2001/07/12 23:25:39 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.247 2001/07/12 23:35:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.246 2001/07/12 23:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.247 2001/07/12 23:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -282,10 +282,10 @@ alpha_init(pfn, ptb, bim, bip, biv)
 				bootinfo.hwrpb_size =
 				    ((struct rpb *)HWRPB_ADDR)->rpb_size;
 			}
-			bcopy(v1p->boot_flags, bootinfo.boot_flags,
+			memcpy(bootinfo.boot_flags, v1p->boot_flags,
 			    min(sizeof v1p->boot_flags,
 			      sizeof bootinfo.boot_flags));
-			bcopy(v1p->booted_kernel, bootinfo.booted_kernel,
+			memcpy(bootinfo.booted_kernel, v1p->booted_kernel,
 			    min(sizeof v1p->booted_kernel,
 			      sizeof bootinfo.booted_kernel));
 			/* booted dev not provided in bootinfo */
@@ -1541,7 +1541,7 @@ sendsig(catcher, sig, mask, code)
 	if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
 		fpusave_proc(p, 1);
 	ksc.sc_ownedfp = p->p_md.md_flags & MDP_FPUSED;
-	bcopy(&p->p_addr->u_pcb.pcb_fp, (struct fpreg *)ksc.sc_fpregs,
+	memcpy((struct fpreg *)ksc.sc_fpregs, &p->p_addr->u_pcb.pcb_fp,
 	    sizeof(struct fpreg));
 	ksc.sc_fp_control = alpha_read_fp_c(p);
 	memset(ksc.sc_reserved, 0, sizeof ksc.sc_reserved);	/* XXX */
@@ -1668,7 +1668,7 @@ sys___sigreturn14(p, v, retval)
 	/* XXX ksc.sc_ownedfp ? */
 	if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
 		fpusave_proc(p, 0);
-	bcopy((struct fpreg *)ksc.sc_fpregs, &p->p_addr->u_pcb.pcb_fp,
+	memcpy(&p->p_addr->u_pcb.pcb_fp, (struct fpreg *)ksc.sc_fpregs,
 	    sizeof(struct fpreg));
 	p->p_addr->u_pcb.pcb_fp.fpr_cr = ksc.sc_fpcr;
 	p->p_md.md_flags = ksc.sc_fp_control & MDP_FP_C;
diff --git a/sys/arch/alpha/alpha/process_machdep.c b/sys/arch/alpha/alpha/process_machdep.c
index e5490a2aaaee..be45029b47ae 100644
--- a/sys/arch/alpha/alpha/process_machdep.c
+++ b/sys/arch/alpha/alpha/process_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.17 2001/01/04 04:42:59 itojun Exp $ */
+/* $NetBSD: process_machdep.c,v 1.18 2001/07/12 23:35:43 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -54,7 +54,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.17 2001/01/04 04:42:59 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.18 2001/07/12 23:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,7 +119,7 @@ process_read_fpregs(struct proc *p, struct fpreg *regs)
 	if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
 		fpusave_proc(p, 1);
 
-	bcopy(process_fpframe(p), regs, sizeof(struct fpreg));
+	memcpy(regs, process_fpframe(p), sizeof(struct fpreg));
 	return (0);
 }
 
@@ -130,6 +130,6 @@ process_write_fpregs(struct proc *p, struct fpreg *regs)
 	if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
 		fpusave_proc(p, 0);
 
-	bcopy(regs, process_fpframe(p), sizeof(struct fpreg));
+	memcpy(process_fpframe(p), regs, sizeof(struct fpreg));
 	return (0);
 }
diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c
index 99a5e30d8af9..c9e281ad5ee5 100644
--- a/sys/arch/alpha/alpha/prom.c
+++ b/sys/arch/alpha/alpha/prom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.41 2001/01/03 22:15:38 thorpej Exp $ */
+/* $NetBSD: prom.c,v 1.42 2001/07/12 23:35:43 thorpej Exp $ */
 
 /* 
  * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
@@ -27,7 +27,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.41 2001/01/03 22:15:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.42 2001/07/12 23:35:43 thorpej Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -248,7 +248,7 @@ prom_getenv(int id, char *buf, int len)
 
 	s = prom_enter();
 	ret.bits = prom_getenv_disp(id, to, len);
-	bcopy(to, buf, len);
+	memcpy(buf, to, len);
 	prom_leave(s);
 
 	if (ret.u.status & 0x4)
@@ -307,7 +307,7 @@ hwrpb_primary_init(void)
 	p = LOCATE_PCS(hwrpb, hwrpb->rpb_primary_cpu_id);
 
 	/* Initialize the primary's HWPCB and the Virtual Page Table Base. */
-	bcopy(&proc0.p_addr->u_pcb.pcb_hw, p->pcs_hwpcb,
+	memcpy(p->pcs_hwpcb, &proc0.p_addr->u_pcb.pcb_hw,
 	    sizeof proc0.p_addr->u_pcb.pcb_hw);
 	hwrpb->rpb_vptb = VPTBASE;
 
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index 7234b18e0482..ae6156c40dcf 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.73 2001/06/26 17:29:28 thorpej Exp $ */
+/* $NetBSD: trap.c,v 1.74 2001/07/12 23:35:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.73 2001/06/26 17:29:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.74 2001/07/12 23:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -252,7 +252,7 @@ trap(const u_long a0, const u_long a1, const u_long a2, const u_long entry,
 		 *
 		 * It's an error if a copy fault handler is set because
 		 * the various routines which do user-initiated copies
-		 * do so in a bcopy-like manner.  In other words, the
+		 * do so in a memcpy-like manner.  In other words, the
 		 * kernel never assumes that pointers provided by the
 		 * user are properly aligned, and so if the kernel
 		 * does cause an unaligned access it's a kernel bug.
diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index 9d8ca0d77b1d..8165d15f9ca2 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.69 2001/07/12 23:25:39 thorpej Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.70 2001/07/12 23:35:43 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.69 2001/07/12 23:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.70 2001/07/12 23:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -194,7 +194,7 @@ cpu_fork(struct proc *p1, struct proc *p2, void *stack, size_t stacksize,
 		 */
 		p2tf = p2->p_md.md_tf = (struct trapframe *)
 		    ((char *)p2->p_addr + USPACE - sizeof(struct trapframe));
-		bcopy(p1->p_md.md_tf, p2->p_md.md_tf,
+		memcpy(p2->p_md.md_tf, p1->p_md.md_tf,
 		    sizeof(struct trapframe));
 
 		/*
diff --git a/sys/arch/alpha/common/sgmap_typedep.c b/sys/arch/alpha/common/sgmap_typedep.c
index 248c3d049baf..995167b23b8b 100644
--- a/sys/arch/alpha/common/sgmap_typedep.c
+++ b/sys/arch/alpha/common/sgmap_typedep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap_typedep.c,v 1.15 2001/07/12 23:25:40 thorpej Exp $ */
+/* $NetBSD: sgmap_typedep.c,v 1.16 2001/07/12 23:35:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-__KERNEL_RCSID(0, "$NetBSD: sgmap_typedep.c,v 1.15 2001/07/12 23:25:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap_typedep.c,v 1.16 2001/07/12 23:35:43 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -216,7 +216,7 @@ __C(SGMAP_TYPE,_load)(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
 #ifdef SGMAP_LOG
 	if (panicstr == NULL) {
 		sl.sl_ptecnt = map->_dm_ptecnt;
-		bcopy(&sl, &__C(SGMAP_TYPE,_log)[__C(SGMAP_TYPE,_log_next)],
+		memcpy(&__C(SGMAP_TYPE,_log)[__C(SGMAP_TYPE,_log_next)], &sl,
 		    sizeof(sl));
 		__C(SGMAP_TYPE,_log_last) = __C(SGMAP_TYPE,_log_next);
 		if (++__C(SGMAP_TYPE,_log_next) == SGMAP_LOGSIZE)
diff --git a/sys/arch/alpha/tc/tc_dma_3000_500.c b/sys/arch/alpha/tc/tc_dma_3000_500.c
index 88bb2bf6d260..4d79511a28c3 100644
--- a/sys/arch/alpha/tc/tc_dma_3000_500.c
+++ b/sys/arch/alpha/tc/tc_dma_3000_500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_500.c,v 1.11 2001/07/12 23:25:41 thorpej Exp $ */
+/* $NetBSD: tc_dma_3000_500.c,v 1.12 2001/07/12 23:35:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.11 2001/07/12 23:25:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.12 2001/07/12 23:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,7 +102,7 @@ tc_dma_init_3000_500(nslots)
 
 	/* Default all slots to direct-mapped. */
 	for (i = 0; i < nslots; i++)
-		bcopy(&tc_dmat_direct, &tc_dma_slot_info[i].tdsi_dmat,
+		memcpy(&tc_dma_slot_info[i].tdsi_dmat, &tc_dmat_direct,
 		    sizeof(tc_dma_slot_info[i].tdsi_dmat));
 }