diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-03-31 22:56:24 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-31 22:56:24 +0000 |
commit | 5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5 (patch) | |
tree | 15b1ff0a40462018402078788148c0c99d188429 /sysdeps/i386/i586/strlen.S | |
parent | 3075e0e37c0e7cc2e6eb518c409e0769d058ed4b (diff) | |
download | glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar.gz glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar.xz glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.zip |
Update. cvs/libc-ud-970331
1997-04-01 00:37 Ulrich Drepper <drepper@cygnus.com> * math/Makefile: Prevent inlining for test-{float,double,longdouble}. * math/libm-test.c (initialize): Make strings unique and force values to memory. * posix/regex.c: Debug debugging code. * sysdeps/i386/asm-syntax.h: Define `L' macro to emit correct syntax for local label. * sysdeps/i386/add_n.S: Use correct local label syntax for the binary format. * sysdeps/i386/addmul_1.S: Likewise. * sysdeps/i386/lshift.S: Likewise. * sysdeps/i386/memchr.S: Likewise. * sysdeps/i386/memset.S: Likewise. * sysdeps/i386/mul_1.S: Likewise. * sysdeps/i386/rshift.S: Likewise. * sysdeps/i386/stpcpy.S: Likewise. * sysdeps/i386/stpncpy.S: Likewise. * sysdeps/i386/strchr.S: Likewise. * sysdeps/i386/strcspn.S: Likewise. * sysdeps/i386/strlen.S: Likewise. * sysdeps/i386/strpbrk.S: Likewise. * sysdeps/i386/strrchr.S: Likewise. * sysdeps/i386/strspn.S: Likewise. * sysdeps/i386/strtok.S: Likewise. * sysdeps/i386/sub_n.S: Likewise. * sysdeps/i386/submul_1.S: Likewise. * sysdeps/i386/i486/strcat.S: Likewise. * sysdeps/i386/i486/strlen.S: Likewise. * sysdeps/i386/i586/add_n.S: Likewise. * sysdeps/i386/i586/addmul_1.S: Likewise. * sysdeps/i386/i586/lshift.S: Likewise. * sysdeps/i386/i586/memset.S: Likewise. * sysdeps/i386/i586/mul_1.S: Likewise. * sysdeps/i386/i586/rshift.S: Likewise. * sysdeps/i386/i586/strchr.S: Likewise. * sysdeps/i386/i586/strlen.S: Likewise. * sysdeps/i386/i586/sub_n.S: Likewise. * sysdeps/i386/i586/submul_1.S: Likewise. * sysdeps/stub/s_log2l.c: Correct function name. * time/africa: Updated from ADO tzdata1997e. * time/aantarctica: Likewise. * time/asia: Likewise. * time/australia: Likewise. * time/europe: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. * time/private.h: Updated from ADO tzcode1997d. * time/scheck.c: Likewise. 1997-03-31 12:42 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/powerpc/Dist: Add kernel_*.h files. 1997-03-23 01:41 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/strlen.s: Rewrote for more speed. * string/tst-strlen.c: Also test various string alignments. 1997-03-19 06:11 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/statbuf.h: Removed. * sysdeps/unix/sysv/linux/powerpc/kernel_stat.h: Added. * sysdeps/powerpc/dl-machine.h (ELF_PREFERRED_ADDRESS): Assume program base address is 0x01800000 if we can't otherwise tell what it is. (elf_machine_rela): Replace `assertion failed' with real error messages. * sysdeps/powerpc/dl-machine.h: More comments, more GNU indenting. Put in extra parentheses to make explicit the relative precedence of + and >>. * sysdeps/powerpc/bsd-setjmp.S: Add `__setjmp' symbol so the tests pass. * sysdeps/powerpc/clone.S: Rewrite. Probably still doesn't work. * sysdeps/unix/sysv/linux/powerpc/sys/sysdep.h: Use .section "text" instead of .text. 1997-03-31 02:28 Ulrich Drepper <drepper@cygnus.com> * misc/tst-tsearch.c: Don't write to stderr, write to stdout instead. * inet/inet_ntoa.c (inet_ntoa): Complete rewrite. Now uses thread-specific memory in multi-threaded programs. * sysdeps/stub/s_exp2.c: New file. Stub version for exp2 function. * sysdeps/stub/s_exp2f.c: New file. * sysdeps/stub/s_exp2l.c: New file. Reported by a sun <asun@zoology.washington.edu>. * sysdeps/unix/sysv/linux/netatalk/atalk.h: Rename to... * sysdeps/unix/sysv/linux/netatalk/at.h: ...this. Suggested by a sun <asun@zoology.washington.edu>. 1997-03-30 14:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip_icmp.h: Add former contents of <netinet/icmp.h>. Patch by a sun <asun@zoology.washington.edu>. * sysdeps/powerpc/strlen.S: Added.
Diffstat (limited to 'sysdeps/i386/i586/strlen.S')
-rw-r--r-- | sysdeps/i386/i586/strlen.S | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/sysdeps/i386/i586/strlen.S b/sysdeps/i386/i586/strlen.S index e8fb916812..2e6ea680ec 100644 --- a/sysdeps/i386/i586/strlen.S +++ b/sysdeps/i386/i586/strlen.S @@ -1,6 +1,6 @@ /* strlen -- Compute length og NUL terminated string. Highly optimized version for ix86, x>=5. - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>. @@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA. */ #include <sysdep.h> +#include "asm-syntax.h" /* This version is especially optimized for the i586 (and following?) processors. This is mainly done by using the two pipelines. The @@ -46,24 +47,24 @@ ENTRY(strlen) andl %eax, %edx /* separate last two bits of address */ - jz L1 /* aligned => start loop */ - jp L0 /* exactly two bits set */ + jz L(1) /* aligned => start loop */ + jp L(0) /* exactly two bits set */ cmpb %dh, (%eax) /* is byte NUL? */ - je L2 /* yes => return */ + je L(2) /* yes => return */ incl %eax /* increment pointer */ cmpb %dh, (%eax) /* is byte NUL? */ - je L2 /* yes => return */ + je L(2) /* yes => return */ incl %eax /* increment pointer */ xorl $2, %edx - jz L1 + jz L(1) -L0: cmpb %dh, (%eax) /* is byte NUL? */ - je L2 /* yes => return */ +L(0): cmpb %dh, (%eax) /* is byte NUL? */ + je L(2) /* yes => return */ incl %eax /* increment pointer */ xorl %edx, %edx /* We need %edx == 0 for later */ @@ -91,7 +92,7 @@ L0: cmpb %dh, (%eax) /* is byte NUL? */ Note: %edx == 0 in any case here. */ -L1: +L(1): movl (%eax), %ecx /* get word (= 4 bytes) in question */ addl $4, %eax /* adjust pointer for *next* word */ @@ -99,13 +100,13 @@ L1: addl $magic, %ecx /* add magic word */ decl %edx /* complete negation of word */ - jnc L3 /* previous addl caused overflow? */ + jnc L(3) /* previous addl caused overflow? */ xorl %ecx, %edx /* (word+magic)^word */ andl $~magic, %edx /* any of the carry flags set? */ - jne L3 /* yes => determine byte */ + jne L(3) /* yes => determine byte */ movl (%eax), %ecx /* get word (= 4 bytes) in question */ @@ -115,13 +116,13 @@ L1: addl $magic, %ecx /* add magic word */ decl %edx /* complete negation of word */ - jnc L3 /* previous addl caused overflow? */ + jnc L(3) /* previous addl caused overflow? */ xorl %ecx, %edx /* (word+magic)^word */ andl $~magic, %edx /* any of the carry flags set? */ - jne L3 /* yes => determine byte */ + jne L(3) /* yes => determine byte */ movl (%eax), %ecx /* get word (= 4 bytes) in question */ @@ -131,13 +132,13 @@ L1: addl $magic, %ecx /* add magic word */ decl %edx /* complete negation of word */ - jnc L3 /* previous addl caused overflow? */ + jnc L(3) /* previous addl caused overflow? */ xorl %ecx, %edx /* (word+magic)^word */ andl $~magic, %edx /* any of the carry flags set? */ - jne L3 /* yes => determine byte */ + jne L(3) /* yes => determine byte */ movl (%eax), %ecx /* get word (= 4 bytes) in question */ @@ -147,35 +148,35 @@ L1: addl $magic, %ecx /* add magic word */ decl %edx /* complete negation of word */ - jnc L3 /* previous addl caused overflow? */ + jnc L(3) /* previous addl caused overflow? */ xorl %ecx, %edx /* (word+magic)^word */ andl $~magic, %edx /* any of the carry flags set? */ - je L1 /* no => start loop again */ + je L(1) /* no => start loop again */ -L3: subl $4, %eax /* correct too early pointer increment */ +L(3): subl $4, %eax /* correct too early pointer increment */ subl $magic, %ecx cmpb $0, %cl /* lowest byte NUL? */ - jz L2 /* yes => return */ + jz L(2) /* yes => return */ inc %eax /* increment pointer */ testb %ch, %ch /* second byte NUL? */ - jz L2 /* yes => return */ + jz L(2) /* yes => return */ shrl $16, %ecx /* make upper bytes accessible */ incl %eax /* increment pointer */ cmpb $0, %cl /* is third byte NUL? */ - jz L2 /* yes => return */ + jz L(2) /* yes => return */ incl %eax /* increment pointer */ -L2: subl 4(%esp), %eax /* now compute the length as difference +L(2): subl 4(%esp), %eax /* now compute the length as difference between start and terminating NUL character */ |