From 88fbdda31f3aa2a9a0d361e7cf62cf208e157e1e Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sat, 28 Jul 2001 13:08:34 +0000 Subject: [PATCH] bcopy -> memcpy --- sys/arch/m68k/m68k/copy.s | 6 +++--- sys/arch/m68k/m68k/mappedcopy.c | 10 +++++----- sys/arch/m68k/m68k/process_machdep.c | 10 +++++----- sys/arch/m68k/m68k/sig_machdep.c | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/arch/m68k/m68k/copy.s b/sys/arch/m68k/m68k/copy.s index 7a26aecac065..74303d3fb23b 100644 --- a/sys/arch/m68k/m68k/copy.s +++ b/sys/arch/m68k/m68k/copy.s @@ -1,4 +1,4 @@ -/* $NetBSD: copy.s,v 1.36 1999/11/10 00:13:59 thorpej Exp $ */ +/* $NetBSD: copy.s,v 1.37 2001/07/28 13:08:34 tsutsui Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -365,9 +365,9 @@ ENTRY(kcopy) movl %a0@(PCB_ONFAULT),%a6@(-4) | save old handler first movl #Lkcfault,%a0@(PCB_ONFAULT) movl %a6@(16),%sp@- | push len - movl %a6@(12),%sp@- | push dst movl %a6@(8),%sp@- | push src - jbsr _C_LABEL(bcopy) | copy it + movl %a6@(12),%sp@- | push dst + jbsr _C_LABEL(memcpy) | copy it addl #12,%sp | pop args clrl %d0 | success! Lkcdone: diff --git a/sys/arch/m68k/m68k/mappedcopy.c b/sys/arch/m68k/m68k/mappedcopy.c index e9a8c67e9dd7..ac3917aa0427 100644 --- a/sys/arch/m68k/m68k/mappedcopy.c +++ b/sys/arch/m68k/m68k/mappedcopy.c @@ -1,4 +1,4 @@ -/* $NetBSD: mappedcopy.c,v 1.13 2001/04/24 04:31:00 thorpej Exp $ */ +/* $NetBSD: mappedcopy.c,v 1.14 2001/07/28 13:08:34 tsutsui Exp $ */ /* * XXX This doesn't work yet. Soon. --thorpej@netbsd.org @@ -110,7 +110,7 @@ mappedcopyin(f, t, count) if (fubyte(fromp) == -1) return (EFAULT); /* - * Map in the page and bcopy data in from it + * Map in the page and memcpy data in from it */ if (pmap_extract(upmap, trunc_page((vaddr_t)fromp), &upa) == FALSE) @@ -122,7 +122,7 @@ mappedcopyin(f, t, count) if (len == PAGE_SIZE && alignable && off == 0) copypage((caddr_t)kva, top); else - bcopy((void *)(kva + off), top, len); + memcpy(top, (void *)(kva + off), len); fromp += len; top += len; count -= len; @@ -169,7 +169,7 @@ mappedcopyout(f, t, count) if (subyte(top, *((char *)fromp)) == -1) return (EFAULT); /* - * Map in the page and bcopy data out to it + * Map in the page and memcpy data out to it */ if (pmap_extract(upmap, trunc_page((vaddr_t)top), &upa) == FALSE) @@ -182,7 +182,7 @@ mappedcopyout(f, t, count) if (len == PAGE_SIZE && alignable && off == 0) copypage(fromp, (caddr_t)kva); else - bcopy(fromp, (void *)(kva + off), len); + memcpy((void *)(kva + off), fromp, len); fromp += len; top += len; count -= len; diff --git a/sys/arch/m68k/m68k/process_machdep.c b/sys/arch/m68k/m68k/process_machdep.c index bc7addbe65ad..ddcdff043dde 100644 --- a/sys/arch/m68k/m68k/process_machdep.c +++ b/sys/arch/m68k/m68k/process_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: process_machdep.c,v 1.18 1998/01/06 08:06:45 thorpej Exp $ */ +/* $NetBSD: process_machdep.c,v 1.19 2001/07/28 13:08:34 tsutsui Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou @@ -90,7 +90,7 @@ process_read_regs(p, regs) { struct frame *frame = process_frame(p); - bcopy(frame->f_regs, regs->r_regs, sizeof(frame->f_regs)); + memcpy(regs->r_regs, frame->f_regs, sizeof(frame->f_regs)); regs->r_sr = frame->f_sr; regs->r_pc = frame->f_pc; @@ -104,7 +104,7 @@ process_read_fpregs(p, regs) { struct fpframe *frame = process_fpframe(p); - bcopy(frame->fpf_regs, regs->r_regs, sizeof(frame->fpf_regs)); + memcpy(regs->r_regs, frame->fpf_regs, sizeof(frame->fpf_regs)); regs->r_fpcr = frame->fpf_fpcr; regs->r_fpsr = frame->fpf_fpsr; regs->r_fpiar = frame->fpf_fpiar; @@ -138,7 +138,7 @@ process_write_regs(p, regs) (regs->r_sr & PSL_USERSET) != PSL_USERSET) return EPERM; - bcopy(regs->r_regs, frame->f_regs, sizeof(frame->f_regs)); + memcpy(frame->f_regs, regs->r_regs, sizeof(frame->f_regs)); frame->f_sr = regs->r_sr; frame->f_pc = regs->r_pc; @@ -152,7 +152,7 @@ process_write_fpregs(p, regs) { struct fpframe *frame = process_fpframe(p); - bcopy(regs->r_regs, frame->fpf_regs, sizeof(frame->fpf_regs)); + memcpy(frame->fpf_regs, regs->r_regs, sizeof(frame->fpf_regs)); frame->fpf_fpcr = regs->r_fpcr; frame->fpf_fpsr = regs->r_fpsr; frame->fpf_fpiar = regs->r_fpiar; diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c index dfd2a6acd780..aacea23ee6f0 100644 --- a/sys/arch/m68k/m68k/sig_machdep.c +++ b/sys/arch/m68k/m68k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: sig_machdep.c,v 1.14 2000/12/22 22:58:54 jdolecek Exp $ */ +/* $NetBSD: sig_machdep.c,v 1.15 2001/07/28 13:08:34 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -124,7 +124,7 @@ sendsig(catcher, sig, mask, code) * - FP coprocessor state */ kf.sf_state.ss_flags = SS_USERREGS; - bcopy(frame->f_regs, kf.sf_state.ss_frame.f_regs, + memcpy(kf.sf_state.ss_frame.f_regs, frame->f_regs, sizeof(frame->f_regs)); if (ft >= FMT4) { #ifdef DEBUG @@ -134,7 +134,7 @@ sendsig(catcher, sig, mask, code) kf.sf_state.ss_flags |= SS_RTEFRAME; kf.sf_state.ss_frame.f_format = frame->f_format; kf.sf_state.ss_frame.f_vector = frame->f_vector; - bcopy(&frame->F_u, &kf.sf_state.ss_frame.F_u, + memcpy(&kf.sf_state.ss_frame.F_u, &frame->F_u, (size_t) exframesize[ft]); /* * Leave an indicator that we need to clean up the kernel @@ -318,7 +318,7 @@ sys___sigreturn14(p, v, retval) frame->f_stackadj -= sz; frame->f_format = tstate.ss_frame.f_format; frame->f_vector = tstate.ss_frame.f_vector; - bcopy(&tstate.ss_frame.F_u, &frame->F_u, sz); + memcpy(&frame->F_u, &tstate.ss_frame.F_u, sz); #ifdef DEBUG if (sigdebug & SDB_FOLLOW) printf("sigreturn(%d): copy in %d of frame type %d\n", @@ -331,8 +331,8 @@ sys___sigreturn14(p, v, retval) * which will be handled below. */ if (flags & SS_USERREGS) - bcopy(tstate.ss_frame.f_regs, - frame->f_regs, sizeof(frame->f_regs) - (2 * NBPW)); + memcpy(frame->f_regs, tstate.ss_frame.f_regs, + sizeof(frame->f_regs) - (2 * NBPW)); /* * Restore the original FP context