2019-01-01 08:11:28 +08:00
|
|
|
/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
|
1999-12-31 07:59:06 +08:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Written by Ulrich Drepper, <drepper@cygnus.com>.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 12:58:11 +08:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1999-12-31 07:59:06 +08:00
|
|
|
|
|
|
|
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
|
2001-07-06 12:58:11 +08:00
|
|
|
Lesser General Public License for more details.
|
1999-12-31 07:59:06 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-10 07:18:22 +08:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 13:40:42 +08:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1999-12-31 07:59:06 +08:00
|
|
|
|
2014-09-12 07:02:17 +08:00
|
|
|
#ifndef _WEIGHTWC_H_
|
|
|
|
#define _WEIGHTWC_H_ 1
|
|
|
|
|
Narrowing the visibility of libc-internal.h even further.
posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar
to what was done with libc-diag.h, I have split the definitions of
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN
to a new header, libc-pointer-arith.h.
It then occurred to me that the remaining declarations in libc-internal.h
are mostly to do with early initialization, and probably most of the
files including it, even in the core code, don't need it anymore. Indeed,
only 19 files actually need what remains of libc-internal.h. 23 others
need libc-diag.h instead, and 12 need libc-pointer-arith.h instead.
No file needs more than one of them, and 16 don't need any of them!
So, with this patch, libc-internal.h stops including libc-diag.h as
well as losing the pointer arithmetic macros, and all including files
are adjusted.
* include/libc-pointer-arith.h: New file. Define
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and
PTR_ALIGN_DOWN here.
* include/libc-internal.h: Definitions of above macros
moved from here. Don't include libc-diag.h anymore either.
* posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h.
Don't include libc-internal.h.
* debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c
* io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c
* nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c
* string/strcoll_l.c, sysdeps/nacl/brk.c
* sysdeps/unix/clock_settime.c
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c
* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c:
Don't include libc-internal.h.
* elf/get-dynamic-info.h, iconv/loop.c
* iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h
* misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h
* nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c
* soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c
* sysdeps/ieee754/dbl-64/e_lgamma_r.c
* sysdeps/ieee754/dbl-64/k_rem_pio2.c
* sysdeps/ieee754/flt-32/e_lgammaf_r.c
* sysdeps/ieee754/flt-32/k_rem_pio2f.c
* sysdeps/ieee754/ldbl-128/k_tanl.c
* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
* sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h:
Include libc-diag.h instead of libc-internal.h.
* elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c
* nptl/nptl-init.c, string/strcspn.c, string/strspn.c
* malloc/malloc.c, sysdeps/i386/nptl/tls.h
* sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h
* sysdeps/unix/sysv/linux/spawni.c
* sysdeps/x86_64/nptl/tls.h:
Include libc-pointer-arith.h instead of libc-internal.h.
* elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h
* sysdeps/x86_64/atomic-machine.h:
Add multiple include guard.
2017-02-27 09:17:52 +08:00
|
|
|
#include <libc-diag.h>
|
2016-11-01 04:46:57 +08:00
|
|
|
|
1999-12-31 07:59:06 +08:00
|
|
|
/* Find index of weight. */
|
2014-09-12 07:02:17 +08:00
|
|
|
static inline int32_t __attribute__ ((always_inline))
|
|
|
|
findidx (const int32_t *table,
|
|
|
|
const int32_t *indirect,
|
|
|
|
const wint_t *extra,
|
|
|
|
const wint_t **cpp, size_t len)
|
1999-12-31 07:59:06 +08:00
|
|
|
{
|
2018-02-28 00:54:14 +08:00
|
|
|
/* With GCC 7 when compiling with -Os the compiler warns that
|
|
|
|
seq1.back_us and seq2.back_us, which become *cpp, might be used
|
|
|
|
uninitialized. This is impossible as this function cannot be
|
|
|
|
called except in cases where those fields have been
|
|
|
|
initialized. */
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
DIAG_IGNORE_Os_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
|
2005-03-06 15:27:56 +08:00
|
|
|
wint_t ch = *(*cpp)++;
|
2018-02-28 00:54:14 +08:00
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
2005-03-06 15:27:56 +08:00
|
|
|
int32_t i = __collidx_table_lookup ((const char *) table, ch);
|
1999-12-31 07:59:06 +08:00
|
|
|
|
|
|
|
if (i >= 0)
|
|
|
|
/* This is an index into the weight table. Cool. */
|
|
|
|
return i;
|
|
|
|
|
|
|
|
/* Oh well, more than one sequence starting with this byte.
|
|
|
|
Search for the correct one. */
|
2007-07-29 04:36:21 +08:00
|
|
|
const int32_t *cp = (const int32_t *) &extra[-i];
|
2011-11-29 17:52:22 +08:00
|
|
|
--len;
|
1999-12-31 07:59:06 +08:00
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
size_t nhere;
|
2005-03-06 15:27:56 +08:00
|
|
|
const int32_t *usrc = (const int32_t *) *cpp;
|
1999-12-31 07:59:06 +08:00
|
|
|
|
|
|
|
/* The first thing is the index. */
|
2000-02-13 16:17:12 +08:00
|
|
|
i = *cp++;
|
1999-12-31 07:59:06 +08:00
|
|
|
|
|
|
|
/* Next is the length of the byte sequence. These are always
|
|
|
|
short byte sequences so there is no reason to call any
|
|
|
|
function (even if they are inlined). */
|
|
|
|
nhere = *cp++;
|
|
|
|
|
|
|
|
if (i >= 0)
|
|
|
|
{
|
|
|
|
/* It is a single character. If it matches we found our
|
|
|
|
index. Note that at the end of each list there is an
|
|
|
|
entry of length zero which represents the single byte
|
|
|
|
sequence. The first (and here only) byte was tested
|
|
|
|
already. */
|
|
|
|
size_t cnt;
|
|
|
|
|
2016-10-30 11:45:40 +08:00
|
|
|
/* With GCC 5.3 when compiling with -Os the compiler warns
|
|
|
|
that seq2.back_us, which becomes usrc, might be used
|
|
|
|
uninitialized. This can't be true because we pass a length
|
|
|
|
of -1 for len at the same time which means that this loop
|
|
|
|
never executes. */
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
|
2011-11-29 17:52:22 +08:00
|
|
|
for (cnt = 0; cnt < nhere && cnt < len; ++cnt)
|
1999-12-31 07:59:06 +08:00
|
|
|
if (cp[cnt] != usrc[cnt])
|
|
|
|
break;
|
2016-10-30 11:45:40 +08:00
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
1999-12-31 07:59:06 +08:00
|
|
|
|
|
|
|
if (cnt == nhere)
|
|
|
|
{
|
|
|
|
/* Found it. */
|
|
|
|
*cpp += nhere;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Up to the next entry. */
|
|
|
|
cp += nhere;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is a range of characters. First decide whether the
|
|
|
|
current byte sequence lies in the range. */
|
|
|
|
size_t cnt;
|
2000-02-12 06:11:40 +08:00
|
|
|
size_t offset;
|
1999-12-31 07:59:06 +08:00
|
|
|
|
2018-02-07 21:36:14 +08:00
|
|
|
/* With GCC 7 when compiling with -Os the compiler warns
|
|
|
|
that seq1.back_us and seq2.back_us, which become usrc,
|
|
|
|
might be used uninitialized. This is impossible for the
|
|
|
|
same reason as described above. */
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
DIAG_IGNORE_Os_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
|
2011-11-29 17:52:22 +08:00
|
|
|
for (cnt = 0; cnt < nhere - 1 && cnt < len; ++cnt)
|
1999-12-31 07:59:06 +08:00
|
|
|
if (cp[cnt] != usrc[cnt])
|
|
|
|
break;
|
2018-02-07 21:36:14 +08:00
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
1999-12-31 07:59:06 +08:00
|
|
|
|
2018-07-25 00:02:28 +08:00
|
|
|
if (cnt < nhere - 1 || cnt == len)
|
2000-02-12 06:11:40 +08:00
|
|
|
{
|
|
|
|
cp += 2 * nhere;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2018-02-28 00:54:14 +08:00
|
|
|
/* With GCC 7 when compiling with -Os the compiler warns
|
|
|
|
that seq1.back_us and seq2.back_us, which become usrc,
|
|
|
|
might be used uninitialized. This is impossible for the
|
|
|
|
same reason as described above. */
|
|
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
|
|
DIAG_IGNORE_Os_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
|
2018-07-25 00:02:28 +08:00
|
|
|
if (cp[nhere - 1] > usrc[nhere - 1])
|
1999-12-31 07:59:06 +08:00
|
|
|
{
|
2000-02-12 06:11:40 +08:00
|
|
|
cp += 2 * nhere;
|
|
|
|
continue;
|
1999-12-31 07:59:06 +08:00
|
|
|
}
|
2018-02-28 00:54:14 +08:00
|
|
|
DIAG_POP_NEEDS_COMMENT;
|
1999-12-31 07:59:06 +08:00
|
|
|
|
2018-07-25 00:02:28 +08:00
|
|
|
if (cp[2 * nhere - 1] < usrc[nhere - 1])
|
2000-02-12 06:11:40 +08:00
|
|
|
{
|
|
|
|
cp += 2 * nhere;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This range matches the next characters. Now find
|
|
|
|
the offset in the indirect table. */
|
|
|
|
offset = usrc[nhere - 1] - cp[nhere - 1];
|
1999-12-31 07:59:06 +08:00
|
|
|
*cpp += nhere;
|
2000-02-12 06:11:40 +08:00
|
|
|
|
|
|
|
return indirect[-i + offset];
|
1999-12-31 07:59:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTREACHED */
|
|
|
|
return 0x43219876;
|
|
|
|
}
|
2014-09-12 07:02:17 +08:00
|
|
|
|
|
|
|
#endif /* weightwc.h */
|