mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
779ae82ecd
1997-04-30 17:35 Ulrich Drepper <drepper@cygnus.com> * math/libm-test.c: Implement test for exceptions. Partly due to Andreas Jaeger. (csin_test): New function. * sysdeps/libm-i387/s_cexp.S: Raise correct exceptions. * sysdeps/libm-i387/s_cexpf.S: Likewise. * sysdeps/libm-i387/s_cexpl.S: Likewise. * sysdeps/libm-ieee754/s_ccos.c: Likewise. * sysdeps/libm-ieee754/s_ccosf.c: Likewise. * sysdeps/libm-ieee754/s_ccosl.c: Likewise. * sysdeps/libm-ieee754/s_ccosh.c: Likewise. * sysdeps/libm-ieee754/s_ccoshf.c: Likewise. * sysdeps/libm-ieee754/s_ccoshl.c: Likewise. * sysdeps/libm-ieee754/s_cexp.c: Likewise. * sysdeps/libm-ieee754/s_cexpf.c: Likewise. * sysdeps/libm-ieee754/s_cexpl.c: Likewise. * sysdeps/libm-ieee754/s_csinh.c: Likewise. * sysdeps/libm-ieee754/s_csinhf.c: Likewise. * sysdeps/libm-ieee754/s_csinhl.c: Likewise. * sysdeps/libm-ieee754/s_ctanh.c: Likewise. * sysdeps/libm-ieee754/s_ctanhf.c: Likewise. * sysdeps/libm-ieee754/s_ctanhl.c: Likewise. * sysdeps/libm-ieee754/s_ccosh.c: Correct computation. * sysdeps/libm-ieee754/s_ccoshf.c: Likewise. * sysdeps/libm-ieee754/s_ccoshl.c: Likewise. * sysdeps/libm-ieee754/s_csinh.c: Likewise. * sysdeps/libm-ieee754/s_csinhf.c: Likewise. * sysdeps/libm-ieee754/s_csinhl.c: Likewise. * sysdeps/libm-ieee754/s_csin.c: Rewrite. * sysdeps/libm-ieee754/s_csinf.c: Likewise. * sysdeps/libm-ieee754/s_csinl.c: Likewise. * stdlib/random_r.c (__srandom_r): Don't use seed 0. Use 1 in this case. * sysdeps/i386/dl-machine.h (elf_machine_load_address): Use notation for local label. * time/strftime.c (add): Respect `0' padding flag. Reported by Richard Stallman <rms@gnu.ai.mit.edu>. 1997-04-30 15:46 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (start-installed-name): Define here, not in csu/Makefile. Use in +link macro. * csu/Makefile (distribute): Add abi-note.S and abi-tag.h. (start-installed-name): Don't define here. When ELF generate file named by start-installed-name from start.o and abi-note.o. * csu/abi-note.S: New file. * sysdeps/stub/abi-tag.h: New file. * sysdpes/unix/sysv/linux/abi-tag.h: New file. Patches by Roland McGrath <roland@gnu.ai.mit.edu>. 1997-04-30 01:32 Ulrich Drepper <drepper@cygnus.com> * manual/stdio.texi: Use @vtable where possible. Add TeX version of @multitable since texi2dvi cannot handle them correct in the moment. * po/de.po: Update. 1997-04-29 21:06 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Don't set cross-compiling based on $(BUILD_CC) != $(CC). * config.make.in: Set cross-compiling from configure result. * configure.in: Emit definition of `cross_compiling'. Patches by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>. 1997-04-27 21:50 Philip Blundell <pjb27@cam.ac.uk> * sysdeps/unix/sysv/linux/net/route.h (struct in6_rtmsg): Use correct `int' sizes for struct members. 1997-04-29 19:14 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-i387/e_powf.S Generate invalid exception correctly. * sysdeps/libm-i387/e_pow.S: Likewise. * sysdeps/libm-i387/e_powl.S: Likewise. 1997-04-23 10:08 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/fenv.h: Correct typos. 1997-04-28 10:04 Richard Henderson <rth@tamu.edu> * sysdeps/unix/sysv/linux/alpha/clone.S: Save the function argument in t0 rather than a4 to avoid it being clobbered. 1997-04-27 23:52 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/summary.awk: Recognize @defmumblex. * manual/signal.texi (Miscellaneous Signals): Use @deftypevrx for second description header. 1997-04-27 23:29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi (Floating-Point Classes): Don't indent text, makeinfo doesn't like that. 1997-04-27 20:52 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/obstack.h (obstack_specify_allocation_with_arg, obstack_chunkfun, obstack_freefun): Fix casts. 1997-04-27 18:21 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/xtract-typefun.awk: Allow names with only one character. 1997-04-26 14:16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip_fw.h: Use <netinet/ip_icmp.h> not <netinet/icmp.h>. Reported by Michael Deutschmann <ldeutsch@mail.netshop.net>. 1997-04-25 12:31 Ulrich Drepper <drepper@cygnus.com> * csu/Makefile ($(objpfx)initfini.s): Add CPPFLAGS, CFLAGS and -g0 to command line of compiler. Patch by Marcus G. Daniels <marcus@sysc.pdx.edu>. * sysdeps/generic/sigset.h (__sigandset, __sigorset): Fix typos. Patch by Marcus G. Daniels <marcus@sysc.pdx.edu>. * signal/signal.h (_sys_siglist, sys_siglist): Use _NSIG, not NSIG in declaration. Patch by Michael Widenius <monty@tcx.se>. * time/strptime.c (strptime_internal): Fix %I format specifier being off by one. Patch by Mark Kettenis <kettenis@phys.uva.nl>. 1997-04-24 12:18 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdlib/lcong48_r.c: Include <limits.h>. * stdlib/seed48_r.c: Likewise. * stdio-common/printf_size.c (printf_size): Correct type of `units' and make robust against future changes. 1997-04-23 18:58 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_cproj.c: Use isfinite instead of finite. * sysdeps/libm-ieee754/s_cprojl.c: Likewise. * sysdeps/libm-ieee754/s_cprojf.c: Likewise. 1997-04-23 18:53 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi, manual/math.texi: Use @defmumblex for additional description headers. * manual/xtract-typefun.awk: Recognize them. 1997-04-22 15:58 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdio-common/printf_size.c (printf_size): Correct size of array units.
253 lines
6.5 KiB
C
253 lines
6.5 KiB
C
/* Print size value using units for orders of magnitude.
|
||
Copyright (C) 1997 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 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 <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) _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) _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, len) \
|
||
do \
|
||
{ \
|
||
register size_t outlen = (len); \
|
||
if (len > 20) \
|
||
{ \
|
||
if (PUT (fp, ptr, outlen) != outlen) \
|
||
return -1; \
|
||
ptr += outlen; \
|
||
done += outlen; \
|
||
} \
|
||
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;
|
||
|
||
struct printf_info fp_info;
|
||
int done = 0;
|
||
|
||
|
||
/* Fetch the argument value. */
|
||
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";
|
||
negative = 0;
|
||
}
|
||
else if (__isinfl (fpnum.ldbl.d))
|
||
{
|
||
special = "inf";
|
||
|
||
negative = fpnum.ldbl.d < 0;
|
||
}
|
||
else
|
||
while (fpnum.ldbl.d >= divisor && tag[1] != '\0')
|
||
{
|
||
fpnum.ldbl.d /= divisor;
|
||
++tag;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
fpnum.dbl.d = *(const double *) args[0];
|
||
|
||
/* Check for special values: not a number or infinity. */
|
||
if (__isnan (fpnum.dbl.d))
|
||
{
|
||
special = "nan";
|
||
negative = 0;
|
||
}
|
||
else if (__isinf (fpnum.dbl.d))
|
||
{
|
||
special = "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 > info->width ? info->prec : info->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, 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;
|
||
|
||
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;
|
||
}
|