diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-03-04 05:53:28 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-04 05:53:28 +0000 |
commit | 377a515b4ce100dc119db09a7bc1d7628136993a (patch) | |
tree | 92bcdcc43bde79c11ac56b74f05ad4a4dcf3dd96 /stdio-common/printf_fphex.c | |
parent | d1a2b102df91d6e478d1fa25d8a3e38f0b98e374 (diff) | |
download | glibc-377a515b4ce100dc119db09a7bc1d7628136993a.zip glibc-377a515b4ce100dc119db09a7bc1d7628136993a.tar.gz glibc-377a515b4ce100dc119db09a7bc1d7628136993a.tar.bz2 |
update from main archive 970304cvs/libc-970307cvs/libc-970306cvs/libc-970305cvs/libc-970304
1997-03-04 04:31 Ulrich Drepper <drepper@cygnus.com>
* Makerules: Add rules to handle versioning.
* config.h.in (DO_VERSIONING): New macro.
* config.make.in (versioning): New variable.
* configure.in: Add checks for .symver directive in gas and
--version-script option to ld. Define DO_VERSIONING and
versioning if appropriate.
* math/Makefile (routines): Add s_signbit, s_fpclassify, s_fmax,
s_fmin, and s_fdim.
* math/math.h: Define ISO C 9X constants, macros and functions.
* math/mathcalls.h: Likewise.
* sysdeps/libm-ieee754/s_fdim.c: New file.
* sysdeps/libm-ieee754/s_fdimf.c: New file.
* sysdeps/libm-ieee754/s_fdiml.c: New file.
* sysdeps/libm-ieee754/s_fmax.c: New file.
* sysdeps/libm-ieee754/s_fmaxf.c: New file.
* sysdeps/libm-ieee754/s_fmaxl.c: New file.
* sysdeps/libm-ieee754/s_fmin.c: New file.
* sysdeps/libm-ieee754/s_fminf.c: New file.
* sysdeps/libm-ieee754/s_fminl.c: New file.
* sysdeps/libm-ieee754/s_fpclassify.c: New file.
* sysdeps/libm-ieee754/s_fpclassifyf.c: New file.
* sysdeps/libm-ieee754/s_fpclassifyl.c: New file.
* sysdeps/libm-ieee754/s_signbit.c: New file.
* sysdeps/libm-ieee754/s_signbitf.c: New file.
* sysdeps/libm-ieee754/s_signbitl.c: New file.
* stdio-common/printf_fphex.c: Correct printing of decimal point
character.
Simplify conversion of mantissa to string.
* stdio-common/vfscanf.c: Handle %A format.
Optimize termination of floating-point scanning.
* stdio-common/tstscanf.c (main): Add new test to scanf to test
scanning float values with given width.
* stdlib/strtod.c: Add handling of floating-point numbers in
hexadecimal notation.
* stdlib/stdlib.h: Use __USE_ISOC9X feature macro for new long long
functions.
Pretty print #if directives.
* string/string.h: Pretty print #if directives.
* sysdeps/ieee754/dbl2mpn.c: Update copyright.
* sysdeps/ieee754/ldbl2mpn.c: Likewise.
* sysdeps/ieee754/mpn2dbl.c: Likewise.
* sysdeps/ieee754/mpn2flt.c: Likewise.
* sysdeps/ieee754/mpn2ldbl.c: Likewise.
* sysdeps/unix/sysv/linux/poll.c: Implement poll function by
falling back to select-based implementation if syscall isn't
available.
* sysdeps/unix/sysv/linux/syscalls.list: Add s_poll.
* time/leapseconds: Update from tzdata1997b.
* time/zic.c: Update from tzcode1997b.
1997-03-01 15:08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/Makefile $(tzfiles:%=$(objpfx)z.%): Remove unneeded
depedencies between installed $(tzlinks) and $(tzbases) files.
1997-03-01 14:27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/math.h: Make compatible with traditional preprocessor;
requires carefull placement of whitespace in macro arguments.
Use __CONCAT instead of ##.
Declare long double functions only if __STDC__ or __GNUC__.
* math/mathcall.h: Avoid whitespace before argument of macro call
that is used as function name.
* sysdeps/m68k/fpu/__math.h: Use __CONCAT instead of ##.
(__m81_u, __m81_inline): Depend on __LIBC_M81_MATH_INLINES instead
of __NO_M81_MATH_INLINES.
[!__LIBC_M81_MATH_INLINES]: Don't define internal functions
starting with __ieee754.
[!__NO_MATH_INLINES && __OPTIMIZE__]: Define user visible
functions as inlines.
(__m81_defun): Put __attribute__ between return type and function
name.
* math/math.h: Include <__math.h> also if __LIBC_M81_MATH_INLINES
is defined.
* sysdeps/m68k/fpu/e_acos.c: Define __LIBC_M81_MATH_INLINES
instead of __NO_M81_MATH_INLINES.
* sysdeps/m68k/fpu/e_fmod.c: Likewise.
* sysdeps/m68k/fpu/k_cos.c: Likewise.
* sysdeps/m68k/fpu/k_sin.c: Likewise.
* sysdeps/m68k/fpu/k_tan.c: Likewise.
* sysdeps/m68k/fpu/s_atan.c: Likewise. De-ANSI-declify.
* sysdeps/m68k/fpu/s_frexp.c: Likewise.
* sysdeps/m68k/fpu/s_ilogb.c: Likewise.
* sysdeps/m68k/fpu/s_isinf.c: Likewise.
* sysdeps/m68k/fpu/s_modf.c: Likewise.
* sysdeps/m68k/fpu/s_scalbn.c: Likewise.
1997-02-27 21:51 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (tests): Cope with $PATH not including the current
directory.
1997-02-27 18:04 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/Makefile ($(common-objpfx)mk-local_lim): Use
$(common-objdir-compile).
($(common-objpfx)make-ioctls): Likewise.
(mk-local_lim-CFLAGS): Set this instead of local_lim-CFLAGS.
($(common-objpfx)sys/param.h): Use $(make-target-directory).
($(addprefix $(common-objpfx),$(sys/param.h-includes))):
Likewise.
($(common-objpfx)sys/syscall.h): Likewise.
($(common-objpfx)local_lim.h): Let make deal with command
failure.
($(common-objpfx)param.h.dep): Use temporary file and update
target atomically.
($(common-objpfx)errnos): Avoid the Useless Use of cat Award.
(include $(common-objpfx)param.h.dep): Ignore error.
* sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Use
$(common-objdir-compile).
(mk-stdiolim-CFLAGS): Renamed from cded-objdir-includes, use
$(shell pwd) instead of $$cwd.
* sysdeps/generic/Makefile ($(common-objpfx)det_endian): Use
$(common-objdir-compile).
($(objpfx)make_siglist): Use $(native-compile).
(make_siglist-CFLAGS): New variable.
* Makerules (ALL_BUILD_CFLAGS): Renamed from BUILD_CFLAGS, leaving
the old name for the user to pass additional flags to the host
compiler. Fix reference to config header.
(native-compile, common-objdir-compile): Rewritten to make more
generally usable.
* sysdeps/unix/sysv/sysv4/solaris2/Makefile: Set ALL_BUILD_CFLAGS
instead of BUILD_CFLAGS.
* sysvips/sys/ipc.h: Warn if needed feature select macro are not
defined.
1997-02-27 17:11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/Makefile ($(objpfx)rpc-proto.d, $(objpfx)rpc-proto.c):
New rules to generate dependencies for the RPC service objects.
1997-02-27 16:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* argp/argp-parse.c (parser_finalize): Always set *END_INDEX if
supplied.
1997-02-28 03:27 Ulrich Drepper <drepper@cygnus.com>
* stdlib/strtod.c (STRTOF): Make sure return value is large enough
so that clearing second word is necessary.
* sysdeps/unix/sysv/linux/netinet/in_systm.h: Don't use kernel
header since it is wrong for 64 bit systems.
Patch by a sun <asun@zoology.washington.edu>.
1997-02-27 10:34:11 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/sysv/linux/alpha/brk.S: Support both the Linux/i386
and OSF/1 style brk syscalls. We may want to change Linux/Alpha
for the benefit of running foreign binaries.
1997-03-01 20:21 Miles Bader <miles@gnu.ai.mit.edu>
1997-02-25 19:42 Miles Bader <miles@gnu.ai.mit.edu>
Diffstat (limited to 'stdio-common/printf_fphex.c')
-rw-r--r-- | stdio-common/printf_fphex.c | 67 |
1 files changed, 24 insertions, 43 deletions
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c index d442b56..ac939ec 100644 --- a/stdio-common/printf_fphex.c +++ b/stdio-common/printf_fphex.c @@ -217,29 +217,19 @@ __printf_fphex (FILE *fp, 52 bits are representable without rest using hexadecimal digits we use only the implicit digits for the number before the decimal point. */ - if (sizeof (unsigned long int) > 6) - { - unsigned long int num; + unsigned long long int num; - num = (((unsigned long int) fpnum.dbl.ieee.mantissa0) << 32 - | fpnum.dbl.ieee.mantissa1); + num = (((unsigned long long int) fpnum.dbl.ieee.mantissa0) << 32 + | fpnum.dbl.ieee.mantissa1); - zero_mantissa = num == 0; + zero_mantissa = num == 0; - numstr = _itoa_word (num, numbuf + sizeof numbuf, 16, - info->spec == 'A'); - } + if (sizeof (unsigned long int) > 6) + numstr = _itoa_word (num, numbuf + sizeof numbuf, 16, + info->spec == 'A'); else - { - unsigned long long int num; - - num = (((unsigned long long int) fpnum.dbl.ieee.mantissa0) << 32 - | fpnum.dbl.ieee.mantissa1); - - zero_mantissa = num == 0; - - numstr = _itoa (num, numbuf + sizeof numbuf, 16, info->spec == 'A'); - } + numstr = _itoa (num, numbuf + sizeof numbuf, 16, + info->spec == 'A'); /* Fill with zeroes. */ while (numstr > numbuf + (sizeof numbuf - 13)) /* 52 ÷ 4 = 13 */ @@ -249,7 +239,8 @@ __printf_fphex (FILE *fp, exponent = fpnum.dbl.ieee.exponent; - if (exponent != 0 && exponent < IEEE754_DOUBLE_BIAS) + if ((exponent != 0 && exponent < IEEE754_DOUBLE_BIAS) + || (exponent == 0 && !zero_mantissa)) { expnegative = 1; exponent = abs (exponent - IEEE754_DOUBLE_BIAS); @@ -265,31 +256,20 @@ __printf_fphex (FILE *fp, { /* The "strange" 80 bit format on ix86 and m68k has an explicit leading digit in the 64 bit mantissa. */ - assert (sizeof (long double) == 12); + unsigned long long int num; - if (sizeof (unsigned long int) > 6) - { - unsigned long int num; + assert (sizeof (long double) == 12); - num = (((unsigned long int) fpnum.dbl.ieee.mantissa0) << 32 - | fpnum.dbl.ieee.mantissa1); + num = (((unsigned long long int) fpnum.ldbl.ieee.mantissa0) << 32 + | fpnum.ldbl.ieee.mantissa1); - zero_mantissa = num == 0; + zero_mantissa = num == 0; - numstr = _itoa_word (num, numbuf + sizeof numbuf, 16, - info->spec == 'A'); - } + if (sizeof (unsigned long int) > 6) + numstr = _itoa_word (num, numbuf + sizeof numbuf, 16, + info->spec == 'A'); else - { - unsigned long long int num; - - num = (((unsigned long long int) fpnum.ldbl.ieee.mantissa0) << 32 - | fpnum.ldbl.ieee.mantissa1); - - zero_mantissa = num == 0; - - numstr = _itoa (num, numbuf + sizeof numbuf, 16, info->spec == 'A'); - } + numstr = _itoa (num, numbuf + sizeof numbuf, 16, info->spec == 'A'); /* We use a full nibble for the leading digit. */ leading = *numstr++; @@ -301,7 +281,8 @@ __printf_fphex (FILE *fp, /* We have 3 bits from the mantissa in the leading nibble. */ exponent = fpnum.ldbl.ieee.exponent - 3; - if (exponent != 0 && exponent < IEEE854_LONG_DOUBLE_BIAS) + if ((exponent != 0 && exponent < IEEE854_LONG_DOUBLE_BIAS) + || (exponent == 0 && !zero_mantissa)) { expnegative = 1; exponent = abs (exponent - IEEE854_LONG_DOUBLE_BIAS); @@ -414,10 +395,10 @@ __printf_fphex (FILE *fp, outchar (info->spec == 'A' ? 'X' : 'x'); outchar (leading); - if (!zero_mantissa || precision != 0 || info->alt) + if (!zero_mantissa || precision > 0 || info->alt) outchar (decimal); - if (!zero_mantissa || precision != 0) + if (!zero_mantissa || precision > 0) { PRINT (numstr, MIN (numend - numstr, precision)); if (precision > numend - numstr) |