mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
09bf6406b1
2000-09-26 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/sparc32/bits/endian.h: Remove. * sysdeps/sparc/sparc32/ieee754.h: New. * sysdeps/sparc/sparc64/bits/endian.h: Move... * sysdeps/sparc/bits/endian.h: ...here. * sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__clone): Optimize. * sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (__clone): Check %o1, not %o0 to see if we're parent or child. Optimize. 2000-09-26 Jes Sorensen <jes@linuxcare.com> * sysdeps/unix/sysv/linux/ia64/fork.S: New file (based on code by Hans Boehm). * sysdeps/unix/sysv/linux/ia64/vfork.S: New file (based on code by Hans Boehm). * sysdeps/unix/sysv/linux/ia64/fork.c: Deleted (obsoleted by fork.S). 2000-09-20 H.J. Lu <hjl@gnu.org> * sysdeps/ia64/fpu/printf_fphex.c: New file. * sysdeps/ia64/fpu/libm-test-ulps: New file. 2000-09-17 H.J. Lu <hjl@gnu.org> * sysdeps/ia64/Makefile (long-double-fcts): New. Defined as yes. * sysdeps/ia64/fpu/s_isinfl.c: New file. Include sysdeps/i386/fpu/s_isinfl.c. * sysdeps/ia64/fpu/s_isnanl.c: New file. Include sysdeps/i386/fpu/s_isnanl.c. * sysdeps/ia64/fpu/s_nextafterl.c: New file. Include sysdeps/i386/fpu/s_nextafterl.c. * sysdeps/ia64/fpu/bits/mathdef.h: New file. Copied from sysdeps/i386/fpu/bits/mathdef.h. 2000-09-16 H.J. Lu <hjl@gnu.org> * sysdeps/generic/ldsodefs.h (DL_UNMAP): New. Defined if DL_UNMAP_IS_SPECIAL is not defined. * sysdeps/ia64/dl-lookupcfg.h (DL_UNMAP_IS_SPECIAL): Defined. (_dl_unmap): New prototype. (DL_UNMAP): New. Defined as _dl_unmap. * sysdeps/ia64/Versions [ld] (GLIBC_2.2): Add _dl_unmap. * elf/dl-close.c (_dl_close): Replace __munmap with DL_UNMAP. 2000-09-16 H.J. Lu <hjl@gnu.org> * sysdeps/generic/ldsodefs.h (DL_LOOKUP_ADDRESS): New. Defined if ELF_FUNCTION_PTR_IS_SPECIAL is not defined. * sysdeps/ia64/dl-lookupcfg.h (_dl_lookup_address): New prototype. (DL_LOOKUP_ADDRESS): New. Defined as _dl_lookup_address. * sysdeps/ia64/dl-fptr.c (_dl_lookup_address): New. Lookup the memory location of a function from a function descriptor. * sysdeps/ia64/Versions [ld] (GLIBC_2.2): Add _dl_lookup_address. * elf/dl-addr.c (_dl_addr): Use DL_LOOKUP_ADDRESS to get the memory location. 2000-09-14 Jes Sorensen <jes@linuxcare.com> * sysdeps/ia64/bits/byteswap.h (__bswap_16): Don't mark output variable as input argument. (__bswap_32): Likewise. * sysdeps/ia64/dl-machine.h: Add missing stop bit in RTLD_START() - found by Jim Wilson <wilson@cygnus.com> 2000-09-26 Ulrich Drepper <drepper@redhat.com> * string/strxfrm.c: Only require alignment on __alignof__ (int32_t) instead of 4. 2000-09-26 Andreas Schwab <schwab@suse.de> * locale/programs/ld-collate.c (collate_output): Only require alignment on __alignof__ (int32_t) instead of 4. * locale/loadlocale.c (_nl_load_locale): Likewise. * string/strcoll.c: Likewise. 2000-09-26 Jes Sorensen <jes@linuxcare.com> * sysdeps/ieee754/ldbl-96/e_atan2l.c (__ieee754_atan2l): Add parentheses around arithmetic used in | statement to kill compiler warning. * math/math_private.h: Add prototype for __finitel. (__ilogbl): Likewise. (__isinfl): Likewise. (__isnanl): Likewise. (__atanl): Likewise. (__copysignl): Likewise. (__expm1l): Likewise. (__floorl): Likewise. (__frexpl): Likewise. (__ldexpl): Likewise. (__log1pl): Likewise. (__nanl): Likewise. (__rintl): Likewise. (__scalbnl): Likewise. (__sqrtl): Likewise. (fabsl): Likewise. (__sincosl): Likewise. (si_isr) [USE_GNU]: Likewise. (ILL_BREAK) [USE_GNU]: Likewise. (FPE_DECOVF) [USE_GNU]: Likewise. (FPE_DECDIV) [USE_GNU]: Likewise. (FPE_DECERR) [USE_GNU]: Likewise. (FPE_INVASC) [USE_GNU]: Likewise. (FPE_INVDEC) [USE_GNU]: Likewise. (TRAP_BRANCH) [USE_GNU]: Likewise. (TRAP_HWBKPT) [USE_GNU]: Likewise. * sysdeps/ieee754/flt-32/s_exp2f.c: Likewise.
463 lines
12 KiB
C
463 lines
12 KiB
C
/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
|
|
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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <assert.h>
|
|
#include <langinfo.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/param.h>
|
|
|
|
#ifndef STRING_TYPE
|
|
# define STRING_TYPE char
|
|
# define USTRING_TYPE unsigned char
|
|
# ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
# define STRXFRM __strxfrm_l
|
|
# else
|
|
# define STRXFRM strxfrm
|
|
# endif
|
|
# define STRCMP strcmp
|
|
# define STRLEN strlen
|
|
# define STPNCPY __stpncpy
|
|
# define WEIGHT_H "../locale/weight.h"
|
|
# define SUFFIX MB
|
|
# define L(arg) arg
|
|
#endif
|
|
|
|
#define CONCAT(a,b) CONCAT1(a,b)
|
|
#define CONCAT1(a,b) a##b
|
|
|
|
#include "../locale/localeinfo.h"
|
|
|
|
|
|
#ifndef WIDE_CHAR_VERSION
|
|
|
|
/* We need UTF-8 encoding of numbers. */
|
|
static inline int
|
|
utf8_encode (char *buf, int val)
|
|
{
|
|
int retval;
|
|
|
|
if (val < 0x80)
|
|
{
|
|
*buf++ = (char) val;
|
|
retval = 1;
|
|
}
|
|
else
|
|
{
|
|
int step;
|
|
|
|
for (step = 2; step < 6; ++step)
|
|
if ((val & (~(uint32_t)0 << (5 * step + 1))) == 0)
|
|
break;
|
|
retval = step;
|
|
|
|
*buf = (unsigned char) (~0xff >> step);
|
|
--step;
|
|
do
|
|
{
|
|
buf[step] = 0x80 | (val & 0x3f);
|
|
val >>= 6;
|
|
}
|
|
while (--step > 0);
|
|
*buf |= val;
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
|
|
size_t
|
|
STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n)
|
|
#else
|
|
size_t
|
|
STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l)
|
|
#endif
|
|
{
|
|
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
struct locale_data *current = l->__locales[LC_COLLATE];
|
|
uint_fast32_t nrules = *((uint32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].string);
|
|
#else
|
|
uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
#endif
|
|
/* We don't assign the following values right away since it might be
|
|
unnecessary in case there are no rules. */
|
|
const unsigned char *rulesets;
|
|
const int32_t *table;
|
|
const USTRING_TYPE *weights;
|
|
const USTRING_TYPE *extra;
|
|
const int32_t *indirect;
|
|
uint_fast32_t pass;
|
|
size_t needed;
|
|
const USTRING_TYPE *usrc;
|
|
size_t srclen = STRLEN (src);
|
|
int32_t *idxarr;
|
|
unsigned char *rulearr;
|
|
size_t idxmax;
|
|
size_t idxcnt;
|
|
int use_malloc;
|
|
|
|
#include WEIGHT_H
|
|
|
|
if (nrules == 0)
|
|
{
|
|
if (n != 0)
|
|
STPNCPY (dest, src, MIN (srclen + 1, n));
|
|
|
|
return srclen;
|
|
}
|
|
|
|
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
rulesets = (const unsigned char *)
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_RULESETS)].string;
|
|
table = (const int32_t *)
|
|
current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_TABLE,SUFFIX))].string;
|
|
weights = (const USTRING_TYPE *)
|
|
current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_WEIGHT,SUFFIX))].string;
|
|
extra = (const USTRING_TYPE *)
|
|
current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_EXTRA,SUFFIX))].string;
|
|
indirect = (const int32_t *)
|
|
current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_INDIRECT,SUFFIX))].string;
|
|
#else
|
|
rulesets = (const unsigned char *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_RULESETS);
|
|
table = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, CONCAT(_NL_COLLATE_TABLE,SUFFIX));
|
|
weights = (const USTRING_TYPE *)
|
|
_NL_CURRENT (LC_COLLATE, CONCAT(_NL_COLLATE_WEIGHT,SUFFIX));
|
|
extra = (const USTRING_TYPE *)
|
|
_NL_CURRENT (LC_COLLATE, CONCAT(_NL_COLLATE_EXTRA,SUFFIX));
|
|
indirect = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, CONCAT(_NL_COLLATE_INDIRECT,SUFFIX));
|
|
#endif
|
|
use_malloc = 0;
|
|
|
|
assert (((uintptr_t) table) % __alignof__ (table[0]) == 0);
|
|
assert (((uintptr_t) weights) % __alignof__ (weights[0]) == 0);
|
|
assert (((uintptr_t) extra) % __alignof__ (extra[0]) == 0);
|
|
assert (((uintptr_t) indirect) % __alignof__ (indirect[0]) == 0);
|
|
|
|
/* Handle an empty string as a special case. */
|
|
if (srclen == 0)
|
|
{
|
|
if (n != 0)
|
|
*dest = L('\0');
|
|
return 1;
|
|
}
|
|
|
|
/* We need the elements of the string as unsigned values since they
|
|
are used as indeces. */
|
|
usrc = (const USTRING_TYPE *) src;
|
|
|
|
/* Perform the first pass over the string and while doing this find
|
|
and store the weights for each character. Since we want this to
|
|
be as fast as possible we are using `alloca' to store the temporary
|
|
values. But since there is no limit on the length of the string
|
|
we have to use `malloc' if the string is too long. We should be
|
|
very conservative here. */
|
|
if (srclen >= 16384)
|
|
{
|
|
idxarr = (int32_t *) malloc (srclen * (sizeof (int32_t) + 1));
|
|
rulearr = (unsigned char *) &idxarr[srclen];
|
|
|
|
if (idxarr == NULL)
|
|
/* No memory. Well, go with the stack then.
|
|
|
|
XXX Once this implementation is stable we will handle this
|
|
differently. Instead of precomputing the indeces we will
|
|
do this in time. This means, though, that this happens for
|
|
every pass again. */
|
|
goto try_stack;
|
|
use_malloc = 1;
|
|
}
|
|
else
|
|
{
|
|
try_stack:
|
|
idxarr = (int32_t *) alloca (srclen * sizeof (int32_t));
|
|
rulearr = (unsigned char *) alloca (srclen);
|
|
}
|
|
|
|
idxmax = 0;
|
|
do
|
|
{
|
|
int32_t tmp = findidx (&usrc);
|
|
rulearr[idxmax] = tmp >> 24;
|
|
idxarr[idxmax] = tmp & 0xffffff;
|
|
|
|
++idxmax;
|
|
}
|
|
while (*usrc != L('\0'));
|
|
|
|
/* Now the passes over the weights. We now use the indeces we found
|
|
before. */
|
|
needed = 0;
|
|
for (pass = 0; pass < nrules; ++pass)
|
|
{
|
|
size_t backw_stop = ~0ul;
|
|
int rule = rulesets[rulearr[0] * nrules + pass];
|
|
/* We assume that if a rule has defined `position' in one section
|
|
this is true for all of them. */
|
|
int position = rule & sort_position;
|
|
|
|
if (position == 0)
|
|
{
|
|
for (idxcnt = 0; idxcnt < idxmax; ++idxcnt)
|
|
{
|
|
if ((rule & sort_forward) != 0)
|
|
{
|
|
size_t len;
|
|
|
|
if (backw_stop != ~0ul)
|
|
{
|
|
/* Handle the pushed elements now. */
|
|
size_t backw;
|
|
|
|
for (backw = idxcnt - 1; backw >= backw_stop; --backw)
|
|
{
|
|
len = weights[idxarr[backw]++];
|
|
|
|
if (needed + len < n)
|
|
while (len-- > 0)
|
|
dest[needed++] = weights[idxarr[backw]++];
|
|
else
|
|
{
|
|
/* No more characters fit into the buffer. */
|
|
needed += len;
|
|
idxarr[backw] += len;
|
|
}
|
|
}
|
|
|
|
backw_stop = ~0ul;
|
|
}
|
|
|
|
/* Now handle the forward element. */
|
|
len = weights[idxarr[idxcnt]++];
|
|
if (needed + len < n)
|
|
while (len-- > 0)
|
|
dest[needed++] = weights[idxarr[idxcnt]++];
|
|
else
|
|
{
|
|
/* No more characters fit into the buffer. */
|
|
needed += len;
|
|
idxarr[idxcnt] += len;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Remember where the backwards series started. */
|
|
if (backw_stop == ~0ul)
|
|
backw_stop = idxcnt;
|
|
}
|
|
|
|
rule = rulesets[rulearr[idxcnt + 1] * nrules + pass];
|
|
}
|
|
|
|
|
|
if (backw_stop != ~0ul)
|
|
{
|
|
/* Handle the pushed elements now. */
|
|
size_t backw;
|
|
|
|
backw = idxcnt;
|
|
while (backw > backw_stop)
|
|
{
|
|
size_t len = weights[idxarr[--backw]++];
|
|
|
|
if (needed + len < n)
|
|
while (len-- > 0)
|
|
dest[needed++] = weights[idxarr[backw]++];
|
|
else
|
|
{
|
|
/* No more characters fit into the buffer. */
|
|
needed += len;
|
|
idxarr[backw] += len;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
int val = 1;
|
|
#ifndef WIDE_CHAR_VERSION
|
|
char buf[7];
|
|
size_t buflen;
|
|
#endif
|
|
size_t i;
|
|
|
|
for (idxcnt = 0; idxcnt < idxmax; ++idxcnt)
|
|
{
|
|
if ((rule & sort_forward) != 0)
|
|
{
|
|
size_t len;
|
|
|
|
if (backw_stop != ~0ul)
|
|
{
|
|
/* Handle the pushed elements now. */
|
|
size_t backw;
|
|
|
|
for (backw = idxcnt - 1; backw >= backw_stop; --backw)
|
|
{
|
|
len = weights[idxarr[backw]++];
|
|
if (len != 0)
|
|
{
|
|
#ifdef WIDE_CHAR_VERSION
|
|
if (needed + 1 + len < n)
|
|
{
|
|
dest[needed] = val;
|
|
for (i = 0; i < len; ++i)
|
|
dest[needed + 1 + i] =
|
|
weights[idxarr[backw] + i];
|
|
}
|
|
needed += 1 + len;
|
|
#else
|
|
buflen = utf8_encode (buf, val);
|
|
if (needed + buflen + len < n)
|
|
{
|
|
for (i = 0; i < buflen; ++i)
|
|
dest[needed + i] = buf[i];
|
|
for (i = 0; i < len; ++i)
|
|
dest[needed + buflen + i] =
|
|
weights[idxarr[backw] + i];
|
|
}
|
|
needed += buflen + len;
|
|
#endif
|
|
idxarr[backw] += len;
|
|
val = 1;
|
|
}
|
|
else
|
|
++val;
|
|
}
|
|
|
|
backw_stop = ~0ul;
|
|
}
|
|
|
|
/* Now handle the forward element. */
|
|
len = weights[idxarr[idxcnt]++];
|
|
if (len != 0)
|
|
{
|
|
#ifdef WIDE_CHAR_VERSION
|
|
if (needed + 1+ len < n)
|
|
{
|
|
dest[needed] = val;
|
|
for (i = 0; i < len; ++i)
|
|
dest[needed + 1 + i] =
|
|
weights[idxarr[idxcnt] + i];
|
|
}
|
|
needed += 1 + len;
|
|
#else
|
|
buflen = utf8_encode (buf, val);
|
|
if (needed + buflen + len < n)
|
|
{
|
|
for (i = 0; i < buflen; ++i)
|
|
dest[needed + i] = buf[i];
|
|
for (i = 0; i < len; ++i)
|
|
dest[needed + buflen + i] =
|
|
weights[idxarr[idxcnt] + i];
|
|
}
|
|
needed += buflen + len;
|
|
#endif
|
|
idxarr[idxcnt] += len;
|
|
val = 1;
|
|
}
|
|
else
|
|
/* Note that we don't have to increment `idxarr[idxcnt]'
|
|
since the length is zero. */
|
|
++val;
|
|
}
|
|
else
|
|
{
|
|
/* Remember where the backwards series started. */
|
|
if (backw_stop == ~0ul)
|
|
backw_stop = idxcnt;
|
|
}
|
|
|
|
rule = rulesets[rulearr[idxcnt + 1] * nrules + pass];
|
|
}
|
|
|
|
if (backw_stop != ~0)
|
|
{
|
|
/* Handle the pushed elements now. */
|
|
size_t backw;
|
|
|
|
backw = idxmax - 1;
|
|
while (backw > backw_stop)
|
|
{
|
|
size_t len = weights[idxarr[--backw]++];
|
|
if (len != 0)
|
|
{
|
|
#ifdef WIDE_CHAR_VERSION
|
|
if (needed + 1 + len < n)
|
|
{
|
|
dest[needed] = val;
|
|
for (i = 0; i < len; ++i)
|
|
dest[needed + 1 + i] =
|
|
weights[idxarr[backw] + i];
|
|
}
|
|
needed += 1 + len;
|
|
#else
|
|
buflen = utf8_encode (buf, val);
|
|
if (needed + buflen + len < n)
|
|
{
|
|
for (i = 0; i < buflen; ++i)
|
|
dest[needed + i] = buf[i];
|
|
for (i = 0; i < len; ++i)
|
|
dest[needed + buflen + i] =
|
|
weights[idxarr[backw] + i];
|
|
}
|
|
needed += buflen + len;
|
|
#endif
|
|
idxarr[backw] += len;
|
|
val = 1;
|
|
}
|
|
else
|
|
++val;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Finally store the byte to separate the passes or terminate
|
|
the string. */
|
|
if (needed < n)
|
|
dest[needed] = pass + 1 < nrules ? L('\1') : L('\0');
|
|
++needed;
|
|
}
|
|
|
|
/* This is a little optimization: many collation specifications have
|
|
a `position' rule at the end and if no non-ignored character
|
|
is found the last \1 byte is immediately followed by a \0 byte
|
|
signalling this. We can avoid the \1 byte(s). */
|
|
if (needed <= n && needed > 2 && dest[needed - 2] == L('\1'))
|
|
{
|
|
/* Remove the \1 byte. */
|
|
--needed;
|
|
dest[needed - 1] = L('\0');
|
|
}
|
|
|
|
/* Free the memory if needed. */
|
|
if (use_malloc)
|
|
free (idxarr);
|
|
|
|
/* Return the number of bytes/words we need, but don't count the NUL
|
|
byte/word at the end. */
|
|
return needed - 1;
|
|
}
|