glibc/sysdeps/i386/i586/strchr.S
Ulrich Drepper 11336c165c update from main archive 961008
Wed Oct  9 00:30:33 1996  Ulrich Drepper  <drepper@cygnus.com>

	* inet/getnetgrent_r.c: Correct netgroup implementation.  A
	specification of a netgroup can also name another netgroup.
	* nss/nss_files/files-netgrp.c: Likewise.
	* inet/netgroup.h: Add fields to hold additional information.

Tue Oct  8 21:51:14 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>

	* posix/getopt.c: Implement POSIX -W option handling.  When the
	option string contains "W;" -W foo is handled like --foo.

Tue Oct  8 12:27:26 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/i386/clone.S: Define _ERRNO_H before
	inclusing <errnos.h> so we really get error symbols defined.
	* sysdeps/unix/sysv/linux/m68k/clone.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/clone.S: Likewise.

	* sunrpc/auth_unix.c (authunix_create_default): Don't use fixed
	size array for getgroups call.  Instead get maximal number via
	sysconf.  But discard list to NGRPS elements before calling XDR
	function since Sun's code cannot handle longer lists.
	Based on a patch by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.

	* sysdeps/stub/e_j0l.c: Define y0l as well.
	* sysdeps/stub/e_j1l.c: Define y1l as well.
	* sysdeps/stub/e_jnl.c: Define ynl as well.

	* posix/unistd.h: Correct prototype for execlp.

	* sysdeps/unix/sysv/linux/posix_opt.h: Define _POSIX_NO_TRUNC.

Mon Oct  7 22:18:03 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makeconfig (sysdep-library-path): New variable.
	(built-program-cmd): Use it here to properly build a colon
	separated library path.

Mon Oct  7 22:11:55 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* crypt/md5-crypt.c (md5_crypt_r): Add missing parens around &
	within comparison.  Fix comments.
	(md5_crypt): Fix comment.

Tue Oct  8 05:10:49 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/errnos.h: Only include <linux/errnos.h>
	when _ERRNO_H is defined.
	[!_ERRNO_H && __need_Emath]: Define value for EDOM and ERANGE.
	Should there ever be a Linux port where the numeric values are
	not 33 and 34 this file must change.

Mon Oct  7 13:54:04 1996  Ulrich Drepper  <drepper@cygnus.com>

	* libio/iofgets.c (_IO_fgets): Use _IO_flockfile instead of
	__flockfile.

Mon Oct  7 11:01:45 1996  Andreas Jaeger  <aj@arthur.pfalz.de>

	* string/tst-strlen.c (main): Provide prototype.
	* malloc/mallocbug.c: Likewise.
	* io/test-utime.c: Likewise.

	* sysdeps/generic/crypt-entry.c: Correct typo.

Mon Oct  7 13:42:20 1996  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-open.c (_dl_open): Check against _dl_sysdep_start to
	test for libc.a.  Checking _DYNAMIC is of no worth here.
	Suggested by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.

	* nss/nss_files/files-parse.c: Define LOOKUP_NAME even if
 	EXTERN_PARSER is defined.

Sat Oct  5 17:05:36 1996  Andreas Jaeger  <aj@arthur.pfalz.de>

	* Rules (dep-dummy-lib): Correct prototype for __dummy__.

	* crypt/md5-crypt.c: Fix typos in comments.

	* gmon/gmon.c: Provide prototypes.
	* db/makedb.c: Likewise.
	* locale/programs/xmalloc.c: Likewise.
	* stdio-common/bug11.c (main): Likewise.
	* stdio-common/bug7.c (main): Likewise.
	* stdio-common/bug8.c (main): Likewise.
	* stdio-common/bug9.c (main): Likewise.
	* stdio-common/scanf1.c (main): Likewise.
	* stdio-common/scanf2.c (main): Likewise.
	* stdio-common/scanf5.c (main): Likewise.
	* stdio-common/scanf6.c (main): Likewise.
	* stdio-common/scanf7.c (main): Likewise.
	* stdio-common/scanf8.c (main): Likewise.
	* stdio-common/temptest.c (main): Likewise.
	* stdio-common/test-fwrite.c (main): Likewise.
	* stdio-common/tst-printf.c: Likewise.
	* stdio-common/tstdiomisc.c: Likewise.
	* stdio-common/tstgetln.c (main): Likewise.
	* stdlib/testmb.c (main): Likewise.

	* stdio-common/scanf4.c (main): Correct prototype, remove unused
	variable n.

	* stdio-common/scanf3.c (main): Correct prototype, change
	declaration of s to reduce warnings.
	* stdio-common/bug10.c (main): Likewise.

	* stdio-common/tfformat.c: Provide prototype, remove unused
	reference to dump_stats, add braces in sprint_doubles.
	* stdio-common/tiformat.c: Likewise.

	* stdio-common/test_rdwr.c (main): Parameter `where' is long in
	printf call.

Mon Oct  7 14:04:26 1996  NIIBE Yutaka  <gniibe@mri.co.jp>

	* sysdeps/unix/sysv/linux/sys/soundcard.h: Fix typo.

	* shadow/putspent.c: Don't write colon after flag field.

	* sysdeps/unix/sysv/linux/net/if_ppp.h: New file.  Wrapper around
	kernel header.
	* sysdeps/unix/sysv/linux/net/ppp-comp.h: Likewise.
	* sysdeps/unix/sysv/linux/net/ppp_defs.h: Likewise.
	* sysdeps/unix/sysv/linux/Dist: Mention new files.

Mon Oct  7 00:58:19 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/i586/strchr.S: Correct handling of first bytes to
	get pointer aligned.  Reported by Matthias Urlichs <smurf@noris.de>.

	* sysdeps/posix/euidaccess.c [_LIBC]: Avoid calling get?id functions
	by using __libc_enable_secure variable.

	* sysdeps/libm-i387/s_copysignl.S: Correct loading of return value.
1996-10-08 23:39:20 +00:00

333 lines
8 KiB
ArmAsm

/* strchr -- find character CH in a NUL terminated string.
Highly optimized version for ix85, x>=5.
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
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>
/* This version is especially optimized for the i586 (and following?)
processors. This is mainly done by using the two pipelines. The
version optimized for i486 is weak in this aspect because to get
as much parallelism we have to executs some *more* instructions.
The code below is structured to reflect the pairing of the instructions
as *I think* it is. I have no processor data book to verify this.
If you find something you think is incorrect let me know. */
/* The magic value which is used throughout in the whole code. */
#define magic 0xfefefeff
/*
INPUT PARAMETERS:
str (sp + 4)
ch (sp + 8)
*/
.text
ENTRY (strchr)
pushl %edi /* Save callee-safe registers. */
pushl %esi
pushl %ebx
pushl %ebp
movl 20(%esp), %eax /* get string pointer */
movl 24(%esp), %edx /* get character we are looking for */
movl %eax, %edi /* duplicate string pointer for later */
xorl %ecx, %ecx /* clear %ecx */
/* At the moment %edx contains C. What we need for the
algorithm is C in all bytes of the dword. Avoid
operations on 16 bit words because these require an
prefix byte (and one more cycle). */
movb %dl, %dh /* now it is 0|0|c|c */
movb %dl, %cl /* we construct the lower half in %ecx */
shll $16, %edx /* now %edx is c|c|0|0 */
movb %cl, %ch /* now %ecx is 0|0|c|c */
orl %ecx, %edx /* and finally c|c|c|c */
andl $3, %edi /* mask alignment bits */
jz L11 /* alignment is 0 => start loop */
movb %dl, %cl /* 0 is needed below */
jp L0 /* exactly two bits set */
xorb (%eax), %cl /* is byte the one we are looking for? */
jz L2 /* yes => return pointer */
xorb %dl, %cl /* load single byte and test for NUL */
je L3 /* yes => return NULL */
movb 1(%eax), %cl /* load single byte */
incl %eax
cmpb %cl, %dl /* is byte == C? */
je L2 /* aligned => return pointer */
cmpb $0, %cl /* is byte NUL? */
je L3 /* yes => return NULL */
incl %eax
decl %edi
jne L11
L0: movb (%eax), %cl /* load single byte */
cmpb %cl, %dl /* is byte == C? */
je L2 /* aligned => return pointer */
cmpb $0, %cl /* is byte NUL? */
je L3 /* yes => return NULL */
incl %eax /* increment pointer */
/* The following code is the preparation for the loop. The
four instruction up to `L1' will not be executed in the loop
because the same code is found at the end of the loop, but
there it is executed in parallel with other instructions. */
L11: movl (%eax), %ecx
movl $magic, %ebp
movl $magic, %edi
addl %ecx, %ebp
/* The main loop: it looks complex and indeed it is. I would
love to say `it was hard to write, so it should he hard to
read' but I will give some more hints. To fully understand
this code you should first take a look at the i486 version.
The basic algorithm is the same, but here the code organized
in a way which permits to use both pipelines all the time.
I tried to make it a bit more understandable by indenting
the code according to stage in the algorithm. It goes as
follows:
check for 0 in 1st word
check for C in 1st word
check for 0 in 2nd word
check for C in 2nd word
check for 0 in 3rd word
check for C in 3rd word
check for 0 in 4th word
check for C in 4th word
Please note that doing the test for NUL before the test for
C allows us to overlap the test for 0 in the next word with
the test for C. */
L1: xorl %ecx, %ebp /* (word^magic) */
addl %ecx, %edi /* add magic word */
leal 4(%eax), %eax /* increment pointer */
jnc L4 /* previous addl caused overflow? */
movl %ecx, %ebx /* duplicate original word */
orl $magic, %ebp /* (word^magic)|magic */
addl $1, %ebp /* (word^magic)|magic == 0xffffffff? */
jne L4 /* yes => we found word with NUL */
movl $magic, %esi /* load magic value */
xorl %edx, %ebx /* clear words which are C */
movl (%eax), %ecx
addl %ebx, %esi /* (word+magic) */
movl $magic, %edi
jnc L5 /* previous addl caused overflow? */
movl %edi, %ebp
xorl %ebx, %esi /* (word+magic)^word */
addl %ecx, %ebp
orl $magic, %esi /* ((word+magic)^word)|magic */
addl $1, %esi /* ((word+magic)^word)|magic==0xf..f?*/
jne L5 /* yes => we found word with C */
xorl %ecx, %ebp
addl %ecx, %edi
leal 4(%eax), %eax
jnc L4
movl %ecx, %ebx
orl $magic, %ebp
addl $1, %ebp
jne L4
movl $magic, %esi
xorl %edx, %ebx
movl (%eax), %ecx
addl %ebx, %esi
movl $magic, %edi
jnc L5
movl %edi, %ebp
xorl %ebx, %esi
addl %ecx, %ebp
orl $magic, %esi
addl $1, %esi
jne L5
xorl %ecx, %ebp
addl %ecx, %edi
leal 4(%eax), %eax
jnc L4
movl %ecx, %ebx
orl $magic, %ebp
addl $1, %ebp
jne L4
movl $magic, %esi
xorl %edx, %ebx
movl (%eax), %ecx
addl %ebx, %esi
movl $magic, %edi
jnc L5
movl %edi, %ebp
xorl %ebx, %esi
addl %ecx, %ebp
orl $magic, %esi
addl $1, %esi
jne L5
xorl %ecx, %ebp
addl %ecx, %edi
leal 4(%eax), %eax
jnc L4
movl %ecx, %ebx
orl $magic, %ebp
addl $1, %ebp
jne L4
movl $magic, %esi
xorl %edx, %ebx
movl (%eax), %ecx
addl %ebx, %esi
movl $magic, %edi
jnc L5
movl %edi, %ebp
xorl %ebx, %esi
addl %ecx, %ebp
orl $magic, %esi
addl $1, %esi
je L1
/* We know there is no NUL byte but a C byte in the word.
%ebx contains NUL in this particular byte. */
L5: subl $4, %eax /* adjust pointer */
testb %bl, %bl /* first byte == C? */
jz L2 /* yes => return pointer */
incl %eax /* increment pointer */
testb %bh, %bh /* second byte == C? */
jz L2 /* yes => return pointer */
shrl $16, %ebx /* make upper bytes accessible */
incl %eax /* increment pointer */
cmp $0, %bl /* third byte == C */
je L2 /* yes => return pointer */
incl %eax /* increment pointer */
L2: popl %ebp /* restore saved registers */
popl %ebx
popl %esi
popl %edi
ret
/* We know there is a NUL byte in the word. But we have to test
whether there is an C byte before it in the word. */
L4: subl $4, %eax /* adjust pointer */
cmpb %dl, %cl /* first byte == C? */
je L2 /* yes => return pointer */
cmpb $0, %cl /* first byte == NUL? */
je L3 /* yes => return NULL */
incl %eax /* increment pointer */
cmpb %dl, %ch /* second byte == C? */
je L2 /* yes => return pointer */
cmpb $0, %ch /* second byte == NUL? */
je L3 /* yes => return NULL */
shrl $16, %ecx /* make upper bytes accessible */
incl %eax /* increment pointer */
cmpb %dl, %cl /* third byte == C? */
je L2 /* yes => return pointer */
cmpb $0, %cl /* third byte == NUL? */
je L3 /* yes => return NULL */
incl %eax /* increment pointer */
/* The test four the fourth byte is necessary! */
cmpb %dl, %ch /* fourth byte == C? */
je L2 /* yes => return pointer */
L3: xorl %eax, %eax /* set return value = NULL */
popl %ebp /* restore saved registers */
popl %ebx
popl %esi
popl %edi
ret
PSEUDO_END (strchr)
#undef index
weak_alias (strchr, index)