#define MASK (KMAX-1)
+#define CONCAT2(x,y) x ## y
+#define CONCAT(x,y) CONCAT2(x,y)
static long long scanexp(FILE *f, 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 lrp=0, dc=0;
long long e10=0;
int lnz = 0;
- int gotdig = 0;
+ int gotdig = 0, gotrad = 0;
int rp;
int e2;
+ int emax = -emin-bits+3;
+ int denormal = 0;
long double y;
long double frac=0;
long double bias=0;
/* Don't let leading zeros consume buffer space */
for (; c=='0'; c = shgetc(f)) gotdig=1;
+ if (c=='.') {
+ gotrad = 1;
+ for (c = shgetc(f); c=='0'; c = shgetc(f)) gotdig=1, lrp--;
+ }
x[0] = 0;
for (; c-'0'<10U || c=='.'; c = shgetc(f)) {
if (c == '.') {
- if (lrp!=-1) break;
+ if (gotrad) break;
+ gotrad = 1;
lrp = dc;
- } else if (k < KMAX-2) {
+ } else if (k < KMAX-3) {
dc++;
if (c!='0') lnz = dc;
if (j) x[k] = x[k]*10 + c-'0';
gotdig=1;
} else {
dc++;
- if (c!='0') x[KMAX-3] |= 1;
+ if (c!='0') x[KMAX-4] |= 1;
}
}
- if (lrp==-1) lrp=dc;
+ if (!gotrad) lrp=dc;
if (gotdig && (c|32)=='e') {
e10 = scanexp(f, pok);
}
/* Align incomplete final B1B digit */
- if (k<KMAX && j) {
+ if (j) {
for (; j<9; j++) x[k]*=10;
k++;
j=0;
}
if (carry) {
rp += 9;
+ a = (a-1 & MASK);
if (a == z) {
z = (z-1 & MASK);
x[z-1 & MASK] |= x[z];
}
- a = (a-1 & MASK);
x[a] = carry;
}
}
/* 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;
+ if ((a+i & MASK)==z) x[(z=(z+1 & MASK))-1] = 0;
y = 1000000000.0L * y + x[a+i & MASK];
}
if (bits > LDBL_MANT_DIG+e2-emin) {
bits = LDBL_MANT_DIG+e2-emin;
if (bits<0) bits=0;
+ denormal = 1;
}
/* Calculate bias term to force rounding, move out lower bits */
y += frac;
y -= bias;
- y = scalbnl(y, e2);
-
- if (!y) errno = ERANGE;
+ if ((e2+LDBL_MANT_DIG & INT_MAX) > emax-5) {
+ if (fabs(y) >= CONCAT(0x1p, LDBL_MANT_DIG)) {
+ if (denormal && bits==LDBL_MANT_DIG+e2-emin)
+ denormal = 0;
+ y *= 0.5;
+ e2++;
+ }
+ if (e2+LDBL_MANT_DIG>emax || (denormal && frac))
+ errno = ERANGE;
+ }
- return y;
+ return scalbnl(y, e2);
}
static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
} else {
shlim(f, 0);
}
- return 0;
+ return sign * 0.0;
}
if (!gotrad) rp = dc;
while (dc<8) x *= 16, dc++;