qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wcsmbs: optimize wcpcpy 

This patch rewrites wcpcpy using wcslen and wmemcpy.  This is
similar to the optimizatio done on stpcpy by f559d8cf29.

Checked on x86_64-linux-gnu and string tests on a simulated
m68k-linux-gnu.

	* sysdeps/m68k/wcpcpy.c: Remove file.
	* wcsmbs/wcpcpy.c (__wcpcpy): Rewrite using wcslen and wmemcpy.
This commit is contained in:
Adhemerval Zanella 2019-02-05 17:34:05 -02:00
parent aa0e46636a
commit 7b3fb62051
3 changed files with 8 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2019-02-27 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/m68k/wcpcpy.c: Remove file.
* wcsmbs/wcpcpy.c (__wcpcpy): Rewrite using wcslen and wmemcpy.
2019-02-26 Joseph Myers <joseph@codesourcery.com> 2019-02-26 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/sysdep.h (#if condition): Break lines before rather * sysdeps/arm/sysdep.h (#if condition): Break lines before rather

36
sysdeps/m68k/wcpcpy.c
View File

@ -1,36 +0,0 @@
/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
/* The generic version of this file assumes that __alignof__(wchar_t) ==
sizeof (wchar_t). We therefore use this port-specific implementation
instead. */
#include <wchar.h>
/* Copy SRC to DEST, returning the address of the terminating L'\0' in
DEST. */
wchar_t *
__wcpcpy (wchar_t *dest, const wchar_t *src)
{
do
;
while ((*dest++ = *src++));
return dest - 1;
}
weak_alias (__wcpcpy, wcpcpy)

19
wcsmbs/wcpcpy.c
View File

@ -18,31 +18,18 @@
#include <wchar.h> #include <wchar.h>
#define __need_ptrdiff_t
#include <stddef.h>
#ifdef WCPCPY #ifdef WCPCPY
# define __wcpcpy WCPCPY # define __wcpcpy WCPCPY
#endif #endif
/* Copy SRC to DEST, returning the address of the terminating L'\0' in /* Copy SRC to DEST, returning the address of the terminating L'\0' in
DEST. */ DEST. */
wchar_t * wchar_t *
__wcpcpy (wchar_t *dest, const wchar_t *src) __wcpcpy (wchar_t *dest, const wchar_t *src)
{ {
wchar_t *wcp = (wchar_t *) dest - 1; size_t len = __wcslen (src);
wint_t c; return __wmemcpy (dest, src, len + 1) + len;
const ptrdiff_t off = src - dest + 1;
do
{
c = wcp[off];
*++wcp = c;
}
while (c != L'\0');
return wcp;
} }
#ifndef WCPCPY #ifndef WCPCPY
weak_alias (__wcpcpy, wcpcpy) weak_alias (__wcpcpy, wcpcpy)
#endif #endif