#include <math.h>
#include <float.h>
#include <limits.h>
+#include <errno.h>
+#include "shgetc.h"
#include "floatscan.h"
#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
#define MASK (KMAX-1)
-#if 1
-#include "stdio_impl.h"
-#undef ungetc
-#define ungetc(c,f) ((f)->rpos--,(c))
-#undef getc
-#define getc getc_unlocked
-#endif
-
-
-static long long scanexp(FILE *f, off_t *pcnt)
+static long long scanexp(FILE *f, int pok)
{
int c;
int x;
long long y;
int neg = 0;
- *pcnt += (c=getc(f))>=0;
+ c = shgetc(f);
if (c=='+' || c=='-') {
neg = (c=='-');
- *pcnt += (c=getc(f))>=0;
- if (c-'0'>=10U) {
- if (c>=0) {
- ungetc(c, f);
- --*pcnt;
- }
- return LLONG_MIN;
- }
+ c = shgetc(f);
+ if (c-'0'>=10U && pok) shunget(f);
+ }
+ if (c-'0'>=10U) {
+ shunget(f);
+ return LLONG_MIN;
}
- for (x=0; c-'0'<10U && x<INT_MAX/10; *pcnt += (c=getc(f))>=0)
+ for (x=0; c-'0'<10U && x<INT_MAX/10; c = shgetc(f))
x = 10*x + c-'0';
- for (y=x; c-'0'<10U && x<LLONG_MAX/10; *pcnt += (c=getc(f))>=0)
+ for (y=x; c-'0'<10U && x<LLONG_MAX/100; c = shgetc(f))
y = 10*y + c-'0';
- for (; c-'0'<10U; *pcnt += (c=getc(f))>=0);
- if (c>=0) {
- ungetc(c, f);
- --*pcnt;
- }
+ for (; c-'0'<10U; c = shgetc(f));
+ shunget(f);
return neg ? -y : y;
}
-static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int pok, off_t *pcnt)
+static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int pok)
{
uint32_t x[KMAX];
static const uint32_t th[] = { LD_B1B_MAX };
int i, j, k, a, z;
long long lrp=-1, dc=0;
+ long long e10=0;
+ int lnz = 0;
int gotdig = 0;
int rp;
- int e10=0;
int e2;
long double y;
long double frac=0;
long double bias=0;
+ static const int p10s[] = { 10, 100, 1000, 10000,
+ 100000, 1000000, 10000000, 100000000 };
j=0;
k=0;
- if (c<0) *pcnt += (c=getc(f))>=0;
-
/* Don't let leading zeros consume buffer space */
- for (; c=='0'; *pcnt += (c=getc(f))>=0) gotdig=1;
+ for (; c=='0'; c = shgetc(f)) gotdig=1;
x[0] = 0;
- for (; c-'0'<10U || c=='.'; *pcnt += (c=getc(f))>=0) {
+ for (; c-'0'<10U || c=='.'; c = shgetc(f)) {
if (c == '.') {
if (lrp!=-1) break;
lrp = dc;
- } else if (k < KMAX) {
+ } else if (k < KMAX-2) {
+ if (c!='0') lnz = dc;
dc++;
if (j) x[k] = x[k]*10 + c-'0';
else x[k] = c-'0';
gotdig=1;
} else {
dc++;
- x[KMAX-1] |= c-'0';
+ if (c!='0') x[KMAX-3] |= 1;
}
}
if (lrp==-1) lrp=dc;
if (gotdig && (c|32)=='e') {
- e10 = scanexp(f, pcnt);
+ e10 = scanexp(f, pok);
if (e10 == LLONG_MIN) {
- if (!pok) {
- *pcnt = 0;
+ if (pok) {
+ shunget(f);
+ } else {
+ shlim(f, 0);
return 0;
}
e10 = 0;
}
lrp += e10;
} else if (c>=0) {
- ungetc(c, f);
- --*pcnt;
+ shunget(f);
}
if (!gotdig) {
- *pcnt = 0;
+ errno = EINVAL;
+ shlim(f, 0);
return 0;
}
- if (!x[0])
- return sign * 0.0;
- if (lrp==dc && (!k || (k==1 && !j)) && (bits>30 || x[0]>>bits==0))
+ /* Handle zero specially to avoid nasty special cases later */
+ if (!x[0]) return sign * 0.0;
+
+ /* Optimize small integers (w/no exponent) and over/under-flow */
+ if (lrp==dc && dc<10 && (bits>30 || x[0]>>bits==0))
return sign * (long double)x[0];
- if (lrp > -emin/2)
+ if (lrp > -emin/2) {
+ errno = ERANGE;
return sign * LDBL_MAX * LDBL_MAX;
- if (lrp < emin-2*LDBL_MANT_DIG)
+ }
+ if (lrp < emin-2*LDBL_MANT_DIG) {
+ errno = ERANGE;
return sign * LDBL_MIN * LDBL_MIN;
+ }
+ /* Align incomplete final B1B digit */
if (k<KMAX && j) {
for (; j<9; j++) x[k]*=10;
k++;
e2 = 0;
rp = lrp;
- while (rp < 18+9*LD_B1B_DIG) {
+ /* Optimize small to mid-size integers (even in exp. notation) */
+ if (lnz<9 && lnz<=rp && rp < 18) {
+ if (rp == 9) return sign * (long double)x[0];
+ if (rp < 9) return sign * (long double)x[0] / p10s[8-rp];
+ int bitlim = bits-3*(int)(rp-9);
+ if (bitlim>30 || x[0]>>bitlim==0)
+ return sign * (long double)x[0] * p10s[rp-10];
+ }
+
+ /* Align radix point to B1B digit boundary */
+ if (rp % 9) {
+ int rpm9 = rp>=0 ? rp%9 : rp%9+9;
+ int p10 = p10s[8-rpm9];
+ uint32_t carry = 0;
+ for (k=a; k!=z; k++) {
+ uint32_t tmp = x[k] % p10;
+ x[k] = x[k]/p10 + carry;
+ carry = 1000000000/p10 * tmp;
+ if (k==a && !x[k]) {
+ a = (a+1 & MASK);
+ rp -= 9;
+ }
+ }
+ if (carry) x[z++] = carry;
+ rp += 9-rpm9;
+ }
+
+ /* Upscale until desired number of bits are left of radix point */
+ while (rp < 9*LD_B1B_DIG || (rp == 9*LD_B1B_DIG && x[a]<th[0])) {
uint32_t carry = 0;
e2 -= 29;
for (k=(z-1 & MASK); ; k=(k-1 & MASK)) {
}
}
- if (rp % 9) {
- static const int p10s[] = {
- 100000000, 10000000, 1000000, 100000,
- 10000, 1000, 100, 10
- };
- int rpm9 = rp % 9;
- int p10 = p10s[rpm9-1];
- uint32_t carry = 0;
- for (k=a; k!=z; k=(k+1 & MASK)) {
- uint32_t tmp = x[k] % p10;
- x[k] = x[k]/p10 + carry;
- carry = 1000000000/p10 * tmp;
- if (k==a && !x[k]) {
- a = (a+1 & MASK);
- rp -= 9;
- }
- }
- if (carry) {
- if ((z+1 & MASK) != a) {
- x[z] = carry;
- z = (z+1 & MASK);
- } else x[z-1 & MASK] |= 1;
- }
- rp += 9-rpm9;
- }
-
+ /* Downscale until exactly number of bits are left of radix point */
for (;;) {
uint32_t carry = 0;
int sh = 1;
carry = (1000000000>>sh) * tmp;
if (k==a && !x[k]) {
a = (a+1 & MASK);
+ i--;
rp -= 9;
}
}
}
}
- for (y=i=0; i<LD_B1B_DIG && (a+i & MASK)!=z; i++)
+ /* Assemble desired bits into floating point variable */
+ for (y=i=0; i<LD_B1B_DIG; i++) {
+ if ((a+i & MASK)==z) x[z=(z+1 & MASK)] = 0;
y = 1000000000.0L * y + x[a+i & MASK];
+ }
y *= sign;
+ /* Limit precision for denormal results */
if (bits > LDBL_MANT_DIG+e2-emin) {
bits = LDBL_MANT_DIG+e2-emin;
if (bits<0) bits=0;
}
+ /* Calculate bias term to force rounding, move out lower bits */
if (bits < LDBL_MANT_DIG) {
bias = copysignl(scalbn(1, 2*LDBL_MANT_DIG-bits-1), y);
frac = fmodl(y, scalbn(1, LDBL_MANT_DIG-bits));
y += bias;
}
+ /* Process tail of decimal input so it can affect rounding */
if ((a+i & MASK) != z) {
uint32_t t = x[a+i & MASK];
if (t < 500000000 && (t || (a+i+1 & MASK) != z))
y = scalbnl(y, e2);
+ if (!y) errno = ERANGE;
+
return y;
}
-static long double hexfloat(FILE *f, int c, int bits, int emin, int sign, int pok, off_t *pcnt)
+static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
{
uint32_t x = 0;
long double y = 0;
long long dc = 0;
long long e2 = 0;
int d;
+ int c;
- if (c<0) *pcnt += (c=getc(f))>=0;
+ c = shgetc(f);
/* Skip leading zeros */
- for (; c=='0'; *pcnt += (c=getc(f))>=0) gotdig = 1;
+ for (; c=='0'; c = shgetc(f)) gotdig = 1;
if (c=='.') {
gotrad = 1;
- *pcnt += (c=getc(f))>=0;
+ c = shgetc(f);
/* Count zeros after the radix point before significand */
- for (rp=0; c=='0'; *pcnt += (c=getc(f))>=0, rp--) gotdig = 1;
+ for (rp=0; c=='0'; c = shgetc(f), rp--) gotdig = 1;
}
- for (; c-'0'<10U || (c|32)-'a'<6U || c=='.'; *pcnt += (c=getc(f))>=0) {
+ for (; c-'0'<10U || (c|32)-'a'<6U || c=='.'; c = shgetc(f)) {
if (c=='.') {
if (gotrad) break;
rp = dc;
}
}
if (!gotdig) {
- if (c>=0) {
- ungetc(c, f);
- --*pcnt;
+ shunget(f);
+ if (pok) {
+ shunget(f);
+ if (gotrad) shunget(f);
+ } else {
+ shlim(f, 0);
}
- if (pok) *pcnt -= 1+gotrad; /* uncount the rp, x of 0x */
- else *pcnt = 0;
return 0;
}
if (!gotrad) rp = dc;
while (dc<8) x *= 16, dc++;
if ((c|32)=='p') {
- e2 = scanexp(f, pcnt);
+ e2 = scanexp(f, pok);
if (e2 == LLONG_MIN) {
- if (!pok) {
- *pcnt = 0;
+ if (pok) {
+ shunget(f);
+ } else {
+ shlim(f, 0);
return 0;
}
e2 = 0;
}
+ } else {
+ shunget(f);
}
e2 += 4*rp - 32;
if (!x) return sign * 0.0;
- if (e2 > -emin) return sign * LDBL_MAX * LDBL_MAX;
- if (e2 < emin-2*LDBL_MANT_DIG) return sign * LDBL_MIN * LDBL_MIN;
+ if (e2 > -emin) {
+ errno = ERANGE;
+ return sign * LDBL_MAX * LDBL_MAX;
+ }
+ if (e2 < emin-2*LDBL_MANT_DIG) {
+ errno = ERANGE;
+ return sign * LDBL_MIN * LDBL_MIN;
+ }
while (x < 0x80000000) {
if (y>=0.5) {
y = bias + sign*(long double)x + sign*y;
y -= bias;
+ if (!y) errno = ERANGE;
+
return scalbnl(y, e2);
}
-long double __floatscan(FILE *f, int c, int prec, int pok, off_t *pcnt)
+long double __floatscan(FILE *f, int c, int prec, int pok)
{
int sign = 1;
int i;
int bits;
int emin;
- *pcnt = 0;
-
switch (prec) {
case 0:
- bits = 24;
- emin = -149;
+ bits = FLT_MANT_DIG;
+ emin = FLT_MIN_EXP-bits;
break;
case 1:
- bits = 53;
- emin = -1074;
+ bits = DBL_MANT_DIG;
+ emin = DBL_MIN_EXP-bits;
break;
case 2:
bits = LDBL_MANT_DIG;
- emin = -16445;
+ emin = LDBL_MIN_EXP-bits;
break;
default:
return 0;
}
- if (c<0) *pcnt += (c=getc(f))>=0;
+ if (c<0) c = shgetc(f);
if (c=='+' || c=='-') {
sign -= 2*(c=='-');
- *pcnt += (c=getc(f))>=0;
+ c = shgetc(f);
}
for (i=0; i<8 && (c|32)=="infinity"[i]; i++)
- if (i<7) c = getc(f);
+ if (i<7) c = shgetc(f);
if (i==3 || i==8 || (i>3 && pok)) {
- if (i==3 && c>=0) ungetc(c, f);
- if (i==8) *pcnt += 7;
- else *pcnt += 2;
+ if (i==3) shunget(f);
+ if (pok) for (; i>3; i--) shunget(f);
+ else shlim(f, 0);
return sign * INFINITY;
}
if (!i) for (i=0; i<3 && (c|32)=="nan"[i]; i++)
- if (i<3) c = getc(f);
+ if (i<3) c = shgetc(f);
if (i==3) {
- *pcnt += 2;
- return sign>0 ? NAN : -NAN;
+ return NAN;
}
if (i) {
- if (c>=0) ungetc(c, f);
- *pcnt = 0;
+ shunget(f);
+ errno = EINVAL;
+ shlim(f, 0);
return 0;
}
if (c=='0') {
- *pcnt += (c=getc(f))>=0;
+ c = shgetc(f);
if ((c|32) == 'x')
- return hexfloat(f, -1, bits, emin, sign, pok, pcnt);
- if (c>=0) {
- ungetc(c, f);
- --*pcnt;
- }
+ return hexfloat(f, bits, emin, sign, pok);
+ shunget(f);
c = '0';
}
- return decfloat(f, c, bits, emin, sign, pok, pcnt);
+ return decfloat(f, c, bits, emin, sign, pok);
}