mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
2533775393
2003-06-13 Ulrich Drepper <drepper@redhat.com> Fixing gcc 3.3 warnings, part II. * argp/argp-help.c (hol_entry_long_iterate): Always inline. * elf/dl-load.c (cache_rpath): Don't inline. * iconvdata/cns11642l2.h: Always inline all functions. * iconvdata/iso-ir-165.h: Likewise. * locale/Makefile (aux): Add coll-lookup. * locale/coll-lookup.c: New file. * locale/coll-lookup.h (collidx_table_lookup): Do not define here. (collseq_table_lookup): Likewise. * locale/weightwc.h: Adjust collidx_table_lookup calls for name change. * posix/fnmatch_loop.c: Adjust collseq_table_lookup calls for name change. * posix/regcomp.c: Likewise. * posix/regexec.c: Likewise. * locale/programs/3level.h (*_get): Always inline. * locale/programs/locfile.h: Move definition of handle_copy to... * locale/programs/locfile.c: ...here. * locale/programs/ld-collate.c (obstack_int32_grow): Always inline. (obstack_int32_grow_fast): Likewise. (utf8_encode): Likewise. (find_element): Avoid aliasing problems. (insert_value): Likewise. (collate_read): Likewise. * nss/getent.c (print_hosts): Don't inline (print_networks): Likewise. (print_shadow): Likewise. (build_doc): Likewise. * nss/nss_files/files-parse.c [ENTDATA] (parser_stclass): Don't inline. * posix/regcomp.c (re_set_fastmap): Always inline. (seek_collating_symbol_entry): Likewise. (lookup_collation_sequence_value): Likewise. (build_range_exp): Likewise. (build_collating_symbol): Likewise. * posix/regexec.c (acquire_init_state_context): Don't inline. (clean_state_log_if_need): Likewise. * resolv/res_send.c (eConsIovec): Rewrite to not return struct and adjust all callers. (evConsTime): Likewise. (evAddTime): Likewise. (evSubTime): Likewise. (evNowTime): Likewise. (evTimeSpec): Removed. (__libc_res_nsend): Avoid aliasing problem. * sysdeps/unix/sysv/linux/ifreq.h: Move old_siocgifconf definition to.. * sysdeps/unix/sysv/linux/ifreq.c: ...here. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_string_hwcap): Always inline. (_dl_string_platform): Likewise. * wctype/wchar-lookup.h (wctype_table_lookup): Always inline. (wcwidth_table_lookup): Likewise. (wctrans_table_lookup): Likewise. * sysdeps/unix/sysv/linux/sys/epoll.h: Include <stdint.h>.
145 lines
4.7 KiB
C
145 lines
4.7 KiB
C
/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
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.
|
|
|
|
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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <stdint.h>
|
|
|
|
/* Tables indexed by a wide character are compressed through the use
|
|
of a multi-level lookup. The compression effect comes from blocks
|
|
that don't need particular data and from blocks that can share their
|
|
data. */
|
|
|
|
/* Bit tables are accessed by cutting wc in four blocks of bits:
|
|
- the high 32-q-p bits,
|
|
- the next q bits,
|
|
- the next p bits,
|
|
- the next 5 bits.
|
|
|
|
+------------------+-----+-----+-----+
|
|
wc = + 32-q-p-5 | q | p | 5 |
|
|
+------------------+-----+-----+-----+
|
|
|
|
p and q are variable. For 16-bit Unicode it is sufficient to
|
|
choose p and q such that q+p+5 <= 16.
|
|
|
|
The table contains the following uint32_t words:
|
|
- q+p+5,
|
|
- s = upper exclusive bound for wc >> (q+p+5),
|
|
- p+5,
|
|
- 2^q-1,
|
|
- 2^p-1,
|
|
- 1st-level table: s offsets, pointing into the 2nd-level table,
|
|
- 2nd-level table: k*2^q offsets, pointing into the 3rd-level table,
|
|
- 3rd-level table: j*2^p words, each containing 32 bits of data.
|
|
*/
|
|
|
|
static __inline int
|
|
__attribute ((always_inline))
|
|
wctype_table_lookup (const char *table, uint32_t wc)
|
|
{
|
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
|
uint32_t index1 = wc >> shift1;
|
|
uint32_t bound = ((const uint32_t *) table)[1];
|
|
if (index1 < bound)
|
|
{
|
|
uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
|
|
if (lookup1 != 0)
|
|
{
|
|
uint32_t shift2 = ((const uint32_t *) table)[2];
|
|
uint32_t mask2 = ((const uint32_t *) table)[3];
|
|
uint32_t index2 = (wc >> shift2) & mask2;
|
|
uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
|
|
if (lookup2 != 0)
|
|
{
|
|
uint32_t mask3 = ((const uint32_t *) table)[4];
|
|
uint32_t index3 = (wc >> 5) & mask3;
|
|
uint32_t lookup3 = ((const uint32_t *)(table + lookup2))[index3];
|
|
|
|
return (lookup3 >> (wc & 0x1f)) & 1;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Byte tables are similar to bit tables, except that the addressing
|
|
unit is a single byte, and no 5 bits are used as a word index. */
|
|
|
|
static __inline int
|
|
__attribute ((always_inline))
|
|
wcwidth_table_lookup (const char *table, uint32_t wc)
|
|
{
|
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
|
uint32_t index1 = wc >> shift1;
|
|
uint32_t bound = ((const uint32_t *) table)[1];
|
|
if (index1 < bound)
|
|
{
|
|
uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
|
|
if (lookup1 != 0)
|
|
{
|
|
uint32_t shift2 = ((const uint32_t *) table)[2];
|
|
uint32_t mask2 = ((const uint32_t *) table)[3];
|
|
uint32_t index2 = (wc >> shift2) & mask2;
|
|
uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
|
|
if (lookup2 != 0)
|
|
{
|
|
uint32_t mask3 = ((const uint32_t *) table)[4];
|
|
uint32_t index3 = wc & mask3;
|
|
uint8_t lookup3 = ((const uint8_t *)(table + lookup2))[index3];
|
|
|
|
return lookup3;
|
|
}
|
|
}
|
|
}
|
|
return 0xff;
|
|
}
|
|
|
|
/* Mapping tables are similar to bit tables, except that the
|
|
addressing unit is a single signed 32-bit word, containing the
|
|
difference between the desired result and the argument, and no 5
|
|
bits are used as a word index. */
|
|
|
|
static __inline uint32_t
|
|
__attribute ((always_inline))
|
|
wctrans_table_lookup (const char *table, uint32_t wc)
|
|
{
|
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
|
uint32_t index1 = wc >> shift1;
|
|
uint32_t bound = ((const uint32_t *) table)[1];
|
|
if (index1 < bound)
|
|
{
|
|
uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
|
|
if (lookup1 != 0)
|
|
{
|
|
uint32_t shift2 = ((const uint32_t *) table)[2];
|
|
uint32_t mask2 = ((const uint32_t *) table)[3];
|
|
uint32_t index2 = (wc >> shift2) & mask2;
|
|
uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
|
|
if (lookup2 != 0)
|
|
{
|
|
uint32_t mask3 = ((const uint32_t *) table)[4];
|
|
uint32_t index3 = wc & mask3;
|
|
int32_t lookup3 = ((const int32_t *)(table + lookup2))[index3];
|
|
|
|
return wc + lookup3;
|
|
}
|
|
}
|
|
}
|
|
return wc;
|
|
}
|