generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 02d1cfb3: am fa204cf0: am 8a405b02: Merge "Add optimized AArch64 versions of bcopy and wmemmove based on memmove"

Browse Source 
* commit '02d1cfb366b461d4c64cc87fc0f48bc3eae5fd92':
  Add optimized AArch64 versions of bcopy and wmemmove based on memmove
This commit is contained in:
Christopher Ferris 2014-05-28 22:17:56 +00:00 committed by Android Git Automerger
commit 48c544f1c2
12 changed files with 100 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -256,7 +256,6 @@ libc_upstream_freebsd_src_files := \
upstream-freebsd/lib/libc/string/wcstok.c \ upstream-freebsd/lib/libc/string/wcstok.c \
upstream-freebsd/lib/libc/string/wmemchr.c \ upstream-freebsd/lib/libc/string/wmemchr.c \
upstream-freebsd/lib/libc/string/wmemcpy.c \ upstream-freebsd/lib/libc/string/wmemcpy.c \
upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-freebsd/lib/libc/string/wmemset.c \ upstream-freebsd/lib/libc/string/wmemset.c \
libc_upstream_netbsd_src_files := \ libc_upstream_netbsd_src_files := \

1
libc/arch-arm/arm.mk
View File

@ -24,6 +24,7 @@ libc_common_src_files_arm += \
upstream-freebsd/lib/libc/string/wcslen.c \ upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \ upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \ upstream-freebsd/lib/libc/string/wmemcmp.c \
upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/bcopy.c \ upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \ upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \ upstream-openbsd/lib/libc/string/stpncpy.c \

1
libc/arch-arm64/arm64.mk
View File

@ -14,7 +14,6 @@ libc_common_src_files_arm64 := \
upstream-freebsd/lib/libc/string/wcslen.c \ upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \ upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \ upstream-freebsd/lib/libc/string/wmemcmp.c \
upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \ upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \ upstream-openbsd/lib/libc/string/stpncpy.c \
upstream-openbsd/lib/libc/string/strcat.c \ upstream-openbsd/lib/libc/string/strcat.c \

30
libc/arch-arm64/generic/bionic/bcopy.S Normal file
View File

@ -0,0 +1,30 @@
/* Copyright (c) 2014, Linaro Limited
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Linaro nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#define BCOPY
#include "memmove.S"
#undef BCOPY

22
libc/arch-arm64/generic/bionic/memmove.S
View File

@ -29,11 +29,16 @@
* *
* ARMv8-a, AArch64 * ARMv8-a, AArch64
* Unaligned accesses * Unaligned accesses
* wchar_t is 4 bytes
*/ */
#include <private/bionic_asm.h> #include <private/bionic_asm.h>
/* Parameters and result. */ /* Parameters and result. */
#ifdef BCOPY
#define origdstin x1
#define origsrc x0
#endif
#define dstin x0 #define dstin x0
#define src x1 #define src x1
#define count x2 #define count x2
@ -54,7 +59,18 @@
#define D_l x13 #define D_l x13
#define D_h x14 #define D_h x14
#ifdef BCOPY
ENTRY(bcopy)
/* Swap src and dst so that a branch to memcpy doesn't cause issues. */
mov tmp1, origsrc
mov origsrc, origdstin
mov origdstin, tmp1
#elif defined(WMEMMOVE)
ENTRY(wmemmove)
lsl count, count, #2
#else
ENTRY(memmove) ENTRY(memmove)
#endif
cmp dstin, src cmp dstin, src
b.lo .Ldownwards b.lo .Ldownwards
add tmp1, src, count add tmp1, src, count
@ -316,4 +332,10 @@ ENTRY(memmove)
tst count, #0x3f tst count, #0x3f
b.ne .Ltail63down b.ne .Ltail63down
ret ret
#ifdef BCOPY
END(bcopy)
#elif defined(WMEMMOVE)
END(wmemmove)
#else
END(memmove) END(memmove)
#endif

30
libc/arch-arm64/generic/bionic/wmemmove.S Normal file
View File

@ -0,0 +1,30 @@
/* Copyright (c) 2014, Linaro Limited
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Linaro nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#define WMEMMOVE
#include "memmove.S"
#undef WMEMMOVE

2
libc/arch-arm64/generic/generic.mk
View File

@ -1,4 +1,5 @@
libc_bionic_src_files_arm64 += \ libc_bionic_src_files_arm64 += \
arch-arm64/generic/bionic/bcopy.S \
arch-arm64/generic/bionic/memcmp.S \ arch-arm64/generic/bionic/memcmp.S \
arch-arm64/generic/bionic/memcpy.S \ arch-arm64/generic/bionic/memcpy.S \
arch-arm64/generic/bionic/memmove.S \ arch-arm64/generic/bionic/memmove.S \
@ -7,3 +8,4 @@ libc_bionic_src_files_arm64 += \
arch-arm64/generic/bionic/strlen.S \ arch-arm64/generic/bionic/strlen.S \
arch-arm64/generic/bionic/strncmp.S \ arch-arm64/generic/bionic/strncmp.S \
arch-arm64/generic/bionic/strnlen.S \ arch-arm64/generic/bionic/strnlen.S \
arch-arm64/generic/bionic/wmemmove.S

1
libc/arch-mips/mips.mk
View File

@ -26,6 +26,7 @@ libc_common_src_files_mips += \
upstream-freebsd/lib/libc/string/wcslen.c \ upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \ upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \ upstream-freebsd/lib/libc/string/wmemcmp.c \
upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/bcopy.c \ upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \ upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \ upstream-openbsd/lib/libc/string/stpncpy.c \

1
libc/arch-mips64/mips64.mk
View File

@ -16,6 +16,7 @@ libc_common_src_files_mips64 := \
upstream-freebsd/lib/libc/string/wcslen.c \ upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \ upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \ upstream-freebsd/lib/libc/string/wmemcmp.c \
upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/bcopy.c \ upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \ upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \ upstream-openbsd/lib/libc/string/stpncpy.c \

1
libc/arch-x86/x86.mk
View File

@ -12,6 +12,7 @@ libc_common_src_files_x86 += \
bionic/__memset_chk.cpp \ bionic/__memset_chk.cpp \
bionic/__strcpy_chk.cpp \ bionic/__strcpy_chk.cpp \
bionic/__strcat_chk.cpp \ bionic/__strcat_chk.cpp \
upstream-freebsd/lib/libc/string/wmemmove.c \
# These are shared by all the 32-bit targets, but not the 64-bit ones. # These are shared by all the 32-bit targets, but not the 64-bit ones.

1
libc/arch-x86_64/x86_64.mk
View File

@ -14,6 +14,7 @@ libc_common_src_files_x86_64 := \
upstream-freebsd/lib/libc/string/wcslen.c \ upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \ upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \ upstream-freebsd/lib/libc/string/wmemcmp.c \
upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/strlcat.c \ upstream-openbsd/lib/libc/string/strlcat.c \
upstream-openbsd/lib/libc/string/strlcpy.c \ upstream-openbsd/lib/libc/string/strlcpy.c \

11
tests/wchar_test.cpp
View File

@ -442,3 +442,14 @@ TEST(wchar, wcsftime) {
EXPECT_EQ(24U, wcsftime(buf, sizeof(buf), L"%c", &t)); EXPECT_EQ(24U, wcsftime(buf, sizeof(buf), L"%c", &t));
EXPECT_STREQ(L"Sun Mar 10 00:00:00 2100", buf); EXPECT_STREQ(L"Sun Mar 10 00:00:00 2100", buf);
} }
TEST(wchar, wmemmove) {
const wchar_t const_wstr[] = L"This is a test of something or other.....";
wchar_t* wstr = new wchar_t[sizeof(const_wstr)];
wmemmove(wstr, const_wstr, sizeof(const_wstr)/sizeof(wchar_t));
EXPECT_STREQ(const_wstr, wstr);
wmemmove(wstr+5, wstr, sizeof(const_wstr)/sizeof(wchar_t) - 5);
EXPECT_STREQ(L"This This is a test of something or other.", wstr);
}