1995-02-18 01:27:10 +00:00
|
|
|
/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
|
|
|
|
Based on strlen implemention by Torbjorn Granlund (tege@sics.se),
|
|
|
|
with help from Dan Sahlin (dan@sics.se) and
|
|
|
|
commentary by Jim Blandy (jimb@ai.mit.edu);
|
|
|
|
adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
|
|
|
|
and implemented by Roland McGrath (roland@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., 675 Mass Ave,
|
|
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
|
1995-03-13 03:38:06 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#undef __ptr_t
|
|
|
|
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
|
|
|
|
# define __ptr_t void *
|
|
|
|
#else /* Not C++ or ANSI C. */
|
|
|
|
# define __ptr_t char *
|
|
|
|
#endif /* C++ or ANSI C. */
|
|
|
|
|
|
|
|
#if defined (HAVE_STRING_H) || defined (_LIBC)
|
|
|
|
# include <string.h>
|
|
|
|
#endif
|
|
|
|
|
Thu Mar 16 00:04:41 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/C-ctype.c: New correct data generated by drepper.
* Rules: Don't use $(libc.a).
Parsing of grouped numbers contributed by Ulrich Drepper.
* stdlib/strtol.c (__strtol_internal): Renamed from strtol. Take
new flag arg; if nonzero, parse locale-dependent thousands
grouping and interpret only the prefix that is correctly grouped.
(strtol): Define this to call _strtol_internal with zero for the flag.
Use a weak symbol for the definition.
* stdlib/strtod.c (strtod, __strtod_internal): Likewise.
Check for the exponent of the number overflowing the float format.
* stdlib/stdlib.h (__strtof, __strtold): Declarations removed.
(__strto{f,d,ld,l,ul,q,uq}_internal): Declare these functions.
[__OPTIMIZE__]: Define inline functions calling those.
* stdlib/grouping.h: New file, written by drepper.
* stdlib/Makefile (distribute): Add grouping.h.
* stdio/vfscanf.c: Grok %' modifier to numeric conversions. Call
__strtoX_internal with the grouping flag set iff the modifier is
present.
Wed Mar 15 00:40:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/generic/memchr.c: Fix typos: limit.h -> limits.h.
* mach/Machrules: Produce static deps for all object flavors.
[interface-library]: Remove all these variables and rules.
($(interface-library)-routines): Define this variable.
(extra-libs): Append $(interface-library) to this.
* mach/Makefile (interface-library): Omit .a suffix.
* hurd/Makefile: Likewise.
Tue Mar 14 23:40:31 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/internals.c (flushbuf): If !FLUSH_ONLY, don't skip out
early if no new data in buffer after priming.
* Makerules (object-suffixes, libtypes): Move all these variables
to Makeconfig.
* Makeconfig (object-suffixes, libtypes): Moved here from Makerules.
* Makerules (build-extra-lib): New canned sequence.
* sysdeps/mach/hurd/euidaccess.c: Include fcntl.h. Declare ERR;
fix uses of FILE and PORT. Remove bogus weak alias for `access'.
* sysdeps/mach/hurd/dirfd.c: Include hurd/fd.h and errno.h.
Add missing semicolon.
* sysdeps/mach/hurd/opendir.c: Include hurd/fd.h. Use a `struct
hurd_fd *' temp var, since DIRP->__fd is a `void *'.
* sysdeps/mach/hurd/readdir.c: Include hurd/fd.h.
* stdlib/wcstombs.c: #if 0 out code for non-ASCII chars until the
locale data format is implemented.
* sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler):
Pass &__sigreturn on the stack to the trampoline code, so it is
not position-dependent.
* stdio/printf_fp.c (NDEBUG): Define this to disable assert.
Don't include <stdarg.h>.
(__printf_fp): Last arg ARGS is now `const void **const';
dereference ARGS[0] instead of using va_arg.
* locale/setlocale.c: In LC_ALL case, initialize CATEGORY before
loop to install data.
* locale/loadlocale.c (_nl_category_num_items): Use _NL_ITEM_INDEX
to extract number from item code.
(_nl_load_locale): Close the descriptor when finished.
* malloc/realloc.c (_realloc_internal): Call _malloc_internal in
place of malloc.
* time/tzfile.c (__tzfile_default): Initialize RULE_STDOFF to zero.
1995-03-16 05:32:45 +00:00
|
|
|
#if defined (HAVE_LIMITS_H) || defined (_LIBC)
|
|
|
|
# include <limits.h>
|
1995-03-13 03:38:06 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#define LONG_MAX_32_BITS 2147483647
|
|
|
|
|
|
|
|
#ifndef LONG_MAX
|
|
|
|
#define LONG_MAX LONG_MAX_32_BITS
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Search no more than N bytes of S for C. */
|
|
|
|
|
1995-03-13 03:38:06 +00:00
|
|
|
__ptr_t
|
|
|
|
memchr (s, c, n)
|
|
|
|
const __ptr_t s;
|
|
|
|
int c;
|
|
|
|
size_t n;
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
1995-03-13 03:38:06 +00:00
|
|
|
const unsigned char *char_ptr;
|
|
|
|
const unsigned long int *longword_ptr;
|
1995-02-18 01:27:10 +00:00
|
|
|
unsigned long int longword, magic_bits, charmask;
|
|
|
|
|
|
|
|
c = (unsigned char) c;
|
|
|
|
|
|
|
|
/* Handle the first few characters by reading one character at a time.
|
|
|
|
Do this until CHAR_PTR is aligned on a longword boundary. */
|
|
|
|
for (char_ptr = s; n > 0 && ((unsigned long int) char_ptr
|
|
|
|
& (sizeof (longword) - 1)) != 0;
|
|
|
|
--n, ++char_ptr)
|
|
|
|
if (*char_ptr == c)
|
1995-03-13 03:38:06 +00:00
|
|
|
return (__ptr_t) char_ptr;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
/* All these elucidatory comments refer to 4-byte longwords,
|
|
|
|
but the theory applies equally well to 8-byte longwords. */
|
|
|
|
|
|
|
|
longword_ptr = (unsigned long int *) char_ptr;
|
|
|
|
|
|
|
|
/* Bits 31, 24, 16, and 8 of this number are zero. Call these bits
|
|
|
|
the "holes." Note that there is a hole just to the left of
|
|
|
|
each byte, with an extra at the end:
|
|
|
|
|
|
|
|
bits: 01111110 11111110 11111110 11111111
|
|
|
|
bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
|
|
|
|
|
|
|
|
The 1-bits make sure that carries propagate to the next 0-bit.
|
|
|
|
The 0-bits provide holes for carries to fall into. */
|
1995-03-13 03:38:06 +00:00
|
|
|
|
|
|
|
if (sizeof (longword) != 4 && sizeof (longword) != 8)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
#if LONG_MAX <= LONG_MAX_32_BITS
|
|
|
|
magic_bits = 0x7efefeff;
|
|
|
|
#else
|
|
|
|
magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
|
|
|
|
#endif
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
/* Set up a longword, each of whose bytes is C. */
|
|
|
|
charmask = c | (c << 8);
|
|
|
|
charmask |= charmask << 16;
|
1995-03-13 03:38:06 +00:00
|
|
|
#if LONG_MAX > LONG_MAX_32_BITS
|
|
|
|
charmask |= charmask << 32;
|
|
|
|
#endif
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
/* Instead of the traditional loop which tests each character,
|
|
|
|
we will test a longword at a time. The tricky part is testing
|
|
|
|
if *any of the four* bytes in the longword in question are zero. */
|
|
|
|
while (n >= sizeof (longword))
|
|
|
|
{
|
|
|
|
/* We tentatively exit the loop if adding MAGIC_BITS to
|
|
|
|
LONGWORD fails to change any of the hole bits of LONGWORD.
|
|
|
|
|
|
|
|
1) Is this safe? Will it catch all the zero bytes?
|
|
|
|
Suppose there is a byte with all zeros. Any carry bits
|
|
|
|
propagating from its left will fall into the hole at its
|
|
|
|
least significant bit and stop. Since there will be no
|
|
|
|
carry from its most significant bit, the LSB of the
|
|
|
|
byte to the left will be unchanged, and the zero will be
|
|
|
|
detected.
|
|
|
|
|
|
|
|
2) Is this worthwhile? Will it ignore everything except
|
|
|
|
zero bytes? Suppose every byte of LONGWORD has a bit set
|
|
|
|
somewhere. There will be a carry into bit 8. If bit 8
|
|
|
|
is set, this will carry into bit 16. If bit 8 is clear,
|
|
|
|
one of bits 9-15 must be set, so there will be a carry
|
|
|
|
into bit 16. Similarly, there will be a carry into bit
|
|
|
|
24. If one of bits 24-30 is set, there will be a carry
|
|
|
|
into bit 31, so all of the hole bits will be changed.
|
|
|
|
|
|
|
|
The one misfire occurs when bits 24-30 are clear and bit
|
|
|
|
31 is set; in this case, the hole at bit 31 is not
|
|
|
|
changed. If we had access to the processor carry flag,
|
|
|
|
we could close this loophole by putting the fourth hole
|
|
|
|
at bit 32!
|
|
|
|
|
|
|
|
So it ignores everything except 128's, when they're aligned
|
|
|
|
properly.
|
|
|
|
|
|
|
|
3) But wait! Aren't we looking for C, not zero?
|
|
|
|
Good point. So what we do is XOR LONGWORD with a longword,
|
|
|
|
each of whose bytes is C. This turns each byte that is C
|
|
|
|
into a zero. */
|
|
|
|
|
|
|
|
longword = *longword_ptr++ ^ charmask;
|
|
|
|
|
|
|
|
/* Add MAGIC_BITS to LONGWORD. */
|
|
|
|
if ((((longword + magic_bits)
|
|
|
|
|
|
|
|
/* Set those bits that were unchanged by the addition. */
|
|
|
|
^ ~longword)
|
|
|
|
|
|
|
|
/* Look at only the hole bits. If any of the hole bits
|
|
|
|
are unchanged, most likely one of the bytes was a
|
|
|
|
zero. */
|
|
|
|
& ~magic_bits) != 0)
|
|
|
|
{
|
|
|
|
/* Which of the bytes was C? If none of them were, it was
|
|
|
|
a misfire; continue the search. */
|
|
|
|
|
1995-03-13 03:38:06 +00:00
|
|
|
const unsigned char *cp = (const unsigned char *) (longword_ptr - 1);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
if (cp[0] == c)
|
1995-03-13 03:38:06 +00:00
|
|
|
return (__ptr_t) cp;
|
1995-02-18 01:27:10 +00:00
|
|
|
if (cp[1] == c)
|
1995-03-13 03:38:06 +00:00
|
|
|
return (__ptr_t) &cp[1];
|
1995-02-18 01:27:10 +00:00
|
|
|
if (cp[2] == c)
|
1995-03-13 03:38:06 +00:00
|
|
|
return (__ptr_t) &cp[2];
|
1995-02-18 01:27:10 +00:00
|
|
|
if (cp[3] == c)
|
1995-03-13 03:38:06 +00:00
|
|
|
return (__ptr_t) &cp[3];
|
|
|
|
#if LONG_MAX > 2147483647
|
|
|
|
if (cp[4] == c)
|
|
|
|
return (__ptr_t) &cp[4];
|
|
|
|
if (cp[5] == c)
|
|
|
|
return (__ptr_t) &cp[5];
|
|
|
|
if (cp[6] == c)
|
|
|
|
return (__ptr_t) &cp[6];
|
|
|
|
if (cp[7] == c)
|
|
|
|
return (__ptr_t) &cp[7];
|
|
|
|
#endif
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
n -= sizeof (longword);
|
|
|
|
}
|
|
|
|
|
1995-03-13 03:38:06 +00:00
|
|
|
char_ptr = (const unsigned char *) longword_ptr;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
while (n-- > 0)
|
|
|
|
{
|
|
|
|
if (*char_ptr == c)
|
1995-03-13 03:38:06 +00:00
|
|
|
return (__ptr_t) char_ptr;
|
1995-02-18 01:27:10 +00:00
|
|
|
else
|
|
|
|
++char_ptr;
|
|
|
|
}
|
|
|
|
|
1995-03-13 03:38:06 +00:00
|
|
|
return 0;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|