diff options
| author | Nick Kralevich <nnk@google.com> | 2013-05-24 18:34:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-24 18:34:57 +0000 |
| commit | 8d79fd1c94cb021b6852e6f44e27183ec83fe04c (patch) | |
| tree | aa5e0e69f65cc79d4b9aef84e63d6fff65a2e477 | |
| parent | 2317275f859a685386889139855f2f3314337d53 (diff) | |
| parent | e4c4ada5804beb689905286b9bbe6521a186d302 (diff) | |
| download | android_bionic-8d79fd1c94cb021b6852e6f44e27183ec83fe04c.tar.gz android_bionic-8d79fd1c94cb021b6852e6f44e27183ec83fe04c.tar.bz2 android_bionic-8d79fd1c94cb021b6852e6f44e27183ec83fe04c.zip | |
Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
| -rw-r--r-- | libc/arch-x86/string/index.S | 26 | ||||
| -rw-r--r-- | libc/arch-x86/string/strchr.S | 3 | ||||
| -rw-r--r-- | libc/arch-x86/string/strcpy.S | 64 |
3 files changed, 0 insertions, 93 deletions
diff --git a/libc/arch-x86/string/index.S b/libc/arch-x86/string/index.S deleted file mode 100644 index 7f83ef5b1..000000000 --- a/libc/arch-x86/string/index.S +++ /dev/null @@ -1,26 +0,0 @@ -/* $OpenBSD: index.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin <jtc@netbsd.org>. - * Public domain. - */ - -#include <machine/asm.h> - -#ifdef STRCHR -ENTRY(strchr) -#else -ENTRY(index) -#endif - movl 4(%esp),%eax - movb 8(%esp),%cl - .align 2,0x90 -L1: - movb (%eax),%dl - cmpb %dl,%cl /* found char??? */ - je L2 - incl %eax - testb %dl,%dl /* null terminator??? */ - jnz L1 - xorl %eax,%eax -L2: - ret diff --git a/libc/arch-x86/string/strchr.S b/libc/arch-x86/string/strchr.S deleted file mode 100644 index f76e593fc..000000000 --- a/libc/arch-x86/string/strchr.S +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: strchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -#define STRCHR -#include "index.S" diff --git a/libc/arch-x86/string/strcpy.S b/libc/arch-x86/string/strcpy.S deleted file mode 100644 index 7d9b87e11..000000000 --- a/libc/arch-x86/string/strcpy.S +++ /dev/null @@ -1,64 +0,0 @@ -/* $OpenBSD: strcpy.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin <jtc@netbsd.org>. - * Public domain. - */ - -#include <machine/asm.h> - -#if defined(APIWARN) -#APP - .section .gnu.warning.strcpy - .ascii "warning: strcpy() is almost always misused, please use strlcpy()" -#NO_APP -#endif - -/* - * NOTE: I've unrolled the loop eight times: large enough to make a - * significant difference, and small enough not to totally trash the - * cache. - */ - -ENTRY(strcpy) - movl 4(%esp),%ecx /* dst address */ - movl 8(%esp),%edx /* src address */ - pushl %ecx /* push dst address */ - - .align 2,0x90 -L1: movb (%edx),%al /* unroll loop, but not too much */ - movb %al,(%ecx) - testb %al,%al - jz L2 - movb 1(%edx),%al - movb %al,1(%ecx) - testb %al,%al - jz L2 - movb 2(%edx),%al - movb %al,2(%ecx) - testb %al,%al - jz L2 - movb 3(%edx),%al - movb %al,3(%ecx) - testb %al,%al - jz L2 - movb 4(%edx),%al - movb %al,4(%ecx) - testb %al,%al - jz L2 - movb 5(%edx),%al - movb %al,5(%ecx) - testb %al,%al - jz L2 - movb 6(%edx),%al - movb %al,6(%ecx) - testb %al,%al - jz L2 - movb 7(%edx),%al - movb %al,7(%ecx) - addl $8,%edx - addl $8,%ecx - testb %al,%al - jnz L1 -L2: popl %eax /* pop dst address */ - ret -END(strcpy) |