mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 11:04:18 +08:00
49e4877c54
I tried building gdb with G++ 4.7 and CXX="g++ -std=gnu+11", and that tripped on a build error: In file included from build-gnulib/import/stdio.h:53:0, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20: build-gnulib/import/stddef.h:104:3: error: conflicting declaration ‘typedef union max_align_t max_align_t’ In file included from build-gnulib/import/stddef.h:55:0, from build-gnulib/import/stdio.h:53, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20: /opt/gcc-4.7/lib/gcc/x86_64-unknown-linux-gnu/4.7.4/include/stddef.h:426:3: error: ‘max_align_t’ has a previous declaration as ‘typedef struct max_align_t max_align_t’ Updating gnulib to current master fixes it, since it brings in this fix: http://lists.gnu.org/archive/html/bug-gnulib/2016-04/msg00000.html Our last update was in August 2015. This doesn't bring in much added baggage, it's mostly bug fixes. It pulled in the "limits-h" module as automatic dependency, and given that looks potentially useful I added it to the set of modules we require. Tested on x86_64 Fedora 23, with g++ 4.7 and g++ 5.3, native and gdbserver. gdb/ChangeLog: 2016-10-18 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 2692e23a48e21f6daa029e8af9f1a143b7532f47. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile: Update. * gnulib/import/alloca: Update. * gnulib/import/basename-lgpl: Update. * gnulib/import/canonicalize-lgpl: Update. * gnulib/import/config: Update. * gnulib/import/dirent: Update. * gnulib/import/dirfd: Update. * gnulib/import/dirname-lgpl: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/flexmember.h: Update. * gnulib/import/float+.h: Update. * gnulib/import/float: Update. * gnulib/import/float: Update. * gnulib/import/fnmatch: Update. * gnulib/import/fnmatch: Update. * gnulib/import/fnmatch_loop: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp: Update. * gnulib/import/frexpl: Update. * gnulib/import/gettimeofday: Update. * gnulib/import/hard-locale: Update. * gnulib/import/hard-locale.h: Update. * gnulib/import/inttypes: Update. * gnulib/import/isnan: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl: Update. * gnulib/import/itold: Update. * gnulib/import/limits: Update. * gnulib/import/localcharset: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat: Update. * gnulib/import/m4/00gnulib: Update. * gnulib/import/m4/absolute-header: Update. * gnulib/import/m4/alloca: Update. * gnulib/import/m4/canonicalize: Update. * gnulib/import/m4/codeset: Update. * gnulib/import/m4/configmake: Update. * gnulib/import/m4/dirent_h: Update. * gnulib/import/m4/dirfd: Update. * gnulib/import/m4/dirname: Update. * gnulib/import/m4/double-slash-root: Update. * gnulib/import/m4/eealloc: Update. * gnulib/import/m4/errno_h: Update. * gnulib/import/m4/exponentd: Update. * gnulib/import/m4/exponentl: Update. * gnulib/import/m4/extensions: Update. * gnulib/import/m4/extern-inline: Update. * gnulib/import/m4/fcntl-o: Update. * gnulib/import/m4/flexmember: Update. * gnulib/import/m4/float_h: Update. * gnulib/import/m4/fnmatch: Update. * gnulib/import/m4/fpieee: Update. * gnulib/import/m4/frexp: Update. * gnulib/import/m4/frexpl: Update. * gnulib/import/m4/gettimeofday: Update. * gnulib/import/m4/glibc21: Update. * gnulib/import/m4/gnulib-cache: Update. * gnulib/import/m4/gnulib-common: Update. * gnulib/import/m4/gnulib-comp: Update. * gnulib/import/m4/gnulib-tool: Update. * gnulib/import/m4/hard-locale: Update. * gnulib/import/m4/include_next: Update. * gnulib/import/m4/inttypes-pri: Update. * gnulib/import/m4/inttypes: Update. * gnulib/import/m4/isnand: Update. * gnulib/import/m4/isnanl: Update. * gnulib/import/m4/largefile: Update. * gnulib/import/m4/limits-h: Update. * gnulib/import/m4/localcharset: Update. * gnulib/import/m4/locale-fr: Update. * gnulib/import/m4/locale-ja: Update. * gnulib/import/m4/locale-zh: Update. * gnulib/import/m4/longlong: Update. * gnulib/import/m4/lstat: Update. * gnulib/import/m4/malloc: Update. * gnulib/import/m4/malloca: Update. * gnulib/import/m4/math_h: Update. * gnulib/import/m4/mbrtowc: Update. * gnulib/import/m4/mbsinit: Update. * gnulib/import/m4/mbsrtowcs: Update. * gnulib/import/m4/mbstate_t: Update. * gnulib/import/m4/memchr: Update. * gnulib/import/m4/memmem: Update. * gnulib/import/m4/mmap-anon: Update. * gnulib/import/m4/multiarch: Update. * gnulib/import/m4/nocrash: Update. * gnulib/import/m4/off_t: Update. * gnulib/import/m4/pathmax: Update. * gnulib/import/m4/rawmemchr: Update. * gnulib/import/m4/readlink: Update. * gnulib/import/m4/rename: Update. * gnulib/import/m4/rmdir: Update. * gnulib/import/m4/signal_h: Update. * gnulib/import/m4/ssize_t: Update. * gnulib/import/m4/stat: Update. * gnulib/import/m4/stdbool: Update. * gnulib/import/m4/stddef_h: Update. * gnulib/import/m4/stdint: Update. * gnulib/import/m4/stdio_h: Update. * gnulib/import/m4/stdlib_h: Update. * gnulib/import/m4/strchrnul: Update. * gnulib/import/m4/string_h: Update. * gnulib/import/m4/strstr: Update. * gnulib/import/m4/strtok_r: Update. * gnulib/import/m4/sys_socket_h: Update. * gnulib/import/m4/sys_stat_h: Update. * gnulib/import/m4/sys_time_h: Update. * gnulib/import/m4/sys_types_h: Update. * gnulib/import/m4/time_h: Update. * gnulib/import/m4/unistd_h: Update. * gnulib/import/m4/warn-on-use: Update. * gnulib/import/m4/wchar_h: Update. * gnulib/import/m4/wchar_t: Update. * gnulib/import/m4/wctype_h: Update. * gnulib/import/m4/wint_t: Update. * gnulib/import/malloc: Update. * gnulib/import/malloca: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math: Update. * gnulib/import/math: Update. * gnulib/import/mbrtowc: Update. * gnulib/import/mbsinit: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state: Update. * gnulib/import/mbsrtowcs: Update. * gnulib/import/memchr: Update. * gnulib/import/memmem: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/rawmemchr: Update. * gnulib/import/readlink: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename: Update. * gnulib/import/rmdir: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/signal: Update. * gnulib/import/stat: Update. * gnulib/import/stdbool: Update. * gnulib/import/stddef: Update. * gnulib/import/stdint: Update. * gnulib/import/stdio: Update. * gnulib/import/stdlib: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/strchrnul: Update. * gnulib/import/streq.h: Update. * gnulib/import/string: Update. * gnulib/import/stripslash: Update. * gnulib/import/strnlen1: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr: Update. * gnulib/import/strtok_r: Update. * gnulib/import/sys_stat: Update. * gnulib/import/sys_time: Update. * gnulib/import/sys_types: Update. * gnulib/import/time: Update. * gnulib/import/unistd: Update. * gnulib/import/unistd: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar: Update. * gnulib/import/wctype: Update. * gnulib/import/flexmember.h: New file. * gnulib/import/hard-locale.c: New file. * gnulib/import/hard-locale.h: New file. * gnulib/import/limits.in.h: New file. * gnulib/import/m4/flexmember.m4: New file. * gnulib/import/m4/hard-locale.m4: New file. * gnulib/import/m4/limits-h.m4: New file.
173 lines
5.7 KiB
C
173 lines
5.7 KiB
C
/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
|
|
Free Software Foundation, Inc.
|
|
|
|
Based on strlen implementation 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).
|
|
|
|
NOTE: The canonical source of this file is maintained with the GNU C Library.
|
|
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
|
|
|
|
This program is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 3 of the License, or any
|
|
later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _LIBC
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#if defined _LIBC
|
|
# include <memcopy.h>
|
|
#else
|
|
# define reg_char char
|
|
#endif
|
|
|
|
#include <limits.h>
|
|
|
|
#if HAVE_BP_SYM_H || defined _LIBC
|
|
# include <bp-sym.h>
|
|
#else
|
|
# define BP_SYM(sym) sym
|
|
#endif
|
|
|
|
#undef __memchr
|
|
#ifdef _LIBC
|
|
# undef memchr
|
|
#endif
|
|
|
|
#ifndef weak_alias
|
|
# define __memchr memchr
|
|
#endif
|
|
|
|
/* Search no more than N bytes of S for C. */
|
|
void *
|
|
__memchr (void const *s, int c_in, size_t n)
|
|
{
|
|
/* On 32-bit hardware, choosing longword to be a 32-bit unsigned
|
|
long instead of a 64-bit uintmax_t tends to give better
|
|
performance. On 64-bit hardware, unsigned long is generally 64
|
|
bits already. Change this typedef to experiment with
|
|
performance. */
|
|
typedef unsigned long int longword;
|
|
|
|
const unsigned char *char_ptr;
|
|
const longword *longword_ptr;
|
|
longword repeated_one;
|
|
longword repeated_c;
|
|
unsigned reg_char c;
|
|
|
|
c = (unsigned char) c_in;
|
|
|
|
/* Handle the first few bytes by reading one byte at a time.
|
|
Do this until CHAR_PTR is aligned on a longword boundary. */
|
|
for (char_ptr = (const unsigned char *) s;
|
|
n > 0 && (size_t) char_ptr % sizeof (longword) != 0;
|
|
--n, ++char_ptr)
|
|
if (*char_ptr == c)
|
|
return (void *) char_ptr;
|
|
|
|
longword_ptr = (const longword *) char_ptr;
|
|
|
|
/* All these elucidatory comments refer to 4-byte longwords,
|
|
but the theory applies equally well to any size longwords. */
|
|
|
|
/* Compute auxiliary longword values:
|
|
repeated_one is a value which has a 1 in every byte.
|
|
repeated_c has c in every byte. */
|
|
repeated_one = 0x01010101;
|
|
repeated_c = c | (c << 8);
|
|
repeated_c |= repeated_c << 16;
|
|
if (0xffffffffU < (longword) -1)
|
|
{
|
|
repeated_one |= repeated_one << 31 << 1;
|
|
repeated_c |= repeated_c << 31 << 1;
|
|
if (8 < sizeof (longword))
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 64; i < sizeof (longword) * 8; i *= 2)
|
|
{
|
|
repeated_one |= repeated_one << i;
|
|
repeated_c |= repeated_c << i;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Instead of the traditional loop which tests each byte, 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 equal to c. We first use an xor
|
|
with repeated_c. This reduces the task to testing whether *any of the
|
|
four* bytes in longword1 is zero.
|
|
|
|
We compute tmp =
|
|
((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
|
|
That is, we perform the following operations:
|
|
1. Subtract repeated_one.
|
|
2. & ~longword1.
|
|
3. & a mask consisting of 0x80 in every byte.
|
|
Consider what happens in each byte:
|
|
- If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
|
|
and step 3 transforms it into 0x80. A carry can also be propagated
|
|
to more significant bytes.
|
|
- If a byte of longword1 is nonzero, let its lowest 1 bit be at
|
|
position k (0 <= k <= 7); so the lowest k bits are 0. After step 1,
|
|
the byte ends in a single bit of value 0 and k bits of value 1.
|
|
After step 2, the result is just k bits of value 1: 2^k - 1. After
|
|
step 3, the result is 0. And no carry is produced.
|
|
So, if longword1 has only non-zero bytes, tmp is zero.
|
|
Whereas if longword1 has a zero byte, call j the position of the least
|
|
significant zero byte. Then the result has a zero at positions 0, ...,
|
|
j-1 and a 0x80 at position j. We cannot predict the result at the more
|
|
significant bytes (positions j+1..3), but it does not matter since we
|
|
already have a non-zero bit at position 8*j+7.
|
|
|
|
So, the test whether any byte in longword1 is zero is equivalent to
|
|
testing whether tmp is nonzero. */
|
|
|
|
while (n >= sizeof (longword))
|
|
{
|
|
longword longword1 = *longword_ptr ^ repeated_c;
|
|
|
|
if ((((longword1 - repeated_one) & ~longword1)
|
|
& (repeated_one << 7)) != 0)
|
|
break;
|
|
longword_ptr++;
|
|
n -= sizeof (longword);
|
|
}
|
|
|
|
char_ptr = (const unsigned char *) longword_ptr;
|
|
|
|
/* At this point, we know that either n < sizeof (longword), or one of the
|
|
sizeof (longword) bytes starting at char_ptr is == c. On little-endian
|
|
machines, we could determine the first such byte without any further
|
|
memory accesses, just by looking at the tmp result from the last loop
|
|
iteration. But this does not work on big-endian machines. Choose code
|
|
that works in both cases. */
|
|
|
|
for (; n > 0; --n, ++char_ptr)
|
|
{
|
|
if (*char_ptr == c)
|
|
return (void *) char_ptr;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
#ifdef weak_alias
|
|
weak_alias (__memchr, BP_SYM (memchr))
|
|
#endif
|