Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exterminate ovbcopy. patches provided by Erik Bertelsen, pr-7145

Browse Source
This commit is contained in:
perry 1999-03-12 22:42:30 +00:00
parent bf1e79f956
commit d446fb449c
9 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/m68k/m68k/bcopy.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: bcopy.s,v 1.2 1998/02/27 21:38:31 thorpej Exp $ */ /* $NetBSD: bcopy.s,v 1.3 1999/03/12 22:42:30 perry Exp $ */
/*- /*-
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
@ -48,11 +48,10 @@
.text .text
/* /*
* {ov}bcopy(from, to, len) * bcopy(from, to, len)
* *
* Works for counts up to 128K. * Works for counts up to 128K.
*/ */
ALTENTRY(ovbcopy, _bcopy)
ENTRY(bcopy) ENTRY(bcopy)
movl sp@(12),d0 | get count movl sp@(12),d0 | get count
jeq Lbccpyexit | if zero, return jeq Lbccpyexit | if zero, return

6
sys/arch/mac68k/dev/ite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite.c,v 1.46 1998/12/22 08:47:05 scottr Exp $ */ /* $NetBSD: ite.c,v 1.47 1999/03/12 22:42:30 perry Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -450,7 +450,7 @@ scrollup()
from = to + linebytes; from = to + linebytes;
for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) { for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) {
ovbcopy(from, to, screenrowbytes); memmove(to, from, screenrowbytes);
from += videorowbytes; from += videorowbytes;
to += videorowbytes; to += videorowbytes;
} }
@ -474,7 +474,7 @@ scrolldown()
for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) { for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) {
from -= videorowbytes; from -= videorowbytes;
to -= videorowbytes; to -= videorowbytes;
ovbcopy(from, to, screenrowbytes); memmove(to, from, screenrowbytes);
} }
for (i = CHARHEIGHT; i > 0; i--) { for (i = CHARHEIGHT; i > 0; i--) {
to -= videorowbytes; to -= videorowbytes;

6
sys/arch/macppc/dev/ite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite.c,v 1.3 1998/07/13 19:14:43 tsubai Exp $ */ /* $NetBSD: ite.c,v 1.4 1999/03/12 22:42:30 perry Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -440,7 +440,7 @@ scrollup()
from = to + linebytes; from = to + linebytes;
for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) { for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) {
ovbcopy(from, to, screenrowbytes); memmove(to, from, screenrowbytes);
from += videorowbytes; from += videorowbytes;
to += videorowbytes; to += videorowbytes;
} }
@ -464,7 +464,7 @@ scrolldown()
for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) { for (i = (scrreg_bottom - scrreg_top) * CHARHEIGHT; i > 0; i--) {
from -= videorowbytes; from -= videorowbytes;
to -= videorowbytes; to -= videorowbytes;
ovbcopy(from, to, screenrowbytes); memmove(to, from, screenrowbytes);
} }
for (i = CHARHEIGHT; i > 0; i--) { for (i = CHARHEIGHT; i > 0; i--) {
to -= videorowbytes; to -= videorowbytes;

4
sys/arch/sparc/sparc/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.137 1999/02/14 14:37:45 pk Exp $ */ /* $NetBSD: pmap.c,v 1.138 1999/03/12 22:42:30 perry Exp $ */
/* /*
* Copyright (c) 1996 * Copyright (c) 1996
@ -836,7 +836,7 @@ sortm(mp, n)
if (addr < mpj->addr) if (addr < mpj->addr)
break; break;
/* slide up any additional entries */ /* slide up any additional entries */
ovbcopy(mpj, mpj + 1, (i - j) * sizeof(*mp)); memmove(mpj + 1, mpj, (i - j) * sizeof(*mp));
mpj->addr = addr; mpj->addr = addr;
mpj->len = len; mpj->len = len;
} }

4
sys/net/if_gre.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gre.c,v 1.6 1999/01/26 21:21:14 hwr Exp $ */ /* $NetBSD: if_gre.c,v 1.7 1999/03/12 22:42:31 perry Exp $ */
/* /*
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -250,7 +250,7 @@ gre_output(ifp, m, dst, rt)
m->m_data-=msiz; m->m_data-=msiz;
m->m_len+=msiz; m->m_len+=msiz;
m->m_pkthdr.len+=msiz; m->m_pkthdr.len+=msiz;
ovbcopy((caddr_t) inp, mtod(m, caddr_t), sizeof(struct ip)); memmove(mtod(m, caddr_t), inp, sizeof(struct ip));
} }
inp=mtod(m,struct ip *); inp=mtod(m,struct ip *);
memcpy((caddr_t) (inp+1), &mob_h, (unsigned) msiz); memcpy((caddr_t) (inp+1), &mob_h, (unsigned) msiz);

7
sys/net/slcompress.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: slcompress.c,v 1.18 1998/12/12 18:22:39 christos Exp $ */ /* $NetBSD: slcompress.c,v 1.19 1999/03/12 22:42:31 perry Exp $ */
/* Id: slcompress.c,v 1.3 1996/05/24 07:04:47 paulus Exp */ /* Id: slcompress.c,v 1.3 1996/05/24 07:04:47 paulus Exp */
/* /*
@ -63,9 +63,6 @@
#define BCMP(p1, p2, n) bcmp((char *)(p1), (char *)(p2), (int)(n)) #define BCMP(p1, p2, n) bcmp((char *)(p1), (char *)(p2), (int)(n))
#define BCOPY(p1, p2, n) bcopy((char *)(p1), (char *)(p2), (int)(n)) #define BCOPY(p1, p2, n) bcopy((char *)(p1), (char *)(p2), (int)(n))
#ifndef _KERNEL
#define ovbcopy bcopy
#endif
void void
@ -465,7 +462,7 @@ sl_uncompress_tcp(bufp, len, type, comp)
*/ */
if ((long)cp & 3) { if ((long)cp & 3) {
if (len > 0) if (len > 0)
(void) ovbcopy(cp, (caddr_t)((long)cp &~ 3), len); memmove(((long)cp &~ 3), cp, len);
cp = (u_char *)((long)cp &~ 3); cp = (u_char *)((long)cp &~ 3);
} }
cp -= hlen; cp -= hlen;

11
sys/netinet/ip_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_output.c,v 1.56 1999/01/19 23:39:57 mycroft Exp $ */ /* $NetBSD: ip_output.c,v 1.57 1999/03/12 22:42:31 perry Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -543,7 +543,7 @@ ip_insertoptions(m, opt, phlen)
m->m_data -= optlen; m->m_data -= optlen;
m->m_len += optlen; m->m_len += optlen;
m->m_pkthdr.len += optlen; m->m_pkthdr.len += optlen;
ovbcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip)); memmove(mtod(m, caddr_t), ip, sizeof(struct ip));
} }
ip = mtod(m, struct ip *); ip = mtod(m, struct ip *);
bcopy((caddr_t)p->ipopt_list, (caddr_t)(ip + 1), (unsigned)optlen); bcopy((caddr_t)p->ipopt_list, (caddr_t)(ip + 1), (unsigned)optlen);
@ -838,7 +838,7 @@ ip_pcbopts(pcbopt, m)
cnt = m->m_len; cnt = m->m_len;
m->m_len += sizeof(struct in_addr); m->m_len += sizeof(struct in_addr);
cp = mtod(m, u_char *) + sizeof(struct in_addr); cp = mtod(m, u_char *) + sizeof(struct in_addr);
ovbcopy(mtod(m, caddr_t), (caddr_t)cp, (unsigned)cnt); memmove(cp, mtod(m, caddr_t), (unsigned)cnt);
bzero(mtod(m, caddr_t), sizeof(struct in_addr)); bzero(mtod(m, caddr_t), sizeof(struct in_addr));
for (; cnt > 0; cnt -= optlen, cp += optlen) { for (; cnt > 0; cnt -= optlen, cp += optlen) {
@ -882,9 +882,8 @@ ip_pcbopts(pcbopt, m)
* Then copy rest of options back * Then copy rest of options back
* to close up the deleted entry. * to close up the deleted entry.
*/ */
ovbcopy((caddr_t)(&cp[IPOPT_OFFSET+1] + memmove(&cp[IPOPT_OFFSET+1],
sizeof(struct in_addr)), (caddr_t)(&cp[IPOPT_OFFSET+1] + sizeof(struct in_addr)),
(caddr_t)&cp[IPOPT_OFFSET+1],
(unsigned)cnt + sizeof(struct in_addr)); (unsigned)cnt + sizeof(struct in_addr));
break; break;
} }

8
sys/netiso/iso_pcb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso_pcb.c,v 1.17 1998/07/05 04:37:43 jonathan Exp $ */ /* $NetBSD: iso_pcb.c,v 1.18 1999/03/12 22:42:31 perry Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -311,7 +311,7 @@ iso_pcbconnect(v, nam)
if (siso->siso_nlen == 0) { if (siso->siso_nlen == 0) {
if ((ia = iso_ifaddr.tqh_first) != NULL) { if ((ia = iso_ifaddr.tqh_first) != NULL) {
int nlen = ia->ia_addr.siso_nlen; int nlen = ia->ia_addr.siso_nlen;
ovbcopy(TSEL(siso), nlen + TSEL(siso), memmove(nlen + TSEL(siso), TSEL(siso),
siso->siso_plen + siso->siso_tlen + siso->siso_slen); siso->siso_plen + siso->siso_tlen + siso->siso_slen);
bcopy((caddr_t) & ia->ia_addr.siso_addr, bcopy((caddr_t) & ia->ia_addr.siso_addr,
(caddr_t) & siso->siso_addr, nlen + 1); (caddr_t) & siso->siso_addr, nlen + 1);
@ -385,7 +385,7 @@ iso_pcbconnect(v, nam)
} }
siso->siso_nlen = ia->ia_addr.siso_nlen; siso->siso_nlen = ia->ia_addr.siso_nlen;
newtsel = TSEL(siso); newtsel = TSEL(siso);
ovbcopy(oldtsel, newtsel, tlen); memmove(newtsel, oldtsel, tlen);
bcopy(ia->ia_addr.siso_data, siso->siso_data, nlen); bcopy(ia->ia_addr.siso_data, siso->siso_data, nlen);
siso->siso_tlen = tlen; siso->siso_tlen = tlen;
siso->siso_family = AF_ISO; siso->siso_family = AF_ISO;
@ -463,7 +463,7 @@ iso_pcbdisconnect(v)
if ((siso = isop->isop_laddr) && siso->siso_nlen && siso->siso_tlen) { if ((siso = isop->isop_laddr) && siso->siso_nlen && siso->siso_tlen) {
caddr_t otsel = TSEL(siso); caddr_t otsel = TSEL(siso);
siso->siso_nlen = 0; siso->siso_nlen = 0;
ovbcopy(otsel, TSEL(siso), siso->siso_tlen); memmove(TSEL(siso), otsel, siso->siso_tlen);
} }
if (isop->isop_faddr && isop->isop_faddr != &isop->isop_sfaddr) if (isop->isop_faddr && isop->isop_faddr != &isop->isop_sfaddr)
m_freem(isop->isop_mfaddr); m_freem(isop->isop_mfaddr);

4
sys/sys/systm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: systm.h,v 1.87 1999/01/28 00:05:17 msaitoh Exp $ */ /* $NetBSD: systm.h,v 1.88 1999/03/12 22:42:32 perry Exp $ */
/*- /*-
* Copyright (c) 1982, 1988, 1991, 1993 * Copyright (c) 1982, 1988, 1991, 1993
@ -205,7 +205,6 @@ void *memset __P((void *, int, size_t));
/* XXX b*() are now macros. should remove these prototypes soon */ /* XXX b*() are now macros. should remove these prototypes soon */
#if 0 #if 0
void bcopy __P((const void *, void *, size_t)); void bcopy __P((const void *, void *, size_t));
void ovbcopy __P((const void *, void *, size_t));
void bzero __P((void *, size_t)); void bzero __P((void *, size_t));
int bcmp __P((const void *, const void *, size_t)); int bcmp __P((const void *, const void *, size_t));
#endif #endif
@ -215,7 +214,6 @@ int kcopy __P((const void *, void *, size_t));
#endif #endif
#define bcopy(src, dst, len) memcpy(dst, src, len) #define bcopy(src, dst, len) memcpy(dst, src, len)
#define ovbcopy(src, dst, len) memmove(dst, src, len)
#define bzero(src, len) memset(src, 0, len) #define bzero(src, len) memset(src, 0, len)
#define bcmp(a, b, len) memcmp(a, b, len) #define bcmp(a, b, len) memcmp(a, b, len)