26 Commits

Author SHA1 Message Date
Rich Felker
835f9f950e clean up stdio_impl.h
this header evolved to facilitate the extremely lazy practice of
omitting explicit includes of the necessary headers in individual
stdio source files; not only was this sloppy, but it also increased
build time.

now, stdio_impl.h is only including the headers it needs for its own
use; any further headers needed by source files are included directly
where needed.
2012-11-08 16:39:41 -05:00
Rich Felker
8489897e01 accept "nan(n-char-sequence)" in strtod/scanf functions
this will prevent gnulib from wrapping our strtod to handle this
useless feature.
2012-10-21 18:28:20 -04:00
Rich Felker
11458e5b09 fix float parsing logic for long decimal expansions
this affects at least the case of very long inputs, but may also
affect shorter inputs that become long due to growth while upscaling.
basically, the logic for the circular buffer indices of the initial
base-10^9 digit and the slot one past the final digit, and for
simplicity of the loop logic, assumes an invariant that they're not
equal. the upscale loop, which can increase the length of the
base-10^9 representation, attempted to preserve this invariant, but
was actually only ensuring that the end index did not loop around past
the start index, not that the two never become equal.

the main (only?) effect of this bug was that subsequent logic treats
the excessively long number as having no digits, leading to junk
results.
2012-08-17 16:53:09 -04:00
Rich Felker
f457b1cb0d fix scanning of "-0x" pseudo-hex float (must give negative zero) 2012-06-08 11:17:49 -04:00
Rich Felker
28c5d46d84 fix off-by-one error that caused uninitialized memory read in floatscan
this caused misreading of certain floating point values that are exact
multiples of large powers of ten, unpredictable depending on prior
stack contents.
2012-04-30 02:56:47 -04:00
Rich Felker
02eb568ded remove redundant (unmaintained) check in floatscan
also be extra careful to avoid wrapping the circular buffer early
2012-04-22 14:05:12 -04:00
Rich Felker
77731d0ec1 make floatscan correctly set errno for overflow/underflow
care is taken that the setting of errno correctly reflects underflow
condition. scanning exact denormal values does not result in ERANGE,
nor does scanning values (such as the usual string definition of
FLT_MIN) which are actually less than the smallest normal number but
which round to a normal result.

only the decimal case is handled so far; hex float require a separate
fix to come later.
2012-04-21 14:14:10 -04:00
Rich Felker
2df2a97a20 skip leading zeros even after decimal point in floatscan
in principle this should just be an optimization, but it happens to
also fix a nasty bug where values like 0.00000000001 were getting
caught by the early zero detection path and wrongly scanned as zero.
2012-04-21 13:50:23 -04:00
Rich Felker
33e7781b5b fix overread (consuming an extra byte) scanning NAN
bug detected by glib test suite
2012-04-21 11:57:39 -04:00
Rich Felker
cb81b6947c fix really bad breakage in strtol, etc.: failure to accept leading spaces 2012-04-19 12:47:34 -04:00
Rich Felker
1ff3e6fa25 fix typo in exponent reading code or floats
this was basically harmless, but could have resulted in misreading
inputs with more than a few gigabytes worth of digits..
2012-04-18 03:53:53 -04:00
Rich Felker
dad4040770 fix failure to read infinity in scanf
this code worked in strtod, but not in scanf. more evidence that i
should design a better interface for discarding multiple tail
characters than just calling unget repeatedly...
2012-04-17 22:05:51 -04:00
Rich Felker
2ac580fdfe floatscan: fix incorrect count of leading nonzero digits
this off-by-one error was causing values with just one digit past the
decimal point to be treated by the integer case. in many cases it
would yield the correct result, but if expressions are evaluated in
excess precision, double rounding may occur.
2012-04-16 01:53:52 -04:00
Rich Felker
3ddeedd8f7 remove magic numbers from floatscan 2012-04-12 00:25:52 -04:00
Rich Felker
fe514951af optimize more integer cases in floatscan; comment the whole procedure 2012-04-12 00:16:01 -04:00
Rich Felker
470fecdd3a revert invalid optimization in floatscan 2012-04-11 23:08:50 -04:00
Rich Felker
96acdae944 fix stupid typo in floatscan that caused excess rounding of some values 2012-04-11 21:29:12 -04:00
Rich Felker
4054da9ba0 optimize floatscan downscaler to skip results that won't be needed
when upscaling, even the very last digit is needed in cases where the
input is exact; no digits can be discarded. but when downscaling, any
digits less significant than the mantissa bits are destined for the
great bitbucket; the only influence they can have is their presence
(being nonzero). thus, we simply throw them away early. the result is
nearly a 4x performance improvement for processing huge values.

the particular threshold LD_B1B_DIG+3 is not chosen sharply; it's
simply a "safe" distance past the significant bits. it would be nice
to replace it with a sharp bound, but i suspect performance will be
comparable (within a few percent) anyway.
2012-04-11 14:51:08 -04:00
Rich Felker
5837a0bb6b simplify/debloat radix point alignment code in floatscan
now that this is the first operation, it can rely on the circular
buffer contents not being wrapped when it begins. we limit the number
of digits read slightly in the initial parsing loops too so that this
code does not have to consider the case where it might cause the
circular buffer to wrap; this is perfectly fine because KMAX is chosen
as a power of two for circular-buffer purposes and is much larger than
it otherwise needs to be, anyway.

these changes should not affect performance at all.
2012-04-11 14:20:45 -04:00
Rich Felker
1bdd5c8b98 optimize floatscan: avoid excessive upscaling
upscaling by even one step too much creates 3-29 extra iterations for
the next loop. this is still suboptimal since it always goes by 2^29
rather than using a smaller upscale factor when nearing the target,
but performance on common, small-magnitude, few-digit values has
already more than doubled with this change.

more optimizations on the way...
2012-04-11 14:11:47 -04:00
Rich Felker
48bb81adf8 fix bug parsing lone zero followed by junk, and hex float over-reading 2012-04-11 00:18:57 -04:00
Rich Felker
38b3f1fea8 fix float scanning of certain values ending in zeros
for example, "1000000000" was being read as "1" due to this loop
exiting early. it's necessary to actually update z and zero the
entries so that the subsequent rounding code does not get confused;
before i did that, spurious inexact exceptions were being raised.
2012-04-10 23:41:54 -04:00
Rich Felker
633a26c1e6 fix potential overflow in exponent reading
note that there's no need for a precise cutoff, because exponents this
large will always result in overflow or underflow (it's impossible to
read enough digits to compensate for the exponent magnitude; even at a
few nanoseconds per digit it would take hundreds of years).
2012-04-10 23:05:16 -04:00
Rich Felker
c5ff29699c set errno properly when parsing floating point 2012-04-10 22:38:21 -04:00
Rich Felker
2162541f38 add "scan helper getc" and rework strtod, etc. to use it
the immediate benefit is a significant debloating of the float parsing
code by moving the responsibility for keeping track of the number of
characters read to a different module.

by linking shgetc with the stdio buffer logic, counting logic is
defered to buffer refill time, keeping the calls to shgetc fast and
light.

in the future, shgetc will also be useful for integrating the new
float code with scanf, which needs to not only count the characters
consumed, but also limit the number of characters read based on field
width specifiers.

shgetc may also become a useful tool for simplifying the integer
parsing code.
2012-04-10 21:47:37 -04:00
Rich Felker
415c4cd7fd new floating point parser/converter
this version is intended to be fully conformant to the ISO C, POSIX,
and IEEE standards for conversion of decimal/hex floating point
strings to float, double, and long double (ld64 or ld80 only at
present) values. in particular, all results are intended to be rounded
correctly according to the current rounding mode. further, this
implementation aims to set the floating point underflow, overflow, and
inexact flags to reflect the conversion performed.

a moderate amount of testing has been performed (by nsz and myself)
prior to integration of the code in musl, but it still may have bugs.

so far, only strto(d|ld|f) use the new code. scanf integration will be
done as a separate commit, and i will add implementations of the wide
character functions later.
2012-04-10 11:52:55 -04:00