update from main archive 961010
This commit is contained in:
parent
81e25b608d
commit
05e860710a
@ -1,84 +0,0 @@
|
||||
/* Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
|
||||
|
||||
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., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/* Return the length of the null-terminated string STR. Scan for
|
||||
the null terminator quickly by testing eight bytes at a time. */
|
||||
|
||||
char *
|
||||
strchr (const char *str, int c)
|
||||
{
|
||||
const char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
unsigned long int charmask;
|
||||
|
||||
c = (unsigned char) c;
|
||||
|
||||
/* Handle the first few characters by reading one character at a time.
|
||||
Do this until STR is aligned on a 8-byte border. */
|
||||
for (char_ptr = str; ((unsigned long int) char_ptr & 7) != 0; ++char_ptr)
|
||||
if (*char_ptr == c)
|
||||
return (char *) char_ptr;
|
||||
else if (*char_ptr == '\0')
|
||||
return NULL;
|
||||
|
||||
longword_ptr = (unsigned long int *) char_ptr;
|
||||
|
||||
/* Set up a longword, each of whose bytes is C. */
|
||||
charmask = c | (c << 8);
|
||||
charmask |= charmask << 16;
|
||||
charmask |= charmask << 32;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
const unsigned long int longword = *longword_ptr++;
|
||||
int ge, le, zero;
|
||||
|
||||
/* Set bits in ZERO if bytes in LONGWORD are zero. */
|
||||
asm ("cmpbge $31, %1, %0" : "=r" (zero) : "r" (longword));
|
||||
|
||||
/* Set bits in GE if bytes in CHARMASK are >= bytes in LONGWORD. */
|
||||
asm ("cmpbge %1, %2, %0" : "=r" (ge) : "r" (charmask), "r" (longword));
|
||||
|
||||
/* Set bits in LE if bytes in CHARMASK are <= bytes in LONGWORD. */
|
||||
asm ("cmpbge %2, %1, %0" : "=r" (le) : "r" (charmask), "r" (longword));
|
||||
|
||||
/* Bytes that are both <= and >= are == to C. */
|
||||
if (zero || (ge & le))
|
||||
{
|
||||
/* Which of the bytes was the C? */
|
||||
|
||||
char *cp = (char *) (longword_ptr - 1);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 8; i++)
|
||||
{
|
||||
if (cp[i] == c)
|
||||
return &cp[i];
|
||||
if (cp[i] == 0)
|
||||
return NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef weak_alias
|
||||
#undef index
|
||||
weak_alias (strchr, index)
|
||||
#endif
|
@ -290,18 +290,19 @@ $unaligned:
|
||||
|
||||
negq t7, t6 # .. e1 : build bitmask of bytes <= zero
|
||||
and t6, t7, t8 # e0 :
|
||||
nop # .. e1 :
|
||||
and a1, 7, t5 # .. e1 :
|
||||
subq t8, 1, t6 # e0 :
|
||||
or t6, t8, t7 # e1 :
|
||||
srl t8, t5, t8 # e0 : adjust final null return value
|
||||
|
||||
zapnot t2, t7, t2 # e0 : prepare source word; mirror changes
|
||||
zapnot t2, t7, t2 # .. e1 : prepare source word; mirror changes
|
||||
and t1, t2, t1 # e1 : to source validity mask
|
||||
extql t2, a1, t2 # e0 :
|
||||
extql t2, a1, t2 # .. e0 :
|
||||
extql t1, a1, t1 # e0 :
|
||||
|
||||
andnot t0, t2, t0 # e0 : zero place for source to reside
|
||||
andnot t0, t2, t0 # .. e1 : zero place for source to reside
|
||||
or t0, t1, t1 # e1 : and put it there
|
||||
stq_u t1, 0(a0) # e0 :
|
||||
ret (t9) # .. e1 :
|
||||
stq_u t1, 0(a0) # .. e0 :
|
||||
ret (t9)
|
||||
|
||||
.end __stxcpy
|
||||
|
@ -21,6 +21,7 @@ error. Instead, the error condition is indicated by returning the old
|
||||
break value (instead of the new, requested one). */
|
||||
|
||||
#include <sysdep.h>
|
||||
#define _ERRNO_H
|
||||
#include <errnos.h>
|
||||
|
||||
#ifdef PIC
|
||||
|
Loading…
x
Reference in New Issue
Block a user