From dfc0d8e7d576d43109754b012b2141ac251ccc85 Mon Sep 17 00:00:00 2001
From: matthias <matthias@NetBSD.org>
Date: Sat, 12 Sep 1998 19:14:58 +0000
Subject: [PATCH] {bzero, bcopy} -> {memset, memcpy} add -DINSECURE to
 stand/Makefile.inc

---
 sys/arch/pc532/dev/lpt.c               |  8 ++++----
 sys/arch/pc532/fpu/ieee_handler.c      |  4 ++--
 sys/arch/pc532/pc532/machdep.c         | 10 +++++-----
 sys/arch/pc532/pc532/mem.c             |  4 ++--
 sys/arch/pc532/pc532/pmap.c            | 10 +++++-----
 sys/arch/pc532/pc532/process_machdep.c |  6 +++---
 sys/arch/pc532/stand/Makefile.inc      |  4 ++--
 sys/arch/pc532/stand/common/machdep.c  |  6 +++---
 sys/arch/pc532/stand/common/sd.c       |  4 ++--
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/sys/arch/pc532/dev/lpt.c b/sys/arch/pc532/dev/lpt.c
index 504b30a94aaa..ce8cf9556635 100644
--- a/sys/arch/pc532/dev/lpt.c
+++ b/sys/arch/pc532/dev/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.27 1998/08/15 03:02:41 mycroft Exp $	*/
+/*	$NetBSD: lpt.c,v 1.28 1998/09/12 19:14:58 matthias Exp $	*/
 
 /*
  * Copyright (c) 1994 Matthias Pfaller.
@@ -521,7 +521,7 @@ plipattach(sc, unit)
 
 	sc->sc_ifbuf = NULL;
 	sprintf(ifp->if_xname, "plip%d", unit);
-	bzero(myaddr, sizeof(myaddr));
+	memset(myaddr, 0, sizeof(myaddr));
 	ifp->if_softc = sc;
 	ifp->if_start = plipstart;
 	ifp->if_ioctl = plipioctl;
@@ -593,8 +593,8 @@ plipioctl(ifp, cmd, data)
 					       M_DEVBUF, M_WAITOK);
 			LLADDR(sdl)[0] = 0xfc;
 			LLADDR(sdl)[1] = 0xfc;
-			bcopy((caddr_t)&IA_SIN(ifa)->sin_addr,
-			      (caddr_t)&LLADDR(sdl)[2], 4);
+			memcpy((caddr_t)&LLADDR(sdl)[2],
+				(caddr_t)&IA_SIN(ifa)->sin_addr, 4);
 #if defined(COMPAT_PLIP10)
 			if (ifp->if_flags & IFF_LINK0) {
 				int i;
diff --git a/sys/arch/pc532/fpu/ieee_handler.c b/sys/arch/pc532/fpu/ieee_handler.c
index 292cd41c401f..a91804b54c2c 100644
--- a/sys/arch/pc532/fpu/ieee_handler.c
+++ b/sys/arch/pc532/fpu/ieee_handler.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee_handler.c,v 1.9 1998/09/02 19:17:12 matthias Exp $	*/
+/*	$NetBSD: ieee_handler.c,v 1.10 1998/09/12 19:14:58 matthias Exp $	*/
 
 /* 
  * IEEE floating point support for NS32081 and NS32381 fpus.
@@ -355,7 +355,7 @@ static void store_result(struct operand *op)
   }
   else {
     /* Register */
-    bcopy((char *) &op->data, (char *)op->where.addr, op->size);
+    memcpy((char *)op->where.addr, (char *) &op->data, op->size);
   }
 }
 
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index 51fc1d10e0ce..c0f21cbf7be9 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.86 1998/09/02 19:17:16 matthias Exp $	*/
+/*	$NetBSD: machdep.c,v 1.87 1998/09/12 19:14:59 matthias Exp $	*/
 
 /*-
  * Copyright (c) 1996 Matthias Pfaller.
@@ -996,14 +996,14 @@ setregs(p, pack, stack)
 	if (p == fpu_proc)
 		fpu_proc = 0;
 
-	bzero(r, sizeof(*r));
+	memset(r, 0, sizeof(*r));
 	r->r_sp  = stack;
 	r->r_pc  = pack->ep_entry;
 	r->r_psr = PSL_USERSET;
 	r->r_r7  = (int)PS_STRINGS;
 
 	pcbp->pcb_fsr = FPC_UEN;
-	bzero(pcbp->pcb_freg, sizeof(pcbp->pcb_freg));
+	memset(pcbp->pcb_freg, 0, sizeof(pcbp->pcb_freg));
 }
 
 /*
@@ -1015,7 +1015,7 @@ alloc_pages(pages)
 {
 	paddr_t p = avail_start;
 	avail_start += pages * NBPG;
-	bzero((caddr_t) p, pages * NBPG);
+	memset((caddr_t) p, 0, pages * NBPG);
 	return(p);
 }
 
@@ -1357,7 +1357,7 @@ cpu_reset()
 	lprd(sp, 0x2000);
 
 	/* Copy start of ROM. */
-	bcopy((void *)0x10000000, (void *)0, 0x1f00);
+	memcpy((void *)0, (void *)0x10000000, 0x1f00);
 
 	/* Jump into ROM copy. */
 	__asm __volatile("jump @0");
diff --git a/sys/arch/pc532/pc532/mem.c b/sys/arch/pc532/pc532/mem.c
index cfa0a5b07234..3e62027fa6c2 100644
--- a/sys/arch/pc532/pc532/mem.c
+++ b/sys/arch/pc532/pc532/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.17 1998/09/02 19:17:17 matthias Exp $	*/
+/*	$NetBSD: mem.c,v 1.18 1998/09/12 19:14:59 matthias Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -176,7 +176,7 @@ mmrw(dev, uio, flags)
 			if (zeropage == NULL) {
 				zeropage = (caddr_t)
 				    malloc(CLBYTES, M_TEMP, M_WAITOK);
-				bzero(zeropage, CLBYTES);
+				memset(zeropage, 0, CLBYTES);
 			}
 			c = min(iov->iov_len, CLBYTES);
 			error = uiomove(zeropage, c, uio);
diff --git a/sys/arch/pc532/pc532/pmap.c b/sys/arch/pc532/pc532/pmap.c
index 9c0a85329b30..56c21c68bee8 100644
--- a/sys/arch/pc532/pc532/pmap.c
+++ b/sys/arch/pc532/pc532/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.29 1998/09/02 19:17:17 matthias Exp $	*/
+/*	$NetBSD: pmap.c,v 1.30 1998/09/12 19:14:59 matthias Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -748,7 +748,7 @@ pmap_create(size)
 		return NULL;
 
 	pmap = (pmap_t) malloc(sizeof *pmap, M_VMPMAP, M_WAITOK);
-	bzero(pmap, sizeof(*pmap));
+	memset(pmap, 0, sizeof(*pmap));
 	pmap_pinit(pmap);
 	return pmap;
 }
@@ -1673,7 +1673,7 @@ pmap_dump_pvlist(phys, m)
 
 /*
  *	pmap_zero_page zeros the specified by mapping it into
- *	virtual memory and using bzero to clear its contents.
+ *	virtual memory and using memset to clear its contents.
  */
 void
 pmap_zero_page(phys)
@@ -1688,12 +1688,12 @@ pmap_zero_page(phys)
 	pmap_dump_pvlist(phys, "pmap_zero_page: phys");
 	*CMAP2 = (phys & PG_FRAME) | PG_V | PG_KW /*| PG_N*/;
 	tlbflush_entry(CADDR2);
-	bzero(CADDR2, NBPG);
+	memset(CADDR2, 0, NBPG);
 }
 
 /*
  *	pmap_copy_page copies the specified page by mapping
- *	it into virtual memory and using bcopy to copy its
+ *	it into virtual memory and using movsdnu to copy its
  *	contents.
  */
 void
diff --git a/sys/arch/pc532/pc532/process_machdep.c b/sys/arch/pc532/pc532/process_machdep.c
index 06812b10340b..6a00fd2bbaff 100644
--- a/sys/arch/pc532/pc532/process_machdep.c
+++ b/sys/arch/pc532/pc532/process_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: process_machdep.c,v 1.10 1996/04/04 06:37:08 phil Exp $	*/
+/*	$NetBSD: process_machdep.c,v 1.11 1998/09/12 19:14:59 matthias Exp $	*/
 
 /*
  * Copyright (c) 1993 The Regents of the University of California.
@@ -120,7 +120,7 @@ process_read_fpregs(p, regs)
 		save_fpu_context(&p->p_addr->u_pcb);
 		fpu_proc = 0;
 	}
-	bcopy(&p->p_addr->u_pcb.pcb_fsr, regs, sizeof(*regs));
+	memcpy(regs, &p->p_addr->u_pcb.pcb_fsr, sizeof(*regs));
 	return (0);
 }
 
@@ -135,7 +135,7 @@ process_write_fpregs(p, regs)
 	if (fpu_proc == p)
 		fpu_proc = 0;
 
-	bcopy(regs, &p->p_addr->u_pcb.pcb_fsr, sizeof(*regs));
+	memcpy(&p->p_addr->u_pcb.pcb_fsr, regs, sizeof(*regs));
 
 	return (0);
 }
diff --git a/sys/arch/pc532/stand/Makefile.inc b/sys/arch/pc532/stand/Makefile.inc
index 2891b2d45aa0..2f1c5ea740eb 100644
--- a/sys/arch/pc532/stand/Makefile.inc
+++ b/sys/arch/pc532/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.2 1997/11/18 01:19:21 phil Exp $
+#	$NetBSD: Makefile.inc,v 1.3 1998/09/12 19:14:59 matthias Exp $
 
 BINDIR=		/usr/mdec
 
@@ -9,7 +9,7 @@ RELOC=		3BE000
 
 CLEANFILES+=	${PROG}.sym ${PROG}
 
-CPPFLAGS+=	-DSCNCONSOLE -DSTANDALONE
+CPPFLAGS+=	-DSCNCONSOLE -DSTANDALONE -DINSECURE
 
 # Limit the alloc() heap to below 4mb
 CPPFLAGS+=	-DHEAP_LIMIT=0x400000
diff --git a/sys/arch/pc532/stand/common/machdep.c b/sys/arch/pc532/stand/common/machdep.c
index 6e7ec703576d..25ed90426d1d 100644
--- a/sys/arch/pc532/stand/common/machdep.c
+++ b/sys/arch/pc532/stand/common/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.1 1997/05/17 13:56:06 matthias Exp $	*/
+/*	$NetBSD: machdep.c,v 1.2 1998/09/12 19:15:00 matthias Exp $	*/
 
 /* 
  * Copyright (c) 1994 Philip L. Budne.
@@ -92,7 +92,7 @@ machdep_start(entry, howto, loadaddr, ssym, esym)
 	load = (char *)((long)entry & 0x00ffff00);
 
 	if (load != loadaddr) {
-		bcopy(loadaddr, load, esym - loadaddr);
+		memcpy(load, loadaddr, esym - loadaddr);
 		ssym += loadaddr - load;
 		esym += loadaddr - load;
 	}
@@ -115,7 +115,7 @@ _rtt()
 	lprd(sp, 0x2000);
 
 	/* Copy start of ROM. */
-	bcopy((void *)0x10000000, (void *)0, 0x1f00);
+	memcpy((void *)0, (void *)0x10000000, 0x1f00);
 
 	/* Jump into ROM copy. */
 	__asm __volatile("jump @0");
diff --git a/sys/arch/pc532/stand/common/sd.c b/sys/arch/pc532/stand/common/sd.c
index 400f426f8e20..2a96b66d38e3 100644
--- a/sys/arch/pc532/stand/common/sd.c
+++ b/sys/arch/pc532/stand/common/sd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.1 1997/05/17 13:56:11 matthias Exp $	*/
+/*	$NetBSD: sd.c,v 1.2 1998/09/12 19:15:00 matthias Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -101,7 +101,7 @@ sdgetinfo(ss)
 	int sdstrategy(), i, err;
 
 	lp = &sd_softc[ss->sc_ctlr][ss->sc_unit].sc_label;
-	bzero((caddr_t)lp, sizeof *lp);
+	memset((caddr_t)lp, 0, sizeof *lp);
 	lp->d_secsize = DEV_BSIZE;
 	lp->d_secpercyl = 1;
 	lp->d_npartitions = MAXPARTITIONS;