diff options
| -rw-r--r-- | libc/string/i386/rawmemchr.c | 24 | ||||
| -rw-r--r-- | libc/string/i386/strlen.c | 18 |
2 files changed, 33 insertions, 9 deletions
diff --git a/libc/string/i386/rawmemchr.c b/libc/string/i386/rawmemchr.c new file mode 100644 index 000000000..be0b142c3 --- /dev/null +++ b/libc/string/i386/rawmemchr.c @@ -0,0 +1,24 @@ +/* + * Adapted from strlen.c code + * + * Copyright (C) 2008 Denys Vlasenko <vda.linux@googlemail.com> + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ + +#include <string.h> + +#undef rawmemchr +void *rawmemchr(const void *s, int c) +{ + void *eax; + int ecx, edi; + __asm__ __volatile__( + " repne; scasb\n" + " leal -1(%%edi), %%eax\n" + : "=&c" (ecx), "=&D" (edi), "=&a" (eax) + : "0" (0xffffffff), "1" (s), "2" (c) + ); + return eax; +} +libc_hidden_def(rawmemchr) diff --git a/libc/string/i386/strlen.c b/libc/string/i386/strlen.c index 761d27aae..ff2baeb38 100644 --- a/libc/string/i386/strlen.c +++ b/libc/string/i386/strlen.c @@ -35,14 +35,14 @@ #undef strlen size_t strlen(const char *s) { - int d0; - register int __res; - __asm__ __volatile__( - "repne\n\t" - "scasb\n\t" - "notl %0\n\t" - "decl %0" - :"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffff)); - return __res; + int eax, ecx, edi; + __asm__ __volatile__( + " repne; scasb\n" + " notl %%ecx\n" + " leal -1(%%ecx), %%eax\n" + : "=&c" (ecx), "=&D" (edi), "=&a" (eax) + : "0" (0xffffffff), "1" (s), "2" (0) + ); + return eax; } libc_hidden_def(strlen) |