From 170704c9ecf838706b59c353bcd3503f8f74bb48 Mon Sep 17 00:00:00 2001 From: Ondrej Bilka Date: Wed, 13 Feb 2013 12:57:41 +0100 Subject: Call memcpy in generic mempcpy --- ChangeLog | 4 ++++ string/mempcpy.c | 38 ++------------------------------------ 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed911fa112..ad1b1d93e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Ondřej Bílka + + * string/mempcpy.c: Implement by calling memcpy. + 2013-02-13 Siddhesh Poyarekar * sysdeps/ieee754/dbl-64/mpexp.c (__mpexp): Remove NFA. diff --git a/string/mempcpy.c b/string/mempcpy.c index ba4d1c6bcd..c0d2448205 100644 --- a/string/mempcpy.c +++ b/string/mempcpy.c @@ -20,48 +20,14 @@ . */ #include -#include -#include #undef mempcpy #undef __mempcpy void * -__mempcpy (dstpp, srcpp, len) - void *dstpp; - const void *srcpp; - size_t len; +__mempcpy (void *dest, const void *src, size_t len) { - unsigned long int dstp = (long int) dstpp; - unsigned long int srcp = (long int) srcpp; - - /* Copy from the beginning to the end. */ - - /* If there not too few bytes to copy, use word copy. */ - if (len >= OP_T_THRES) - { - /* Copy just a few bytes to make DSTP aligned. */ - len -= (-dstp) % OPSIZ; - BYTE_COPY_FWD (dstp, srcp, (-dstp) % OPSIZ); - - /* Copy whole pages from SRCP to DSTP by virtual address manipulation, - as much as possible. */ - - PAGE_COPY_FWD_MAYBE (dstp, srcp, len, len); - - /* Copy from SRCP to DSTP taking advantage of the known alignment of - DSTP. Number of bytes remaining is put in the third argument, - i.e. in LEN. This number may vary from machine to machine. */ - - WORD_COPY_FWD (dstp, srcp, len, len); - - /* Fall out and copy the tail. */ - } - - /* There are just a few bytes to copy. Use byte memory operations. */ - BYTE_COPY_FWD (dstp, srcp, len); - - return (void *) dstp; + return memcpy (dest, src, len) + len; } libc_hidden_def (__mempcpy) weak_alias (__mempcpy, mempcpy) -- cgit 1.4.1