summaryrefslogtreecommitdiff
path: root/stdio-common/printf_fp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-04-28 23:13:52 +0000
committerUlrich Drepper <drepper@redhat.com>1999-04-28 23:13:52 +0000
commitc4563d2d668675c2d5083f6ad01c801d6ccbe013 (patch)
tree1e6af86f8c33743c81080dffb17a8e8209825c06 /stdio-common/printf_fp.c
parent89afc233db58d3de7669332d141113ec2ca4991d (diff)
Update.
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
Diffstat (limited to 'stdio-common/printf_fp.c')
-rw-r--r--stdio-common/printf_fp.c48
1 files changed, 27 insertions, 21 deletions
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index a179e0dbf6..c75289a3a9 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -404,7 +404,7 @@ __printf_fp (FILE *fp,
int scaleexpo = 0;
int explog = LDBL_MAX_10_EXP_LOG;
int exp10 = 0;
- const struct mp_power *tens = &_fpioconst_pow10[explog + 1];
+ const struct mp_power *powers = &_fpioconst_pow10[explog + 1];
int cnt_h, cnt_l, i;
if ((exponent + to_shift) % BITS_PER_MP_LIMB == 0)
@@ -424,23 +424,28 @@ __printf_fp (FILE *fp,
}
MPN_ZERO (frac, (exponent + to_shift) / BITS_PER_MP_LIMB);
- assert (tens > &_fpioconst_pow10[0]);
+ assert (powers > &_fpioconst_pow10[0]);
do
{
- --tens;
+ --powers;
/* The number of the product of two binary numbers with n and m
bits respectively has m+n or m+n-1 bits. */
- if (exponent >= scaleexpo + tens->p_expo - 1)
+ if (exponent >= scaleexpo + powers->p_expo - 1)
{
if (scalesize == 0)
- MPN_ASSIGN (tmp, tens->array);
+ {
+ tmpsize = powers->arraysize;
+ memcpy (tmp, &__tens[powers->arrayoff],
+ tmpsize * sizeof (mp_limb_t));
+ }
else
{
cy = __mpn_mul (tmp, scale, scalesize,
- &tens->array[_FPIO_CONST_OFFSET],
- tens->arraysize - _FPIO_CONST_OFFSET);
- tmpsize = scalesize + tens->arraysize - _FPIO_CONST_OFFSET;
+ &__tens[powers->arrayoff
+ + _FPIO_CONST_OFFSET],
+ powers->arraysize - _FPIO_CONST_OFFSET);
+ tmpsize = scalesize + powers->arraysize - _FPIO_CONST_OFFSET;
if (cy == 0)
--tmpsize;
}
@@ -456,7 +461,7 @@ __printf_fp (FILE *fp,
}
--explog;
}
- while (tens > &_fpioconst_pow10[0]);
+ while (powers > &_fpioconst_pow10[0]);
exponent = exp10;
/* Optimize number representations. We want to represent the numbers
@@ -547,7 +552,7 @@ __printf_fp (FILE *fp,
/* |FP| < 1.0. */
int exp10 = 0;
int explog = LDBL_MAX_10_EXP_LOG;
- const struct mp_power *tens = &_fpioconst_pow10[explog + 1];
+ const struct mp_power *powers = &_fpioconst_pow10[explog + 1];
mp_size_t used_limbs = fracsize - 1;
/* Now shift the input value to its right place. */
@@ -558,27 +563,28 @@ __printf_fp (FILE *fp,
expsign = 1;
exponent = -exponent;
- assert (tens != &_fpioconst_pow10[0]);
+ assert (powers != &_fpioconst_pow10[0]);
do
{
- --tens;
+ --powers;
- if (exponent >= tens->m_expo)
+ if (exponent >= powers->m_expo)
{
int i, incr, cnt_h, cnt_l;
mp_limb_t topval[2];
/* The __mpn_mul function expects the first argument to be
bigger than the second. */
- if (fracsize < tens->arraysize - _FPIO_CONST_OFFSET)
- cy = __mpn_mul (tmp, &tens->array[_FPIO_CONST_OFFSET],
- tens->arraysize - _FPIO_CONST_OFFSET,
+ if (fracsize < powers->arraysize - _FPIO_CONST_OFFSET)
+ cy = __mpn_mul (tmp, &__tens[powers->arrayoff
+ + _FPIO_CONST_OFFSET],
+ powers->arraysize - _FPIO_CONST_OFFSET,
frac, fracsize);
else
cy = __mpn_mul (tmp, frac, fracsize,
- &tens->array[_FPIO_CONST_OFFSET],
- tens->arraysize - _FPIO_CONST_OFFSET);
- tmpsize = fracsize + tens->arraysize - _FPIO_CONST_OFFSET;
+ &__tens[powers->arrayoff + _FPIO_CONST_OFFSET],
+ powers->arraysize - _FPIO_CONST_OFFSET);
+ tmpsize = fracsize + powers->arraysize - _FPIO_CONST_OFFSET;
if (cy == 0)
--tmpsize;
@@ -586,7 +592,7 @@ __printf_fp (FILE *fp,
incr = (tmpsize - fracsize) * BITS_PER_MP_LIMB
+ BITS_PER_MP_LIMB - 1 - cnt_h;
- assert (incr <= tens->p_expo);
+ assert (incr <= powers->p_expo);
/* If we increased the exponent by exactly 3 we have to test
for overflow. This is done by comparing with 10 shifted
@@ -674,7 +680,7 @@ __printf_fp (FILE *fp,
}
--explog;
}
- while (tens != &_fpioconst_pow10[1] && exponent > 0);
+ while (powers != &_fpioconst_pow10[1] && exponent > 0);
/* All factors but 10^-1 are tested now. */
if (exponent > 0)
{