Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated these files to glibc 2.3.5

Browse Source 
hopefully it should fix bug #754


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18549 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-08-21 15:05:59 +00:00
parent 9d402220eb
commit 5ed5c96602
5 changed files with 98 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/libroot/posix/glibc/locale/Jamfile
View File

@ -23,6 +23,7 @@ MergeObject posix_gnu_locale.o :
C-telephone.c
C-time.c
C_name.c
coll-lookup.c
# findlocale.c
lc-address.c
lc-collate.c

85
src/system/libroot/posix/glibc/locale/coll-lookup.c Normal file
View File

@ -0,0 +1,85 @@
/* 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>
#ifndef internal_function
# define internal_function
#endif
/* Lookup in a table of int32_t, with default value 0. */
int32_t
internal_function
__collidx_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 lookup3;
}
}
}
return 0;
}
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
uint32_t
internal_function
__collseq_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;
uint32_t lookup3 = ((const uint32_t *)(table + lookup2))[index3];
return lookup3;
}
}
}
return ~((uint32_t) 0);
}

83
src/system/libroot/posix/glibc/locale/coll-lookup.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
/* 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.
@ -17,85 +17,12 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
/* Word tables are accessed by cutting wc in three blocks of bits:
- the high 32-q-p bits,
- the next q bits,
- the next p bits.
+------------------+-----+-----+
wc = + 32-q-p | q | p |
+------------------+-----+-----+
p and q are variable. For 16-bit Unicode it is sufficient to
choose p and q such that q+p <= 16.
The table contains the following uint32_t words:
- q+p,
- s = upper exclusive bound for wc >> (q+p),
- p,
- 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.
*/
#include <stdint.h>
/* Lookup in a table of int32_t, with default value 0. */
static inline int32_t
collidx_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 lookup3;
}
}
}
return 0;
}
extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)
internal_function;
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
static inline uint32_t
collseq_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;
uint32_t lookup3 = ((const uint32_t *)(table + lookup2))[index3];
return lookup3;
}
}
}
return ~((uint32_t) 0);
}
extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)
internal_function;

5
src/system/libroot/posix/glibc/locale/weight.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
/* Copyright (C) 1996,1997,1998,1999,2000,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper, <drepper@cygnus.com>.
@ -18,7 +18,8 @@
02111-1307 USA. */
/* Find index of weight. */
static inline int32_t
auto inline int32_t
__attribute ((always_inline))
findidx (const unsigned char **cpp)
{
int_fast32_t i = table[*(*cpp)++];

7
src/system/libroot/posix/glibc/locale/weightwc.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
/* Copyright (C) 1996-2000, 2001,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper, <drepper@cygnus.com>.
@ -18,7 +18,8 @@
02111-1307 USA. */
/* Find index of weight. */
static inline int32_t
auto inline int32_t
__attribute ((always_inline))
findidx (const wint_t **cpp)
{
int32_t i;
@ -26,7 +27,7 @@ findidx (const wint_t **cpp)
wint_t ch;
ch = *(*cpp)++;
i = collidx_table_lookup ((const char *) table, ch);
i = __collidx_table_lookup ((const char *) table, ch);
if (i >= 0)
/* This is an index into the weight table. Cool. */