diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index f74479335086..2630f26ac42b 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.84 2003/10/21 08:26:31 petrov Exp $ */
+/*	$NetBSD: autoconf.c,v 1.85 2003/11/09 16:41:52 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.84 2003/10/21 08:26:31 petrov Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.85 2003/11/09 16:41:52 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -266,7 +266,7 @@ bootpath_build()
 	register long chosen;
 	char buf[128];
 
-	bzero((void*)bootpath, sizeof(bootpath));
+	memset(bootpath, 0, sizeof(bootpath));
 	bp = bootpath;
 
 	/*
@@ -637,7 +637,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
 			continue;
 		if (strcmp(buf, "cpu") != 0)
 			continue;
-		bzero(&ma, sizeof(ma));
+		memset(&ma, 0, sizeof(ma));
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_node = node;
@@ -676,7 +676,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
 		if (sp != NULL)
 			continue; /* an "early" device already configured */
 
-		bzero(&ma, sizeof ma);
+		memset(&ma, 0, sizeof ma);
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_name = buf;
@@ -737,7 +737,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
 			free(ma.ma_address, M_DEVBUF);
 	}
 	/* Try to attach PROM console */
-	bzero(&ma, sizeof ma);
+	memset(&ma, 0, sizeof ma);
 	ma.ma_name = "pcons";
 	(void) config_found(dev, (void *)&ma, mbprint);
 }
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c
index 69d3188c6c23..c450b360f747 100644
--- a/sys/arch/sparc64/sparc64/disksubr.c
+++ b/sys/arch/sparc64/sparc64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.18 2003/07/15 03:36:08 lukem Exp $ */
+/*	$NetBSD: disksubr.c,v 1.19 2003/11/09 16:41:52 martin Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.18 2003/07/15 03:36:08 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.19 2003/11/09 16:41:52 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,7 +111,7 @@ readdisklabel(dev, strat, lp, clp)
 	error = biowait(bp);
 	if (error == 0) {
 		/* Save the whole block in case it has info we need. */
-		bcopy(bp->b_data, clp->cd_block, sizeof(clp->cd_block));
+		memcpy(clp->cd_block, bp->b_data, sizeof(clp->cd_block));
 	}
 	brelse(bp);
 	if (error)
@@ -132,7 +132,7 @@ readdisklabel(dev, strat, lp, clp)
 		return (disklabel_sun_to_bsd(clp->cd_block, lp));
 
 
-	bzero(clp->cd_block, sizeof(clp->cd_block));
+	memset(clp->cd_block, 0, sizeof(clp->cd_block));
 	return ("no disk label");
 }
 
@@ -202,7 +202,7 @@ writedisklabel(dev, strat, lp, clp)
 		return EFBIG;
 
 	slp = (struct sun_disklabel *)clp->cd_block;
-	bzero(slp->sl_bsdlabel, sizeof(slp->sl_bsdlabel));
+	memset(slp->sl_bsdlabel, 0, sizeof(slp->sl_bsdlabel));
 	dlp = (struct disklabel *)slp->sl_bsdlabel;
 	*dlp = *lp;
 
@@ -213,7 +213,7 @@ writedisklabel(dev, strat, lp, clp)
 
 	/* Get a buffer and copy the new label into it. */
 	bp = geteblk((int)lp->d_secsize);
-	bcopy(clp->cd_block, bp->b_data, sizeof(clp->cd_block));
+	memcpy(bp->b_data, clp->cd_block, sizeof(clp->cd_block));
 
 	/* Write out the updated label. */
 	bp->b_dev = dev;
diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c
index 041ab1a33c3a..404171ae8122 100644
--- a/sys/arch/sparc64/sparc64/intr.c
+++ b/sys/arch/sparc64/sparc64/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.46 2003/10/01 02:01:20 petrov Exp $ */
+/*	$NetBSD: intr.c,v 1.47 2003/11/09 16:41:52 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.46 2003/10/01 02:01:20 petrov Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.47 2003/11/09 16:41:52 martin Exp $");
 
 #include "opt_ddb.h"
 #include "pcons.h"
@@ -313,7 +313,7 @@ softintr_establish(level, fun, arg)
 	struct intrhand *ih;
 
 	ih = malloc(sizeof(*ih), M_DEVBUF, 0);
-	bzero(ih, sizeof(*ih));
+	memset(ih, 0, sizeof(*ih));
 	ih->ih_fun = (int (*) __P((void *)))fun;	/* XXX */
 	ih->ih_arg = arg;
 	ih->ih_pil = level;
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 45ca54d5ed64..4c55db5c1579 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.155 2003/10/30 21:02:55 matt Exp $ */
+/*	$NetBSD: machdep.c,v 1.156 2003/11/09 16:41:52 martin Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.155 2003/10/30 21:02:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.156 2003/11/09 16:41:52 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -358,7 +358,7 @@ setregs(l, pack, stack)
 		free((void *)fs, M_SUBPROC);
 		l->l_md.md_fpstate = NULL;
 	}
-	bzero((caddr_t)tf, sizeof *tf);
+	memset(tf, 0, sizeof *tf);
 	tf->tf_tstate = tstate;
 	tf->tf_global[1] = (vaddr_t)l->l_proc->p_psstr;
 	/* %g4 needs to point to the start of the data segment */
@@ -716,7 +716,7 @@ haltsys:
 		i = strlen(user_boot_string);
 		if (i > sizeof(str))
 			OF_boot(user_boot_string);	/* XXX */
-		bcopy(user_boot_string, str, i);
+		memcpy(str, user_boot_string, i);
 	} else {
 		i = 1;
 		str[0] = '\0';
@@ -1017,7 +1017,7 @@ _bus_dmamap_create(t, size, nsegments, maxsegsz, boundary, flags, dmamp)
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return (ENOMEM);
 
-	bzero(mapstore, mapsize);
+	memset(mapstore, 0, mapsize);
 	map = (struct sparc_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
diff --git a/sys/arch/sparc64/sparc64/mem.c b/sys/arch/sparc64/sparc64/mem.c
index c3ba4b7a2179..15e98b0ed17a 100644
--- a/sys/arch/sparc64/sparc64/mem.c
+++ b/sys/arch/sparc64/sparc64/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.29 2003/08/07 16:29:51 agc Exp $ */
+/*	$NetBSD: mem.c,v 1.30 2003/11/09 16:41:52 martin Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.29 2003/08/07 16:29:51 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.30 2003/11/09 16:41:52 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -267,7 +267,7 @@ mmrw(dev, uio, flags)
 			if (zeropage == NULL) {
 				zeropage = (caddr_t)
 				    malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
-				bzero(zeropage, PAGE_SIZE);
+				memset(zeropage, 0, PAGE_SIZE);
 			}
 			c = min(iov->iov_len, PAGE_SIZE);
 			error = uiomove(zeropage, c, uio);
diff --git a/sys/arch/sparc64/sparc64/netbsd32_machdep.c b/sys/arch/sparc64/sparc64/netbsd32_machdep.c
index 60865432a243..1793ec620e56 100644
--- a/sys/arch/sparc64/sparc64/netbsd32_machdep.c
+++ b/sys/arch/sparc64/sparc64/netbsd32_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.40 2003/10/26 08:05:27 christos Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.41 2003/11/09 16:41:53 martin Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.40 2003/10/26 08:05:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.41 2003/11/09 16:41:53 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -134,7 +134,7 @@ netbsd32_setregs(struct lwp *l, struct exec_package *pack, u_long stack)
 		free((void *)fs, M_SUBPROC);
 		l->l_md.md_fpstate = NULL;
 	}
-	bzero((caddr_t)tf, sizeof *tf);
+	memset(tf, 0, sizeof *tf);
 	tf->tf_tstate = tstate;
 	tf->tf_global[1] = (u_int)(u_long)p->p_psstr;
 	tf->tf_pc = pack->ep_entry & ~3;
@@ -650,7 +650,7 @@ cpu_coredump32(l, vp, cred, chdr)
 			md_core.md_fpstate.fs_queue[i] = 
 				l->l_md.md_fpstate->fs_queue[i];
 	} else
-		bzero((caddr_t)&md_core.md_fpstate, 
+		memset(&md_core.md_fpstate, 0,
 		      sizeof(md_core.md_fpstate));
 
 	CORE_SETMAGIC(cseg, CORESEGMAGIC, MID_MACHINE, CORE_CPU);
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index c29624e67567..d45a1d13fc00 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.148 2003/10/26 19:18:16 christos Exp $	*/
+/*	$NetBSD: pmap.c,v 1.149 2003/11/09 16:41:53 martin Exp $	*/
 /*
  * 
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.148 2003/10/26 19:18:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.149 2003/11/09 16:41:53 martin Exp $");
 
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -527,7 +527,7 @@ pmap_bootstrap(kernelstart, kernelend, maxctx)
 		prom_printf("no virtual-memory?");
 		OF_exit();
 	}
-	bzero((caddr_t)memlist, sizeof(memlist));
+	memset(memlist, 0, sizeof(memlist));
 	if (OF_getprop(vmemh, "available", memlist, sizeof(memlist)) <= 0) {
 		prom_printf("no vmemory avail?");
 		OF_exit();
@@ -700,8 +700,8 @@ remap_data:
 		prom_map_phys(newkp, sz, (vaddr_t)newkv, -1); 
 		BDPRINTF(PDB_BOOT1, ("Copying %ld bytes kernel data...",
 			kdsize));
-		bzero((void *)newkv, sz);
-		bcopy((void *)kdata, (void *)newkv, kdsize);
+		memset((void*)newkv, 0, sz);
+		memcpy((void*)newkv, (void*)kdata, kdsize);
 		BDPRINTF(PDB_BOOT1, ("done.  Swapping maps..unmap new\r\n"));
 		prom_unmap_virt((vaddr_t)newkv, sz);
 		BDPRINTF(PDB_BOOT, ("remap old "));
@@ -735,7 +735,7 @@ remap_data:
 	}
 	memsize = OF_getproplen(memh, "reg") + 2 * sizeof(struct mem_region);
 	valloc(mem, struct mem_region, memsize);
-	bzero((caddr_t)mem, memsize);
+	memset(mem, 0, memsize);
 	if (OF_getprop(memh, "reg", mem, memsize) <= 0) {
 		prom_printf("no memory installed?");
 		OF_exit();
@@ -823,7 +823,7 @@ remap_data:
 		prom_map_phys(newkp, ktsize, (vaddr_t)newkv, -1); 
 		BDPRINTF(PDB_BOOT1, ("Copying %ld bytes kernel text...",
 			ktsize));
-		bcopy((void *)ktext, (void *)newkv,
+		memcpy((void *)newkv, (void *)ktext,
 		    ktsize);
 		BDPRINTF(PDB_BOOT1, ("done.  Swapping maps..unmap new\r\n"));
 		prom_unmap_virt((vaddr_t)newkv, 4*MEG);
@@ -931,7 +931,7 @@ remap_data:
 	 */
 	sz = OF_getproplen(memh, "available") + sizeof(struct mem_region);
 	valloc(orig, struct mem_region, sz);
-	bzero((caddr_t)orig, sz);
+	memset(orig, 0, sz);
 	if (OF_getprop(memh, "available", orig, sz) <= 0) {
 		prom_printf("no available RAM?");
 		OF_exit();
@@ -948,7 +948,7 @@ remap_data:
 	}
 #endif
 	valloc(avail, struct mem_region, sz);
-	bzero((caddr_t)avail, sz);
+	memset(avail, 0, sz);
 	for (pcnt = 0, mp = orig, mp1 = avail; (mp1->size = mp->size);
 	    mp++, mp1++) {
 		mp1->start = mp->start;
@@ -960,7 +960,7 @@ remap_data:
 	 */
 	numctx = maxctx;
 	valloc(ctxbusy, paddr_t, CTXSIZE);
-	bzero((caddr_t)ctxbusy, CTXSIZE);
+	memset(ctxbusy, 0, CTXSIZE);
 	LIST_INIT(&pmap_ctxlist);
 
 	/*
@@ -985,9 +985,9 @@ remap_data:
 	BDPRINTF(PDB_BOOT, ("frobbed i, firstaddr before TSB=%x, %lx\r\n", 
 			    (int)i, (u_long)firstaddr));
 	valloc(tsb_dmmu, pte_t, TSBSIZE);
-	bzero(tsb_dmmu, TSBSIZE);
+	memset(tsb_dmmu, 0, TSBSIZE);
 	valloc(tsb_immu, pte_t, TSBSIZE);
-	bzero(tsb_immu, TSBSIZE);
+	memset(tsb_immu, 0, TSBSIZE);
 
 	BDPRINTF(PDB_BOOT1, ("firstaddr after TSB=%lx\r\n", (u_long)firstaddr));
 	BDPRINTF(PDB_BOOT1, ("TSB allocated at %p/%p size %08x\r\n",
@@ -1103,7 +1103,7 @@ remap_data:
 		 * Check whether some memory is left here.
 		 */
 		if (mp->size == 0) {
-			bcopy(mp + 1, mp,
+			memcpy(mp, mp + 1,
 			      (pcnt - (mp - avail)) * sizeof *mp);
 			pcnt--;
 			mp--;
@@ -1116,7 +1116,7 @@ remap_data:
 			if (s < mp1->start)
 				break;
 		if (mp1 < mp) {
-			bcopy(mp1, mp1 + 1, (char *)mp - (char *)mp1);
+			memcpy(mp1 + 1, mp1, (char *)mp - (char *)mp1);
 			mp1->start = s;
 			mp1->size = sz;
 		}
@@ -1338,7 +1338,7 @@ remap_data:
 		BDPRINTF(PDB_BOOT1, ("Initializing cpu_info\r\n"));
 
 		/* Initialize our cpu_info structure */
-		bzero((void *)intstk, 8*PAGE_SIZE);
+		memset((void*)intstk, 0, 8*PAGE_SIZE);
 		cpus->ci_next = NULL; /* Redundant, I know. */
 		cpus->ci_curlwp = &lwp0;
 		cpus->ci_cpcb = (struct pcb *)u0[0]; /* Need better source */
diff --git a/sys/arch/sparc64/sparc64/process_machdep.c b/sys/arch/sparc64/sparc64/process_machdep.c
index 6dbcabe435d3..b73c4ef2b614 100644
--- a/sys/arch/sparc64/sparc64/process_machdep.c
+++ b/sys/arch/sparc64/sparc64/process_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: process_machdep.c,v 1.15 2003/10/03 07:50:12 petrov Exp $ */
+/*	$NetBSD: process_machdep.c,v 1.16 2003/11/09 16:41:53 martin Exp $ */
 
 /*
  * Copyright (c) 1993 The Regents of the University of California.
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.15 2003/10/03 07:50:12 petrov Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.16 2003/11/09 16:41:53 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -213,7 +213,7 @@ process_read_fpregs(struct lwp *l, struct fpreg *regs)
 		/* NOTE: struct fpreg == struct fpstate */
 		if (l->l_md.md_fpstate)
 			statep = l->l_md.md_fpstate;
-		bcopy(statep, regs, sizeof(struct fpreg64));
+		memcpy(regs, statep, sizeof(struct fpreg64));
 		return 0;
 	}
 #endif
@@ -242,7 +242,7 @@ process_write_fpregs(struct lwp *l, struct fpreg *regs)
 			return EINVAL;
 
 		/* NOTE: struct fpreg == struct fpstate */
-		bcopy(regs, l->l_md.md_fpstate, sizeof(struct fpreg64));
+		memcpy(l->l_md.md_fpstate, regs, sizeof(struct fpreg64));
 		statep = l->l_md.md_fpstate;
 		statep->fs_qsize = 0;
 		return 0;
diff --git a/sys/arch/sparc64/sparc64/sunos32_machdep.c b/sys/arch/sparc64/sparc64/sunos32_machdep.c
index 50b032786389..9430a176cd3b 100644
--- a/sys/arch/sparc64/sparc64/sunos32_machdep.c
+++ b/sys/arch/sparc64/sparc64/sunos32_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos32_machdep.c,v 1.14 2003/10/26 08:05:27 christos Exp $	*/
+/*	$NetBSD: sunos32_machdep.c,v 1.15 2003/11/09 16:41:53 martin Exp $	*/
 /* from: NetBSD: sunos_machdep.c,v 1.14 2001/01/29 01:37:56 mrg Exp 	*/
 
 /*
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_machdep.c,v 1.14 2003/10/26 08:05:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_machdep.c,v 1.15 2003/11/09 16:41:53 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -147,7 +147,7 @@ sunos32_setregs(l, pack, stack)
 		free((void *)fs, M_SUBPROC);
 		l->l_md.md_fpstate = NULL;
 	}
-	bzero((caddr_t)tf, sizeof *tf);
+	memset(tf, 0, sizeof *tf);
 	tf->tf_tstate = tstate;
 	tf->tf_global[1] = (u_int)(u_long)p->p_psstr;
 	tf->tf_pc = pack->ep_entry & ~3;
diff --git a/sys/arch/sparc64/sparc64/svr4_32_machdep.c b/sys/arch/sparc64/sparc64/svr4_32_machdep.c
index 4bba0b1df6d7..f4b615a8d971 100644
--- a/sys/arch/sparc64/sparc64/svr4_32_machdep.c
+++ b/sys/arch/sparc64/sparc64/svr4_32_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_machdep.c,v 1.17 2003/10/26 08:05:27 christos Exp $	 */
+/*	$NetBSD: svr4_32_machdep.c,v 1.18 2003/11/09 16:41:53 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_machdep.c,v 1.17 2003/10/26 08:05:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_machdep.c,v 1.18 2003/11/09 16:41:53 martin Exp $");
 
 #ifndef _LKM
 #include "opt_ddb.h"
@@ -186,7 +186,7 @@ svr4_32_getmcontext(l, mc, flags)
 	 * Get the floating point registers
 	 */
 	/* Note: copies only pre-v9 floating point registers. */
-	bcopy(fps->fs_regs, f->fpu_regs, sizeof(f->fpu_regs));
+	memcpy(f->fpu_regs, fps->fs_regs, sizeof(f->fpu_regs));
 	f->fp_nqsize = sizeof(struct fp_qentry);
 	f->fp_nqel = fps->fs_qsize;
 	f->fp_fsr = fps->fs_fsr;
@@ -316,7 +316,7 @@ svr4_32_setmcontext(l, mc, flags)
 			return EINVAL;
 		}
 		/* Note: touches only pre-v9 floating point registers. */
-		bcopy(f->fpu_regs, fps->fs_regs, sizeof(f->fpu_regs));
+		memcpy(fps->fs_regs, f->fpu_regs, sizeof(f->fpu_regs));
 		fps->fs_qsize = f->fp_nqel;
 		fps->fs_fsr = f->fp_fsr;
 		if (f->fp_q != 0) {
diff --git a/sys/arch/sparc64/sparc64/svr4_machdep.c b/sys/arch/sparc64/sparc64/svr4_machdep.c
index 54f84d71c4a6..bab222310c16 100644
--- a/sys/arch/sparc64/sparc64/svr4_machdep.c
+++ b/sys/arch/sparc64/sparc64/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.34 2003/10/26 08:05:27 christos Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.35 2003/11/09 16:41:53 martin Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.34 2003/10/26 08:05:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.35 2003/11/09 16:41:53 martin Exp $");
 
 #ifndef _LKM
 #include "opt_ddb.h"
@@ -200,7 +200,7 @@ svr4_getmcontext(l, mc, flags)
 	/*
 	 * Get the floating point registers
 	 */
-	bcopy(fps->fs_regs, f->fpu_regs, sizeof(f->fpu_regs));
+	memcpy(f->fpu_regs, fps->fs_regs, sizeof(f->fpu_regs));
 	f->fp_nqsize = sizeof(struct fp_qentry);
 	f->fp_nqel = fps->fs_qsize;
 	f->fp_fsr = fps->fs_fsr;
@@ -339,7 +339,7 @@ svr4_setmcontext(l, mc, flags)
 			return EINVAL;
 		}
 		/* Note: only copy as much FP registers as in the mcontext. */
-		bcopy(f->fpu_regs, fps->fs_regs, sizeof(f->fpu_regs));
+		memcpy(fps->fs_regs, f->fpu_regs, sizeof(f->fpu_regs));
 		fps->fs_qsize = f->fp_nqel;
 		fps->fs_fsr = f->fp_fsr;
 		if (f->fp_q != NULL) {
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index ac4d7deefd29..87fc8b4dd1b2 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.100 2003/11/04 14:24:25 pk Exp $ */
+/*	$NetBSD: trap.c,v 1.101 2003/11/09 16:41:53 martin Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.100 2003/11/04 14:24:25 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.101 2003/11/09 16:41:53 martin Exp $");
 
 #define NEW_FPSTATE
 
@@ -2036,7 +2036,7 @@ syscall(tf, code, pc)
 				       (i - nap) * sizeof(register64_t));
 			i = nap;
 		}
-		/* It should be faster to do <=6 longword copies than call bcopy */
+		/* It should be faster to do <=6 longword copies than call memcpy */
 		for (argp = &args.l[0]; i--;) 
 			*argp++ = *ap++;
 		
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index ca1f3170cfe5..922d18faf147 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.50 2003/07/15 03:36:11 lukem Exp $ */
+/*	$NetBSD: vm_machdep.c,v 1.51 2003/11/09 16:41:53 martin Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.50 2003/07/15 03:36:11 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.51 2003/11/09 16:41:53 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -246,7 +246,7 @@ cpu_lwp_fork(l1, l2, stack, stacksize, func, arg)
 #else
 	opcb->lastcall = NULL;
 #endif
-	bcopy((caddr_t)opcb, (caddr_t)npcb, sizeof(struct pcb));
+	memcpy(npcb, opcb, sizeof(struct pcb));
        	if (l1->l_md.md_fpstate) {
 		if (l1 == fplwp) {
 			savefpstate(l1->l_md.md_fpstate);
@@ -254,7 +254,7 @@ cpu_lwp_fork(l1, l2, stack, stacksize, func, arg)
 		}
 		l2->l_md.md_fpstate = malloc(sizeof(struct fpstate64),
 		    M_SUBPROC, M_WAITOK);
-		bcopy(l1->l_md.md_fpstate, l2->l_md.md_fpstate,
+		memcpy(l2->l_md.md_fpstate, l1->l_md.md_fpstate,
 		    sizeof(struct fpstate64));
 	} else
 		l2->l_md.md_fpstate = NULL;
@@ -448,7 +448,7 @@ cpu_coredump(l, vp, cred, chdr)
 		}
 		md_core.md_fpstate = *l->l_md.md_fpstate;
 	} else
-		bzero((caddr_t)&md_core.md_fpstate, 
+		memset(&md_core.md_fpstate, 0,
 		      sizeof(md_core.md_fpstate));
 
 	CORE_SETMAGIC(cseg, CORESEGMAGIC, MID_MACHINE, CORE_CPU);