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/strpbrk.S | |
parent | 3075e0e37c0e7cc2e6eb518c409e0769d058ed4b (diff) | |
download | glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar.gz glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar.bz2 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/strpbrk.S')
-rw-r--r-- | sysdeps/i386/strpbrk.S | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sysdeps/i386/strpbrk.S b/sysdeps/i386/strpbrk.S index 5d0dfece4a..ff0990272a 100644 --- a/sysdeps/i386/strpbrk.S +++ b/sysdeps/i386/strpbrk.S @@ -1,25 +1,25 @@ /* strcspn (str, ss) -- Return the length of the initial segement of STR which contains no characters from SS. -For Intel 80x86, x>=3. -Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu> -Bug fixes by Alan Modra <Alan@SPRI.Levels.UniSA.Edu.Au> -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + For Intel 80x86, x>=3. + Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu> + Bug fixes by Alan Modra <Alan@SPRI.Levels.UniSA.Edu.Au> + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <sysdep.h> #include "asm-syntax.h" @@ -114,28 +114,28 @@ ENTRY (strpbrk) /* Don't change the "testb $0xff,%%cl" to "testb %%cl,%%cl". We want longer instructions so that the next loop aligns without adding nops. */ -L2: movb (%eax), %cl /* get byte from stopset */ +L(2): movb (%eax), %cl /* get byte from stopset */ testb %cl, %cl /* is NUL char? */ - jz L1 /* yes => start compare loop */ + jz L(1) /* yes => start compare loop */ movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */ movb 1(%eax), %cl /* get byte from stopset */ testb $0xff, %cl /* is NUL char? */ - jz L1 /* yes => start compare loop */ + jz L(1) /* yes => start compare loop */ movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */ movb 2(%eax), %cl /* get byte from stopset */ testb $0xff, %cl /* is NUL char? */ - jz L1 /* yes => start compare loop */ + jz L(1) /* yes => start compare loop */ movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */ movb 3(%eax), %cl /* get byte from stopset */ addl $4, %eax /* increment stopset pointer */ movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */ testb $0xff, %cl /* is NUL char? */ - jnz L2 /* no => process next dword from stopset */ + jnz L(2) /* no => process next dword from stopset */ -L1: leal -4(%edx), %eax /* prepare loop */ +L(1): leal -4(%edx), %eax /* prepare loop */ /* We use a neat trick for the following loop. Normally we would have to test for two termination conditions @@ -146,33 +146,33 @@ L1: leal -4(%edx), %eax /* prepare loop */ value in the table. But the value of NUL is NUL so the loop terminates for NUL in every case. */ -L3: addl $4, %eax /* adjust pointer for full loop round */ +L(3): addl $4, %eax /* adjust pointer for full loop round */ movb (%eax), %cl /* get byte from string */ cmpb %cl, (%esp,%ecx) /* is it contained in stopset? */ - je L4 /* yes => return */ + je L(4) /* yes => return */ movb 1(%eax), %cl /* get byte from string */ cmpb %cl, (%esp,%ecx) /* is it contained in stopset? */ - je L5 /* yes => return */ + je L(5) /* yes => return */ movb 2(%eax), %cl /* get byte from string */ cmpb %cl, (%esp,%ecx) /* is it contained in stopset? */ - je L6 /* yes => return */ + je L(6) /* yes => return */ movb 3(%eax), %cl /* get byte from string */ cmpb %cl, (%esp,%ecx) /* is it contained in stopset? */ - jne L3 /* yes => return */ + jne L(3) /* yes => return */ incl %eax /* adjust pointer */ -L6: incl %eax -L5: incl %eax +L(6): incl %eax +L(5): incl %eax -L4: addl $256, %esp /* remove stopset */ +L(4): addl $256, %esp /* remove stopset */ orb %cl, %cl /* was last character NUL? */ - jnz L7 /* no => return pointer */ + jnz L(7) /* no => return pointer */ xorl %eax, %eax /* return NULL */ -L7: ret +L(7): ret END (strpbrk) |