projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pthread_create return value with PTHREAD_EXPLICIT_SCHED
[musl]
/
src
/
internal
/
floatscan.c
diff --git
a/src/internal/floatscan.c
b/src/internal/floatscan.c
index
aa962f4
..
278bf25
100644
(file)
--- a/
src/internal/floatscan.c
+++ b/
src/internal/floatscan.c
@@
-4,6
+4,7
@@
#include <float.h>
#include <limits.h>
#include <errno.h>
#include <float.h>
#include <limits.h>
#include <errno.h>
+#include <ctype.h>
#include "shgetc.h"
#include "floatscan.h"
#include "shgetc.h"
#include "floatscan.h"
@@
-14,12
+15,20
@@
#define LD_B1B_MAX 9007199, 254740991
#define KMAX 128
#define LD_B1B_MAX 9007199, 254740991
#define KMAX 128
-#el
se /* LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 */
+#el
if LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384
#define LD_B1B_DIG 3
#define LD_B1B_MAX 18, 446744073, 709551615
#define KMAX 2048
#define LD_B1B_DIG 3
#define LD_B1B_MAX 18, 446744073, 709551615
#define KMAX 2048
+#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384
+
+#define LD_B1B_DIG 4
+#define LD_B1B_MAX 10384593, 717069655, 257060992, 658440191
+#define KMAX 2048
+
+#else
+#error Unsupported long double representation
#endif
#define MASK (KMAX-1)
#endif
#define MASK (KMAX-1)
@@
-89,7
+98,7
@@
static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
if (gotrad) break;
gotrad = 1;
lrp = dc;
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';
dc++;
if (c!='0') lnz = dc;
if (j) x[k] = x[k]*10 + c-'0';
@@
-101,7
+110,10
@@
static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
gotdig=1;
} else {
dc++;
gotdig=1;
} else {
dc++;
- if (c!='0') x[KMAX-3] |= 1;
+ if (c!='0') {
+ lnz = (KMAX-4)*9;
+ x[KMAX-4] |= 1;
+ }
}
}
if (!gotrad) lrp=dc;
}
}
if (!gotrad) lrp=dc;
@@
-143,7
+155,7
@@
static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
}
/* Align incomplete final B1B digit */
}
/* Align incomplete final B1B digit */
- if (
k<KMAX &&
j) {
+ if (j) {
for (; j<9; j++) x[k]*=10;
k++;
j=0;
for (; j<9; j++) x[k]*=10;
k++;
j=0;
@@
-163,6
+175,9
@@
static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
return sign * (long double)x[0] * p10s[rp-10];
}
return sign * (long double)x[0] * p10s[rp-10];
}
+ /* Drop trailing zeros */
+ for (; !x[z-1]; z--);
+
/* Align radix point to B1B digit boundary */
if (rp % 9) {
int rpm9 = rp>=0 ? rp%9 : rp%9+9;
/* Align radix point to B1B digit boundary */
if (rp % 9) {
int rpm9 = rp>=0 ? rp%9 : rp%9+9;
@@
-199,11
+214,11
@@
static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
}
if (carry) {
rp += 9;
}
if (carry) {
rp += 9;
+ a = (a-1 & MASK);
if (a == z) {
z = (z-1 & MASK);
x[z-1 & MASK] |= x[z];
}
if (a == z) {
z = (z-1 & MASK);
x[z-1 & MASK] |= x[z];
}
- a = (a-1 & MASK);
x[a] = carry;
}
}
x[a] = carry;
}
}
@@
-244,7
+259,7
@@
static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
/* Assemble desired bits into floating point variable */
for (y=i=0; i<LD_B1B_DIG; 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;
+ if ((a+i & MASK)==z) x[
(z=(z+1 & MASK))-1
] = 0;
y = 1000000000.0L * y + x[a+i & MASK];
}
y = 1000000000.0L * y + x[a+i & MASK];
}
@@
-352,7
+367,7
@@
static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
} else {
shlim(f, 0);
}
} else {
shlim(f, 0);
}
- return 0;
+ return
sign * 0.
0;
}
if (!gotrad) rp = dc;
while (dc<8) x *= 16, dc++;
}
if (!gotrad) rp = dc;
while (dc<8) x *= 16, dc++;
@@
-414,7
+429,7
@@
static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
long double __floatscan(FILE *f, int prec, int pok)
{
int sign = 1;
long double __floatscan(FILE *f, int prec, int pok)
{
int sign = 1;
-
in
t i;
+
size_
t i;
int bits;
int emin;
int c;
int bits;
int emin;
int c;
@@
-455,6
+470,24
@@
long double __floatscan(FILE *f, int prec, int pok)
if (!i) for (i=0; i<3 && (c|32)=="nan"[i]; i++)
if (i<2) c = shgetc(f);
if (i==3) {
if (!i) for (i=0; i<3 && (c|32)=="nan"[i]; i++)
if (i<2) c = shgetc(f);
if (i==3) {
+ if (shgetc(f) != '(') {
+ shunget(f);
+ return NAN;
+ }
+ for (i=1; ; i++) {
+ c = shgetc(f);
+ if (c-'0'<10U || c-'A'<26U || c-'a'<26U || c=='_')
+ continue;
+ if (c==')') return NAN;
+ shunget(f);
+ if (!pok) {
+ errno = EINVAL;
+ shlim(f, 0);
+ return 0;
+ }
+ while (i--) shunget(f);
+ return NAN;
+ }
return NAN;
}
return NAN;
}