mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
d64b6ad075
* Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
347 lines
9.0 KiB
C
347 lines
9.0 KiB
C
/* Internal function for converting integers to ASCII.
|
|
Copyright (C) 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Torbjorn Granlund <tege@matematik.su.se>
|
|
and Ulrich Drepper <drepper@gnu.org>.
|
|
|
|
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 <gmp-mparam.h>
|
|
#include <stdlib/gmp.h>
|
|
#include <stdlib/gmp-impl.h>
|
|
#include <stdlib/longlong.h>
|
|
|
|
#include "_itowa.h"
|
|
|
|
|
|
/* Canonize environment. For some architectures not all values might
|
|
be defined in the GMP header files. */
|
|
#ifndef UMUL_TIME
|
|
# define UMUL_TIME 1
|
|
#endif
|
|
#ifndef UDIV_TIME
|
|
# define UDIV_TIME 3
|
|
#endif
|
|
|
|
/* Control memory layout. */
|
|
#ifdef PACK
|
|
# undef PACK
|
|
# define PACK __attribute__ ((packed))
|
|
#else
|
|
# define PACK
|
|
#endif
|
|
|
|
|
|
/* Declare local types. */
|
|
struct base_table_t
|
|
{
|
|
#if (UDIV_TIME > 2 * UMUL_TIME)
|
|
mp_limb_t base_multiplier;
|
|
#endif
|
|
char flag;
|
|
char post_shift;
|
|
#if BITS_PER_MP_LIMB == 32
|
|
struct
|
|
{
|
|
char normalization_steps;
|
|
char ndigits;
|
|
mp_limb_t base PACK;
|
|
#if UDIV_TIME > 2 * UMUL_TIME
|
|
mp_limb_t base_ninv PACK;
|
|
#endif
|
|
} big;
|
|
#endif
|
|
};
|
|
|
|
/* To reduce the memory needed we include some fields of the tables
|
|
only conditionally. */
|
|
#if UDIV_TIME > 2 * UMUL_TIME
|
|
# define SEL1(X) X,
|
|
# define SEL2(X) ,X
|
|
#else
|
|
# define SEL1(X)
|
|
# define SEL2(X)
|
|
#endif
|
|
|
|
/* Factor table for the different bases. */
|
|
extern const struct base_table_t _itoa_base_table[];
|
|
|
|
/* Lower-case digits. */
|
|
extern const wchar_t _itowa_lower_digits[];
|
|
/* Upper-case digits. */
|
|
extern const wchar_t _itowa_upper_digits[];
|
|
|
|
|
|
wchar_t *
|
|
_itowa (value, buflim, base, upper_case)
|
|
unsigned long long int value;
|
|
wchar_t *buflim;
|
|
unsigned int base;
|
|
int upper_case;
|
|
{
|
|
const wchar_t *digits = (upper_case
|
|
? _itowa_upper_digits : _itowa_lower_digits);
|
|
wchar_t *bp = buflim;
|
|
const struct base_table_t *brec = &_itoa_base_table[base - 2];
|
|
|
|
switch (base)
|
|
{
|
|
#define RUN_2N(BITS) \
|
|
do \
|
|
{ \
|
|
/* `unsigned long long int' always has 64 bits. */ \
|
|
mp_limb_t work_hi = value >> (64 - BITS_PER_MP_LIMB); \
|
|
\
|
|
if (BITS_PER_MP_LIMB == 32) \
|
|
{ \
|
|
if (work_hi != 0) \
|
|
{ \
|
|
mp_limb_t work_lo; \
|
|
int cnt; \
|
|
\
|
|
work_lo = value & 0xfffffffful; \
|
|
for (cnt = BITS_PER_MP_LIMB / BITS; cnt > 0; --cnt) \
|
|
{ \
|
|
*--bp = digits[work_lo & ((1ul << BITS) - 1)]; \
|
|
work_lo >>= BITS; \
|
|
} \
|
|
if (BITS_PER_MP_LIMB % BITS != 0) \
|
|
{ \
|
|
work_lo \
|
|
|= ((work_hi \
|
|
& ((1 << (BITS - BITS_PER_MP_LIMB%BITS)) \
|
|
- 1)) \
|
|
<< BITS_PER_MP_LIMB % BITS); \
|
|
work_hi >>= BITS - BITS_PER_MP_LIMB % BITS; \
|
|
if (work_hi == 0) \
|
|
work_hi = work_lo; \
|
|
else \
|
|
*--bp = digits[work_lo]; \
|
|
} \
|
|
} \
|
|
else \
|
|
work_hi = value & 0xfffffffful; \
|
|
} \
|
|
do \
|
|
{ \
|
|
*--bp = digits[work_hi & ((1 << BITS) - 1)]; \
|
|
work_hi >>= BITS; \
|
|
} \
|
|
while (work_hi != 0); \
|
|
} \
|
|
while (0)
|
|
case 8:
|
|
RUN_2N (3);
|
|
break;
|
|
|
|
case 16:
|
|
RUN_2N (4);
|
|
break;
|
|
|
|
default:
|
|
{
|
|
#if BITS_PER_MP_LIMB == 64
|
|
mp_limb_t base_multiplier = brec->base_multiplier;
|
|
if (brec->flag)
|
|
while (value != 0)
|
|
{
|
|
mp_limb_t quo, rem, x, dummy;
|
|
|
|
umul_ppmm (x, dummy, value, base_multiplier);
|
|
quo = (x + ((value - x) >> 1)) >> (brec->post_shift - 1);
|
|
rem = value - quo * base;
|
|
*--bp = digits[rem];
|
|
value = quo;
|
|
}
|
|
else
|
|
while (value != 0)
|
|
{
|
|
mp_limb_t quo, rem, x, dummy;
|
|
|
|
umul_ppmm (x, dummy, value, base_multiplier);
|
|
quo = x >> brec->post_shift;
|
|
rem = value - quo * base;
|
|
*--bp = digits[rem];
|
|
value = quo;
|
|
}
|
|
#endif
|
|
#if BITS_PER_MP_LIMB == 32
|
|
mp_limb_t t[3];
|
|
int n;
|
|
|
|
/* First convert x0 to 1-3 words in base s->big.base.
|
|
Optimize for frequent cases of 32 bit numbers. */
|
|
if ((mp_limb_t) (value >> 32) >= 1)
|
|
{
|
|
#if UDIV_TIME > 2 * UMUL_TIME || UDIV_NEEDS_NORMALIZATION
|
|
int big_normalization_steps = brec->big.normalization_steps;
|
|
mp_limb_t big_base_norm
|
|
= brec->big.base << big_normalization_steps;
|
|
#endif
|
|
if ((mp_limb_t) (value >> 32) >= brec->big.base)
|
|
{
|
|
mp_limb_t x1hi, x1lo, r;
|
|
/* If you want to optimize this, take advantage of
|
|
that the quotient in the first udiv_qrnnd will
|
|
always be very small. It might be faster just to
|
|
subtract in a tight loop. */
|
|
|
|
#if UDIV_TIME > 2 * UMUL_TIME
|
|
mp_limb_t x, xh, xl;
|
|
|
|
if (big_normalization_steps == 0)
|
|
xh = 0;
|
|
else
|
|
xh = (mp_limb_t) (value >> (64 - big_normalization_steps));
|
|
xl = (mp_limb_t) (value >> (32 - big_normalization_steps));
|
|
udiv_qrnnd_preinv (x1hi, r, xh, xl, big_base_norm,
|
|
brec->big.base_ninv);
|
|
|
|
xl = ((mp_limb_t) value) << big_normalization_steps;
|
|
udiv_qrnnd_preinv (x1lo, x, r, xl, big_base_norm,
|
|
brec->big.base_ninv);
|
|
t[2] = x >> big_normalization_steps;
|
|
|
|
if (big_normalization_steps == 0)
|
|
xh = x1hi;
|
|
else
|
|
xh = ((x1hi << big_normalization_steps)
|
|
| (x1lo >> (32 - big_normalization_steps)));
|
|
xl = x1lo << big_normalization_steps;
|
|
udiv_qrnnd_preinv (t[0], x, xh, xl, big_base_norm,
|
|
brec->big.base_ninv);
|
|
t[1] = x >> big_normalization_steps;
|
|
#elif UDIV_NEEDS_NORMALIZATION
|
|
mp_limb_t x, xh, xl;
|
|
|
|
if (big_normalization_steps == 0)
|
|
xh = 0;
|
|
else
|
|
xh = (mp_limb_t) (value >> 64 - big_normalization_steps);
|
|
xl = (mp_limb_t) (value >> 32 - big_normalization_steps);
|
|
udiv_qrnnd (x1hi, r, xh, xl, big_base_norm);
|
|
|
|
xl = ((mp_limb_t) value) << big_normalization_steps;
|
|
udiv_qrnnd (x1lo, x, r, xl, big_base_norm);
|
|
t[2] = x >> big_normalization_steps;
|
|
|
|
if (big_normalization_steps == 0)
|
|
xh = x1hi;
|
|
else
|
|
xh = ((x1hi << big_normalization_steps)
|
|
| (x1lo >> 32 - big_normalization_steps));
|
|
xl = x1lo << big_normalization_steps;
|
|
udiv_qrnnd (t[0], x, xh, xl, big_base_norm);
|
|
t[1] = x >> big_normalization_steps;
|
|
#else
|
|
udiv_qrnnd (x1hi, r, 0, (mp_limb_t) (value >> 32),
|
|
brec->big.base);
|
|
udiv_qrnnd (x1lo, t[2], r, (mp_limb_t) value, brec->big.base);
|
|
udiv_qrnnd (t[0], t[1], x1hi, x1lo, brec->big.base);
|
|
#endif
|
|
n = 3;
|
|
}
|
|
else
|
|
{
|
|
#if (UDIV_TIME > 2 * UMUL_TIME)
|
|
mp_limb_t x;
|
|
|
|
value <<= brec->big.normalization_steps;
|
|
udiv_qrnnd_preinv (t[0], x, (mp_limb_t) (value >> 32),
|
|
(mp_limb_t) value, big_base_norm,
|
|
brec->big.base_ninv);
|
|
t[1] = x >> brec->big.normalization_steps;
|
|
#elif UDIV_NEEDS_NORMALIZATION
|
|
mp_limb_t x;
|
|
|
|
value <<= big_normalization_steps;
|
|
udiv_qrnnd (t[0], x, (mp_limb_t) (value >> 32),
|
|
(mp_limb_t) value, big_base_norm);
|
|
t[1] = x >> big_normalization_steps;
|
|
#else
|
|
udiv_qrnnd (t[0], t[1], (mp_limb_t) (value >> 32),
|
|
(mp_limb_t) value, brec->big.base);
|
|
#endif
|
|
n = 2;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
t[0] = value;
|
|
n = 1;
|
|
}
|
|
|
|
/* Convert the 1-3 words in t[], word by word, to ASCII. */
|
|
do
|
|
{
|
|
mp_limb_t ti = t[--n];
|
|
int ndig_for_this_limb = 0;
|
|
|
|
#if UDIV_TIME > 2 * UMUL_TIME
|
|
mp_limb_t base_multiplier = brec->base_multiplier;
|
|
if (brec->flag)
|
|
while (ti != 0)
|
|
{
|
|
mp_limb_t quo, rem, x, dummy;
|
|
|
|
umul_ppmm (x, dummy, ti, base_multiplier);
|
|
quo = (x + ((ti - x) >> 1)) >> (brec->post_shift - 1);
|
|
rem = ti - quo * base;
|
|
*--bp = digits[rem];
|
|
ti = quo;
|
|
++ndig_for_this_limb;
|
|
}
|
|
else
|
|
while (ti != 0)
|
|
{
|
|
mp_limb_t quo, rem, x, dummy;
|
|
|
|
umul_ppmm (x, dummy, ti, base_multiplier);
|
|
quo = x >> brec->post_shift;
|
|
rem = ti - quo * base;
|
|
*--bp = digits[rem];
|
|
ti = quo;
|
|
++ndig_for_this_limb;
|
|
}
|
|
#else
|
|
while (ti != 0)
|
|
{
|
|
mp_limb_t quo, rem;
|
|
|
|
quo = ti / base;
|
|
rem = ti % base;
|
|
*--bp = digits[rem];
|
|
ti = quo;
|
|
++ndig_for_this_limb;
|
|
}
|
|
#endif
|
|
/* If this wasn't the most significant word, pad with zeros. */
|
|
if (n != 0)
|
|
while (ndig_for_this_limb < brec->big.ndigits)
|
|
{
|
|
*--bp = '0';
|
|
++ndig_for_this_limb;
|
|
}
|
|
}
|
|
while (n != 0);
|
|
#endif
|
|
}
|
|
break;
|
|
}
|
|
|
|
return bp;
|
|
}
|