mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* ctype/Versions: Add __ctype32_tolower and __ctype32_toupper.
	* ctype/ctype-info.c: Define __ctype32_tolower and __ctype32_toupper.
	* locale/C-ctype.c: Add _nl_C_LC_CTYPE_toupper32 and
	_nl_C_LC_CTYPE_tolower32 tables.
	Don't compile it names of 14652 classes and maps.
	* locale/langinfo.h: Define _NL_CTYPE_TOUPPER32 and
	_NL_CTYPE_TOLOWER32.
	* locale/lc-ctype.c (_nl_postload_ctype): Initialize __ctype32_toupper
	and __ctype32_tolower.
	* locale/programs/ld-ctype.c (struct locale_ctype_t): Add map32.
	(ctype_output): Write out map32 values.
	(allocate_arrays): Compute mapping tables correctly.
	* wctype/wcfuncs.c (towlower): Use __ctype32_tolower.
	(towupper): Use __ctype32_toupper.
	* wctype/wctype.h: Optimize towupper and towlower for values < 256.
This commit is contained in:
Ulrich Drepper 1999-12-08 19:53:27 +00:00
parent 85cb60ffd7
commit 49f2be5b0e
9 changed files with 168 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,5 +1,21 @@
1999-12-08 Ulrich Drepper <drepper@cygnus.com>
* ctype/Versions: Add __ctype32_tolower and __ctype32_toupper.
* ctype/ctype-info.c: Define __ctype32_tolower and __ctype32_toupper.
* locale/C-ctype.c: Add _nl_C_LC_CTYPE_toupper32 and
_nl_C_LC_CTYPE_tolower32 tables.
Don't compile it names of 14652 classes and maps.
* locale/langinfo.h: Define _NL_CTYPE_TOUPPER32 and
_NL_CTYPE_TOLOWER32.
* locale/lc-ctype.c (_nl_postload_ctype): Initialize __ctype32_toupper
and __ctype32_tolower.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Add map32.
(ctype_output): Write out map32 values.
(allocate_arrays): Compute mapping tables correctly.
* wctype/wcfuncs.c (towlower): Use __ctype32_tolower.
(towupper): Use __ctype32_toupper.
* wctype/wctype.h: Optimize towupper and towlower for values < 256.
* locale/programs/ld-ctype.c (set_class_defaults): Correctly
determine tolower mapping for 8bit table if the tolower keyword is
not given.

4
ctype/Versions
View File

@ -11,4 +11,8 @@ libc {
# t*
toascii; tolower; toupper;
}
GLIBC_2.2 {
# global variables
__ctype32_tolower; __ctype32_toupper;
}
}

6
ctype/ctype-info.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
/* Copyright (C) 1991, 92, 95, 96, 97, 99 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -24,6 +24,8 @@ extern const char _nl_C_LC_CTYPE_class[];
extern const char _nl_C_LC_CTYPE_class32[];
extern const char _nl_C_LC_CTYPE_toupper[];
extern const char _nl_C_LC_CTYPE_tolower[];
extern const char _nl_C_LC_CTYPE_toupper32[];
extern const char _nl_C_LC_CTYPE_tolower32[];
extern const char _nl_C_LC_CTYPE_names[];
extern const char _nl_C_LC_CTYPE_width[];
@ -33,5 +35,7 @@ const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
const __uint32_t *__ctype32_tolower = b (__int32_t, tolower32, 0);
const __uint32_t *__ctype32_toupper = b (__int32_t, toupper32, 0);
const __uint32_t *__ctype_names = b (__uint32_t, names, 0);
const unsigned char *__ctype_width = b (unsigned char, width, 0);

91
locale/C-ctype.c
View File

@ -182,7 +182,7 @@ const char _nl_C_LC_CTYPE_class32[1024] =
/* 0xfc */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
/* 0xff */ "\000\000\002\000"
;
const u_int32_t _nl_C_LC_CTYPE_toupper[384] =
const uint32_t _nl_C_LC_CTYPE_toupper[384] =
{
/* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
/* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
@ -233,7 +233,7 @@ const u_int32_t _nl_C_LC_CTYPE_toupper[384] =
/* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
/* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
const u_int32_t _nl_C_LC_CTYPE_tolower[384] =
const uint32_t _nl_C_LC_CTYPE_tolower[384] =
{
/* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
/* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
@ -284,7 +284,77 @@ const u_int32_t _nl_C_LC_CTYPE_tolower[384] =
/* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
/* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
const u_int32_t _nl_C_LC_CTYPE_names[256] =
const uint32_t _nl_C_LC_CTYPE_toupper32[256] =
{
/* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
/* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
/* 0x10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
/* 0x18 */ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
/* 0x20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
/* 0x28 */ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
/* 0x30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
/* 0x38 */ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
/* 0x40 */ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
/* 0x48 */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
/* 0x50 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
/* 0x58 */ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
/* 0x60 */ 0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
/* 0x68 */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
/* 0x70 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
/* 0x78 */ 0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
/* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
/* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
/* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
/* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
/* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
/* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
/* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
/* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
/* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
/* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
/* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
/* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
/* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
/* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
/* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
/* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
const uint32_t _nl_C_LC_CTYPE_tolower32[256] =
{
/* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
/* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
/* 0x10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
/* 0x18 */ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
/* 0x20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
/* 0x28 */ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
/* 0x30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
/* 0x38 */ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
/* 0x40 */ 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
/* 0x48 */ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/* 0x50 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
/* 0x58 */ 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
/* 0x60 */ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
/* 0x68 */ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/* 0x70 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
/* 0x78 */ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
/* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
/* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
/* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
/* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
/* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
/* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
/* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
/* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
/* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
/* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
/* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
/* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
/* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
/* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
/* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
/* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
const uint32_t _nl_C_LC_CTYPE_names[256] =
{
/* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
/* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
@ -343,7 +413,7 @@ const struct locale_data _nl_C_LC_CTYPE =
_nl_C_name,
NULL, 0, 0, /* no file mapped */
UNDELETABLE,
60,
62,
{
{ string: _nl_C_LC_CTYPE_class },
{ string: (const char *) _nl_C_LC_CTYPE_toupper },
@ -354,16 +424,25 @@ const struct locale_data _nl_C_LC_CTYPE =
{ word: 1 },
{ string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
"print\0" "graph\0" "blank\0" "cntrl\0" "punct\0" "alnum\0"
#ifdef PREDEFINED_CLASSES
"left_to_right\0" "right_to_left\0" "num_terminator\0"
"num_separator\0" "segment_separator\0" "block_separator\0"
"direction_control\0" "sym_swap_layout\0" "char_shape_selector\0"
"num_shape_selector\0" "non_spacing\0" "non_spacing_level3\0"
"r_connect\0" "no_connect\0" "no_connect-space\0"
"vowel_connect\0" },
{ string: "tolower\0" "toupper\0" "tosymmetric\0" },
"vowel_connect\0"
#endif
},
{ string: "tolower\0" "toupper\0"
#ifdef PREDEFINED_CLASSES
"tosymmetric\0"
#endif
},
{ string: _nl_C_LC_CTYPE_width },
{ word: 1 },
{ string: "ANSI_X3.4-1968" },
{ string: (const char *) _nl_C_LC_CTYPE_toupper32 },
{ string: (const char *) _nl_C_LC_CTYPE_tolower32 },
{ word: 1 },
{ string: "0" },
{ string: "1" },

2
locale/langinfo.h
View File

@ -271,6 +271,8 @@ enum
#ifdef __USE_XOPEN
CODESET = _NL_CTYPE_CODESET_NAME,
#endif
_NL_CTYPE_TOUPPER32,
_NL_CTYPE_TOLOWER32,
_NL_CTYPE_INDIGITS_MB_LEN,
_NL_CTYPE_INDIGITS0_MB,
_NL_CTYPE_INDIGITS1_MB,

4
locale/lc-ctype.c
View File

@ -43,11 +43,15 @@ _nl_postload_ctype (void)
extern const uint32_t *__ctype32_b;
extern const uint32_t *__ctype_names;
extern const unsigned char *__ctype_width;
extern const uint32_t *__ctype32_toupper;
extern const uint32_t *__ctype32_tolower;
__ctype_b = current (uint16_t, CLASS, 128);
__ctype_toupper = current (uint32_t, TOUPPER, 128);
__ctype_tolower = current (uint32_t, TOLOWER, 128);
__ctype32_b = current (uint32_t, CLASS32, 0);
__ctype32_toupper = current (uint32_t, TOUPPER32, 0);
__ctype32_tolower = current (uint32_t, TOLOWER32, 0);
__ctype_names = current (uint32_t, NAMES, 0);
__ctype_width = current (unsigned char, WIDTH, 0);
}

46
locale/programs/ld-ctype.c
View File

@ -146,6 +146,7 @@ struct locale_ctype_t
char_class32_t *ctype32_b;
uint32_t *names;
uint32_t **map;
uint32_t **map32;
uint32_t *class_name_ptr;
uint32_t *map_name_ptr;
unsigned char *width;
@ -793,6 +794,15 @@ ctype_output (struct localedef_t *locale, struct charmap_t *charmap,
(ctype->plane_size * ctype->plane_cnt + 128)
* sizeof (uint32_t));
CTYPE_DATA (_NL_CTYPE_TOUPPER32,
ctype->map32[0],
(ctype->plane_size * ctype->plane_cnt + 128)
* sizeof (uint32_t));
CTYPE_DATA (_NL_CTYPE_TOLOWER32,
ctype->map32[1],
(ctype->plane_size * ctype->plane_cnt + 128)
* sizeof (uint32_t));
CTYPE_DATA (_NL_CTYPE_CLASS32,
ctype->ctype32_b,
(ctype->plane_size * ctype->plane_cnt
@ -969,7 +979,7 @@ ctype_output (struct localedef_t *locale, struct charmap_t *charmap,
/* Handle extra maps. */
size_t nr = (elem - _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE)) + 2;
iov[2 + elem + offset].iov_base = ctype->map[nr];
iov[2 + elem + offset].iov_base = ctype->map32[nr];
iov[2 + elem + offset].iov_len = ((ctype->plane_size
* ctype->plane_cnt + 128)
* sizeof (uint32_t));
@ -3019,22 +3029,17 @@ Computing table size for character classes might take a while..."),
ctype->ctype32_b[ctype->charnames[idx]] = ctype->class_collection[idx];
/* Room for table of mappings. */
ctype->map = (uint32_t **) xmalloc (ctype->map_collection_nr
ctype->map = (uint32_t **) xmalloc (2 * sizeof (uint32_t *));
ctype->map32 = (uint32_t **) xmalloc (ctype->map_collection_nr
* sizeof (uint32_t *));
/* Fill in all mappings. */
for (idx = 0; idx < ctype->map_collection_nr; ++idx)
for (idx = 0; idx < 2; ++idx)
{
unsigned int idx2;
/* Allocate table. */
ctype->map[idx] = (uint32_t *) xmalloc ((ctype->plane_size
* ctype->plane_cnt + 128)
* sizeof (uint32_t));
/* Copy default value (identity mapping). */
memcpy (&ctype->map[idx][128], ctype->names,
ctype->plane_size * ctype->plane_cnt * sizeof (uint32_t));
ctype->map[idx] = (uint32_t *) xmalloc ((256 + 128) * sizeof (uint32_t));
/* Copy values from collection. */
for (idx2 = 0; idx2 < 256; ++idx2)
@ -3047,12 +3052,25 @@ Computing table size for character classes might take a while..."),
/* EOF must map to EOF. */
ctype->map[idx][127] = EOF;
}
/* The 32 bit map collection. */
for (idx2 = 0; idx2 < ctype->map_collection_act[idx]; ++idx2)
for (idx = 0; idx < ctype->map_collection_nr; ++idx)
{
unsigned int idx2;
/* Allocate table. */
ctype->map[idx] = (uint32_t *) xmalloc (ctype->plane_size
* ctype->plane_cnt
* sizeof (uint32_t));
/* Copy default value (identity mapping). */
memcpy (ctype->map[idx], ctype->names,
ctype->plane_size * ctype->plane_cnt * sizeof (uint32_t));
/* Copy values from collection. */
for (idx2 = 0; idx2 < 256; ++idx2)
if (ctype->map_collection[idx][idx2] != 0)
ctype->map[idx][128 + ctype->charnames[idx2]]
= ctype->map_collection[idx][idx2];
ctype->map[idx][idx2] = ctype->map_collection[idx][idx2];
}
/* Extra array for class and map names. */

6
wctype/wcfuncs.c
View File

@ -25,6 +25,8 @@
/* If the program is compiled without optimization the following declaration
is not visible in the header. */
extern unsigned int *__ctype32_b;
extern const uint32_t *__ctype32_toupper;
extern const uint32_t *__ctype32_tolower;
/* Provide real-function versions of all the wctype macros. */
@ -76,7 +78,7 @@ wint_t
/* Character is not known. Default action is to simply return it. */
return wc;
return (wint_t) __ctype_tolower[idx];
return (wint_t) __ctype32_tolower[idx];
}
wint_t
@ -90,5 +92,5 @@ wint_t
/* Character is not known. Default action is to simply return it. */
return wc;
return (wint_t) __ctype_toupper[idx];
return (wint_t) __ctype32_toupper[idx];
}

16
wctype/wctype.h
View File

@ -238,6 +238,22 @@ extern wint_t towupper (wint_t __wc) __THROW;
/* Map the wide character WC using the mapping described by DESC. */
extern wint_t __towctrans (wint_t __wc, wctrans_t __desc) __THROW;
#if __GNUC__ >= 2 && defined __OPTIMIZE__
/* The tables are always organized in a way which allows direct access
for single byte characters. */
extern const wint_t *__ctype32_tolower;
extern const wint_t *__ctype32_toupper;
# define towlower(wc) \
(__builtin_constant_p (wc) && (wc) >= L'\0' && (wc) <= L'\xff' \
? (wint_t) __ctype32_tolower[wc] : towlower (wc))
# define towupper(wc) \
(__builtin_constant_p (wc) && (wc) >= L'\0' && (wc) <= L'\xff' \
? (wint_t) __ctype32_toupper[wc] : towupper (wc))
#endif /* gcc && optimizing */
__END_DECLS
#endif /* need iswxxx. */