mirror of
git://sourceware.org/git/glibc.git
synced 2026-10-04 05:48:12 +08:00
2002-09-09 Jakub Jelinek <jakub@redhat.com> * include/math.h (__finite_internal, __finitef_internal, __finitel_internal, __isinf_internal, __isnan_internal): Remove. (isfinite): Remove. (__finite, __isinf, __isnan, __finitef, __isinff, __isnanf, __finitel, __isinfl, __isnanl): Add hidden_proto. (__fpclassify, __fpclassifyf, __fpclassifyl, __expm1l): Add libm_hidden_proto. * math/Makefile (libm-calls): Add s_isinf and s_isnan. * stdio-common/printf_fp.c (__printf_fp): Remove INTUSE from __is{inf,nan} calls. * stdio-common/printf_size.c (printf_size): Likewise. * sysdeps/generic/printf_fphex.c (__printf_fphex): Likewise. * sysdeps/generic/s_ldexp.c (__ldexp): Likewise. * sysdeps/generic/s_ldexpf.c (__ldexpf): Likewise. * sysdeps/generic/s_ldexpl.c (__ldexpl): Likewise. * sysdeps/generic/s_expm1l.c (__expm1l): Add libm_hidden_def. * sysdeps/i386/fpu/s_finite.S (__finite_internal): Remove alias. (__finite): Add hidden_def. * sysdeps/i386/fpu/s_finitef.S (__finitef_internal): Remove alias. (__finitef): Add hidden_def. * sysdeps/i386/fpu/s_finitel.S (__finitel_internal): Remove alias. (__finitel): Add hidden_def. * sysdeps/i386/fpu/s_isinfl.c (__isinfl): Remove INTDEF. Add hidden_def. * sysdeps/i386/fpu/s_isnanl.c (__isnanl): Likewise. * sysdeps/i386/fpu/s_fpclassifyl.c (__fpclassifyl): Add libm_hidden_def. * sysdeps/i386/fpu/s_expm1l.S (__expm1l): Likewise. * sysdeps/ieee754/dbl-64/s_finite.c (__finite): Remove INTDEF. Add hidden_def. * sysdeps/ieee754/dbl-64/s_isinf.c (__isinf): Likewise. (__isinfl): Remove INTDEF. * sysdeps/ieee754/dbl-64/s_isnan.c (__isnan): Remove INTDEF. Add hidden_def. (__isnanl): Remove INTDEF. * sysdeps/ieee754/dbl-64/s_fpclassify.c (__fpclassify): Add libm_hidden_def. * sysdeps/ieee754/dbl-64/e_lgamma_r.c (sin_pi): Use __sin and __cos instead of sin and cos. * sysdeps/ieee754/flt-32/s_finitef.c (__finitef): Remove INTDEF. Add hidden_def. * sysdeps/ieee754/flt-32/s_isinff.c (__isinff): Likewise. * sysdeps/ieee754/flt-32/s_isnanf.c (__isnanf): Likewise. * sysdeps/ieee754/flt-32/s_fpclassifyf.c (__fpclassifyf): Add libm_hidden_def. * sysdeps/ieee754/ldbl-128/s_finitel.c (__finitel): Remove INTDEF. Add hidden_def. * sysdeps/ieee754/ldbl-128/s_isinfl.c (__isinfl): Likewise. * sysdeps/ieee754/ldbl-128/s_isnanl.c (__isnanl): Likewise. * sysdeps/ieee754/ldbl-128/s_fpclassifyl.c (__fpclassifyl): Add libm_hidden_def. * sysdeps/ieee754/ldbl-128/s_expm1l.c (__expm1l): Add libm_hidden_def. * sysdeps/ieee754/ldbl-96/s_finitel.c (__finitel): Remove INTDEF. Add hidden_def. * sysdeps/ieee754/ldbl-96/s_isinfl.c (__isinfl): Likewise. * sysdeps/ieee754/ldbl-96/s_isnanl.c (__isnanl): Likewise. * sysdeps/ieee754/ldbl-96/s_fpclassifyl.c (__fpclassifyl): Add libm_hidden_def. * sysdeps/ia64/fpu/s_finite.S (__finite_internal, __finitef_internal, __finitel_internal): Remove aliases. (__finite, __finitef, __finitel): Add hidden_def. * sysdeps/ia64/fpu/s_isnan.S (__isnan_internal, __isnanf_internal, __isnanl_internal): Remove aliases. (__isnan, __isnanf, __isnanl): Add hidden_def. * sysdeps/ia64/fpu/s_isinf.S (__isinf_internal, __isinff_internal, __isinfl_internal): Remove aliases. (__isinf, __isinff, __isinfl): Add hidden_def. * sysdeps/ia64/fpu/s_fpclassify.S (__fpclassify, __fpclassifyf, __fpclassifyl): Add libm_hidden_def. * sysdeps/ia64/fpu/s_expm1l.S (__expm1l): Likewise. * sysdeps/m68k/s_isinfl.c (__isinfl): Remove INTDEF. Add hidden_def. * sysdeps/m68k/fpu/s_isinf.c (INTDEFX): Remove. (hidden_defx): Define and use. * sysdeps/m68k/fpu/s_fpclassifyl.c (__fpclassifyl): Add libm_hidden_def. * sysdeps/m68k/fpu/s_expm1l.c (__expm1l): Likewise. * sysdeps/m68k/s_isnanl.c (__isnanl): Add hidden_def. * sysdeps/powerpc/fpu/s_isnan.c (__isnan, __isnanf, __isnanl): Remove INTDEF. (__isnan, __isnanf): Add hidden_def. * sysdeps/x86_64/fpu/s_finitel.S (__finitel_internal): Remove alias. (__finitel): Add libm_hidden_def. * sysdeps/x86_64/fpu/s_expm1l.S (__expm1l): Likewise. * include/fenv.h (feraiseexcept, fesetenv): Add libm_hidden_proto. * sysdeps/alpha/fpu/fesetenv.c (fesetenv): Add libm_hidden_ver. * sysdeps/alpha/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/arm/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/arm/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/generic/fesetenv.c (fesetenv): Likewise. * sysdeps/generic/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/i386/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/i386/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/m68k/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/mips/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/mips/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/powerpc/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/powerpc/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/sparc/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/sparc/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/hppa/fpu/fesetenv.c (fesetenv): Add libm_hidden_def. * sysdeps/hppa/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/ia64/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/sh/sh4/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/sh/sh4/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/s390/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/s390/fpu/fraiseexcpt.c (feraiseexcept): Likewise. * sysdeps/x86_64/fpu/fesetenv.c (fesetenv): Likewise. * sysdeps/x86_64/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
267 lines
6.9 KiB
C
267 lines
6.9 KiB
C
/* Print size value using units for orders of magnitude.
|
|
Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
Based on a proposal by Larry McVoy <lm@sgi.com>.
|
|
|
|
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 <ctype.h>
|
|
#include <ieee754.h>
|
|
#include <math.h>
|
|
#include <printf.h>
|
|
#ifdef USE_IN_LIBIO
|
|
# include <libioP.h>
|
|
#else
|
|
# include <stdio.h>
|
|
#endif
|
|
|
|
|
|
/* This defines make it possible to use the same code for GNU C library and
|
|
the GNU I/O library. */
|
|
#ifdef USE_IN_LIBIO
|
|
# define PUT(f, s, n) _IO_sputn (f, s, n)
|
|
# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
|
|
/* We use this file GNU C library and GNU I/O library. So make
|
|
names equal. */
|
|
# undef putc
|
|
# define putc(c, f) (wide \
|
|
? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
|
|
# define size_t _IO_size_t
|
|
# define FILE _IO_FILE
|
|
#else /* ! USE_IN_LIBIO */
|
|
# define PUT(f, s, n) fwrite (s, 1, n, f)
|
|
# define PAD(f, c, n) __printf_pad (f, c, n)
|
|
ssize_t __printf_pad __P ((FILE *, char pad, int n)); /* In vfprintf.c. */
|
|
#endif /* USE_IN_LIBIO */
|
|
|
|
/* Macros for doing the actual output. */
|
|
|
|
#define outchar(ch) \
|
|
do \
|
|
{ \
|
|
register const int outc = (ch); \
|
|
if (putc (outc, fp) == EOF) \
|
|
return -1; \
|
|
++done; \
|
|
} while (0)
|
|
|
|
#define PRINT(ptr, wptr, len) \
|
|
do \
|
|
{ \
|
|
register size_t outlen = (len); \
|
|
if (len > 20) \
|
|
{ \
|
|
if (PUT (fp, wide ? (const char *) wptr : ptr, outlen) != outlen) \
|
|
return -1; \
|
|
ptr += outlen; \
|
|
done += outlen; \
|
|
} \
|
|
else \
|
|
{ \
|
|
if (wide) \
|
|
while (outlen-- > 0) \
|
|
outchar (*wptr++); \
|
|
else \
|
|
while (outlen-- > 0) \
|
|
outchar (*ptr++); \
|
|
} \
|
|
} while (0)
|
|
|
|
#define PADN(ch, len) \
|
|
do \
|
|
{ \
|
|
if (PAD (fp, ch, len) != len) \
|
|
return -1; \
|
|
done += len; \
|
|
} \
|
|
while (0)
|
|
|
|
/* Prototype for helper functions. */
|
|
extern int __printf_fp (FILE *fp, const struct printf_info *info,
|
|
const void *const *args);
|
|
|
|
|
|
int
|
|
printf_size (FILE *fp, const struct printf_info *info, const void *const *args)
|
|
{
|
|
/* Units for the both formats. */
|
|
#define BINARY_UNITS " kmgtpezy"
|
|
#define DECIMAL_UNITS " KMGTPEZY"
|
|
static const char units[2][sizeof (BINARY_UNITS)] =
|
|
{
|
|
BINARY_UNITS, /* For binary format. */
|
|
DECIMAL_UNITS /* For decimal format. */
|
|
};
|
|
const char *tag = units[isupper (info->spec) != 0];
|
|
int divisor = isupper (info->spec) ? 1000 : 1024;
|
|
|
|
/* The floating-point value to output. */
|
|
union
|
|
{
|
|
union ieee754_double dbl;
|
|
union ieee854_long_double ldbl;
|
|
}
|
|
fpnum;
|
|
const void *ptr = &fpnum;
|
|
|
|
int negative = 0;
|
|
|
|
/* "NaN" or "Inf" for the special cases. */
|
|
const char *special = NULL;
|
|
const wchar_t *wspecial = NULL;
|
|
|
|
struct printf_info fp_info;
|
|
int done = 0;
|
|
int wide = info->wide;
|
|
|
|
|
|
/* Fetch the argument value. */
|
|
#ifndef __NO_LONG_DOUBLE_MATH
|
|
if (info->is_long_double && sizeof (long double) > sizeof (double))
|
|
{
|
|
fpnum.ldbl.d = *(const long double *) args[0];
|
|
|
|
/* Check for special values: not a number or infinity. */
|
|
if (__isnanl (fpnum.ldbl.d))
|
|
{
|
|
special = "nan";
|
|
wspecial = L"nan";
|
|
negative = 0;
|
|
}
|
|
else if (__isinfl (fpnum.ldbl.d))
|
|
{
|
|
special = "inf";
|
|
wspecial = L"inf";
|
|
|
|
negative = fpnum.ldbl.d < 0;
|
|
}
|
|
else
|
|
while (fpnum.ldbl.d >= divisor && tag[1] != '\0')
|
|
{
|
|
fpnum.ldbl.d /= divisor;
|
|
++tag;
|
|
}
|
|
}
|
|
else
|
|
#endif /* no long double */
|
|
{
|
|
fpnum.dbl.d = *(const double *) args[0];
|
|
|
|
/* Check for special values: not a number or infinity. */
|
|
if (__isnan (fpnum.dbl.d))
|
|
{
|
|
special = "nan";
|
|
wspecial = L"nan";
|
|
negative = 0;
|
|
}
|
|
else if (__isinf (fpnum.dbl.d))
|
|
{
|
|
special = "inf";
|
|
wspecial = L"inf";
|
|
|
|
negative = fpnum.dbl.d < 0;
|
|
}
|
|
else
|
|
while (fpnum.dbl.d >= divisor && tag[1] != '\0')
|
|
{
|
|
fpnum.dbl.d /= divisor;
|
|
++tag;
|
|
}
|
|
}
|
|
|
|
if (special)
|
|
{
|
|
int width = info->prec > width ? info->prec : width;
|
|
|
|
if (negative || info->showsign || info->space)
|
|
--width;
|
|
width -= 3;
|
|
|
|
if (!info->left && width > 0)
|
|
PADN (' ', width);
|
|
|
|
if (negative)
|
|
outchar ('-');
|
|
else if (info->showsign)
|
|
outchar ('+');
|
|
else if (info->space)
|
|
outchar (' ');
|
|
|
|
PRINT (special, wspecial, 3);
|
|
|
|
if (info->left && width > 0)
|
|
PADN (' ', width);
|
|
|
|
return done;
|
|
}
|
|
|
|
/* Prepare to print the number. We want to use `__printf_fp' so we
|
|
have to prepare a `printf_info' structure. */
|
|
fp_info.spec = 'f';
|
|
fp_info.prec = info->prec < 0 ? 3 : info->prec;
|
|
fp_info.is_long_double = info->is_long_double;
|
|
fp_info.is_short = info->is_short;
|
|
fp_info.is_long = info->is_long;
|
|
fp_info.alt = info->alt;
|
|
fp_info.space = info->space;
|
|
fp_info.left = info->left;
|
|
fp_info.showsign = info->showsign;
|
|
fp_info.group = info->group;
|
|
fp_info.extra = info->extra;
|
|
fp_info.pad = info->pad;
|
|
fp_info.wide = wide;
|
|
|
|
if (fp_info.left && fp_info.pad == L' ')
|
|
{
|
|
/* We must do the padding ourself since the unit character must
|
|
be placed before the padding spaces. */
|
|
fp_info.width = 0;
|
|
|
|
done = __printf_fp (fp, &fp_info, &ptr);
|
|
if (done > 0)
|
|
{
|
|
outchar (*tag);
|
|
if (info->width > done)
|
|
PADN (' ', info->width - done);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* We can let __printf_fp do all the printing and just add our
|
|
unit character afterwards. */
|
|
fp_info.width = info->width - 1;
|
|
|
|
done = __printf_fp (fp, &fp_info, &ptr);
|
|
if (done > 0)
|
|
outchar (*tag);
|
|
}
|
|
|
|
return done;
|
|
}
|
|
|
|
/* This is the function used by `vfprintf' to determine number and
|
|
type of the arguments. */
|
|
int
|
|
printf_size_info (const struct printf_info *info, size_t n, int *argtypes)
|
|
{
|
|
/* We need only one double or long double argument. */
|
|
if (n >= 1)
|
|
argtypes[0] = PA_DOUBLE | (info->is_long_double ? PA_FLAG_LONG_DOUBLE : 0);
|
|
|
|
return 1;
|
|
}
|