diff options
| author | Jake Weinstein <xboxlover360@gmail.com> | 2015-08-16 00:44:40 +0000 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-07 03:39:56 -0800 |
| commit | bd6d071e7ed89fd16c885708d040801f787b04d6 (patch) | |
| tree | 48d2dc5749f337587c6078e723841cca6d488d12 | |
| parent | de3e5ac94a907a4baca0fb606173b11da090216b (diff) | |
| download | bionic-bd6d071e7ed89fd16c885708d040801f787b04d6.zip bionic-bd6d071e7ed89fd16c885708d040801f787b04d6.tar.gz bionic-bd6d071e7ed89fd16c885708d040801f787b04d6.tar.bz2 | |
libc: remove bcopy from memmove on 64-bit architectures
* bcopy is deprecated on LP64 by the following commit:
https://android.googlesource.com/platform/bionic/+/ce9ce28e5d760e32ab6c894dfaf7b8dad6de7ff6
Change-Id: I6849916f0ec4a2d0db9a360999ad1dc8edda952b
| -rw-r--r-- | libc/arch-arm64/generic/bionic/memmove.S | 16 | ||||
| -rw-r--r-- | libc/arch-x86_64/string/sse2-memmove-slm.S | 3 |
2 files changed, 2 insertions, 17 deletions
diff --git a/libc/arch-arm64/generic/bionic/memmove.S b/libc/arch-arm64/generic/bionic/memmove.S index 8b366a3..739ce49 100644 --- a/libc/arch-arm64/generic/bionic/memmove.S +++ b/libc/arch-arm64/generic/bionic/memmove.S @@ -35,10 +35,6 @@ #include <private/bionic_asm.h> /* Parameters and result. */ -#ifdef BCOPY -#define origdstin x1 -#define origsrc x0 -#endif #define dstin x0 #define src x1 #define count x2 @@ -59,13 +55,7 @@ #define D_l x13 #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) +#if defined(WMEMMOVE) ENTRY(wmemmove) lsl count, count, #2 #else @@ -332,9 +322,7 @@ ENTRY(memmove) tst count, #0x3f b.ne .Ltail63down ret -#ifdef BCOPY -END(bcopy) -#elif defined(WMEMMOVE) +#if defined(WMEMMOVE) END(wmemmove) #else END(memmove) diff --git a/libc/arch-x86_64/string/sse2-memmove-slm.S b/libc/arch-x86_64/string/sse2-memmove-slm.S index 0dbffad..6a5afd6 100644 --- a/libc/arch-x86_64/string/sse2-memmove-slm.S +++ b/libc/arch-x86_64/string/sse2-memmove-slm.S @@ -91,9 +91,6 @@ name: \ .section .text.sse2,"ax",@progbits ENTRY (MEMMOVE) ENTRANCE -#ifdef USE_AS_BCOPY - xchg %rsi, %rdi -#endif mov %rdi, %rax /* Check whether we should copy backward or forward. */ |