projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix powerpc asm not to store data in volatile space below stack pointer
[musl]
/
src
/
stdio
/
vfprintf.c
diff --git
a/src/stdio/vfprintf.c
b/src/stdio/vfprintf.c
index
57878c0
..
1e7e6a4
100644
(file)
--- a/
src/stdio/vfprintf.c
+++ b/
src/stdio/vfprintf.c
@@
-1,4
+1,13
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <errno.h>
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
+#include <stdarg.h>
+#include <wchar.h>
+#include <inttypes.h>
+#include <math.h>
+#include <float.h>
/* Some useful macros */
/* Some useful macros */
@@
-73,6
+82,8
@@
static const unsigned char states[]['z'-'A'+1] = {
}, { /* 1: l-prefixed */
S('d') = LONG, S('i') = LONG,
S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG,
}, { /* 1: l-prefixed */
S('d') = LONG, S('i') = LONG,
S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG,
+ S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL,
+ S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL,
S('c') = INT, S('s') = PTR, S('n') = PTR,
S('l') = LLPRE,
}, { /* 2: ll-prefixed */
S('c') = INT, S('s') = PTR, S('n') = PTR,
S('l') = LLPRE,
}, { /* 2: ll-prefixed */
@@
-193,18
+204,18
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
uint32_t *a, *d, *r, *z;
int e2=0, e, i, j, l;
char buf[9+LDBL_MANT_DIG/4], *s;
uint32_t *a, *d, *r, *z;
int e2=0, e, i, j, l;
char buf[9+LDBL_MANT_DIG/4], *s;
- const char *prefix="-
+
";
+ const char *prefix="-
0X+0X 0X-0x+0x 0x
";
int pl;
char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
pl=1;
int pl;
char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
pl=1;
- if (
y<0 || 1/y<0
) {
+ if (
signbit(y)
) {
y=-y;
} else if (fl & MARK_POS) {
y=-y;
} else if (fl & MARK_POS) {
- prefix+
+
;
+ prefix+
=3
;
} else if (fl & PAD_POS) {
} else if (fl & PAD_POS) {
- prefix+=
2
;
- } else pl=0;
+ prefix+=
6
;
+ } else p
refix++, p
l=0;
if (!isfinite(y)) {
char *s = (t&32)?"inf":"INF";
if (!isfinite(y)) {
char *s = (t&32)?"inf":"INF";
@@
-223,15
+234,23
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
long double round = 8.0;
int re;
long double round = 8.0;
int re;
+ if (t&32) prefix += 9;
+ pl += 2;
+
if (p<0 || p>=LDBL_MANT_DIG/4-1) re=0;
else re=LDBL_MANT_DIG/4-1-p;
if (re) {
if (p<0 || p>=LDBL_MANT_DIG/4-1) re=0;
else re=LDBL_MANT_DIG/4-1-p;
if (re) {
- if (pl && *prefix=='-') y=-y;
while (re--) round*=16;
while (re--) round*=16;
- y+=round;
- y-=round;
- if (y<0) y=-y;
+ if (*prefix=='-') {
+ y=-y;
+ y-=round;
+ y+=round;
+ y=-y;
+ } else {
+ y+=round;
+ y-=round;
+ }
}
estr=fmt_u(e2<0 ? -e2 : e2, ebuf);
}
estr=fmt_u(e2<0 ? -e2 : e2, ebuf);
@@
-240,17
+259,17
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
*--estr = t+('p'-'a');
s=buf;
*--estr = t+('p'-'a');
s=buf;
- *s++='0';
- *s++=t+('x'-'a');
do {
int x=y;
*s++=xdigits[x]|(t&32);
y=16*(y-x);
do {
int x=y;
*s++=xdigits[x]|(t&32);
y=16*(y-x);
- if (s-buf==
3
&& (y||p>0||(fl&ALT_FORM))) *s++='.';
+ if (s-buf==
1
&& (y||p>0||(fl&ALT_FORM))) *s++='.';
} while (y);
} while (y);
- if (p<0) p = s-buf-4;
- l = 1 + p + (p || (fl&ALT_FORM)) + ebuf-estr;
+ if (p && s-buf-2 < p)
+ l = (p+2) + (ebuf-estr);
+ else
+ l = (s-buf) + (ebuf-estr);
pad(f, ' ', w, pl+l, fl);
out(f, prefix, pl);
pad(f, ' ', w, pl+l, fl);
out(f, prefix, pl);
@@
-258,12
+277,12
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
out(f, buf, s-buf);
pad(f, '0', l-(ebuf-estr)-(s-buf), 0, 0);
out(f, estr, ebuf-estr);
out(f, buf, s-buf);
pad(f, '0', l-(ebuf-estr)-(s-buf), 0, 0);
out(f, estr, ebuf-estr);
- pad(f, '
0
', w, pl+l, fl^LEFT_ADJ);
+ pad(f, '
', w, pl+l, fl^LEFT_ADJ);
return MAX(w, pl+l);
}
if (p<0) p=6;
return MAX(w, pl+l);
}
if (p<0) p=6;
-
y *= 0x1p28;
e2-=28;
+
if (y) y *= 0x1p28,
e2-=28;
if (e2<0) a=r=z=big;
else a=r=z=big+sizeof(big)/sizeof(*big) - LDBL_MANT_DIG - 1;
if (e2<0) a=r=z=big;
else a=r=z=big+sizeof(big)/sizeof(*big) - LDBL_MANT_DIG - 1;
@@
-286,7
+305,7
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
e2-=sh;
}
while (e2<0) {
e2-=sh;
}
while (e2<0) {
- uint32_t carry=0, *
z2
;
+ uint32_t carry=0, *
b
;
int sh=MIN(9,-e2);
for (d=a; d<z; d++) {
uint32_t rm = *d & (1<<sh)-1;
int sh=MIN(9,-e2);
for (d=a; d<z; d++) {
uint32_t rm = *d & (1<<sh)-1;
@@
-296,8
+315,8
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
if (!*a) a++;
if (carry) *z++ = carry;
/* Avoid (slow!) computation past requested precision */
if (!*a) a++;
if (carry) *z++ = carry;
/* Avoid (slow!) computation past requested precision */
-
z2 = ((t|32)=='f' ? r : a) + 2 + p/9
;
-
z = MIN(z, z2)
;
+
b = (t|32)=='f' ? r : a
;
+
if (z-b > 2+p/9) z = b+2+p/9
;
e2+=sh;
}
e2+=sh;
}
@@
-305,11
+324,11
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
else e=0;
/* Perform rounding: j is precision after the radix (possibly neg) */
else e=0;
/* Perform rounding: j is precision after the radix (possibly neg) */
- j = p - ((t|32)!='f')*e - ((t|32)=='g');
+ j = p - ((t|32)!='f')*e - ((t|32)=='g'
&& p
);
if (j < 9*(z-r-1)) {
uint32_t x;
/* We avoid C's broken division of negative numbers */
if (j < 9*(z-r-1)) {
uint32_t x;
/* We avoid C's broken division of negative numbers */
- d = r + 1 + (
j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP
;
+ d = r + 1 + (
(j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP)
;
j += 9*LDBL_MAX_EXP;
j %= 9;
for (i=10, j++; j<9; i*=10, j++);
j += 9*LDBL_MAX_EXP;
j %= 9;
for (i=10, j++; j<9; i*=10, j++);
@@
-318,13
+337,15
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
if (x || d+1!=z) {
long double round = CONCAT(0x1p,LDBL_MANT_DIG);
long double small;
if (x || d+1!=z) {
long double round = CONCAT(0x1p,LDBL_MANT_DIG);
long double small;
- if (x<i/2) small=0x01p-1;
- else if (i==i/2 && d+1==z) small=0x10p-1;
- else small=0x11p-1;
+ if (*d/i & 1) round += 2;
+ if (x<i/2) small=0x0.8p0;
+ else if (x==i/2 && d+1==z) small=0x1.0p0;
+ else small=0x1.8p0;
if (pl && *prefix=='-') round*=-1, small*=-1;
if (pl && *prefix=='-') round*=-1, small*=-1;
+ *d -= x;
/* Decide whether to round by probing round+small */
if (round+small != round) {
/* Decide whether to round by probing round+small */
if (round+small != round) {
- *d = *d
- x
+ i;
+ *d = *d + i;
while (*d > 999999999) {
*d--=0;
(*d)++;
while (*d > 999999999) {
*d--=0;
(*d)++;
@@
-333,6
+354,7
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
}
}
for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
}
}
+ if (z>d+1) z=d+1;
for (; !z[-1] && z>a; z--);
}
for (; !z[-1] && z>a; z--);
}
@@
-347,7
+369,7
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
}
if (!(fl&ALT_FORM)) {
/* Count trailing zeros in last place */
}
if (!(fl&ALT_FORM)) {
/* Count trailing zeros in last place */
- if (z>a) for (i=10, j=0; z[-1]%i==0; i*=10, j++);
+ if (z>a
&& z[-1]
) for (i=10, j=0; z[-1]%i==0; i*=10, j++);
else j=9;
if ((t|32)=='f')
p = MIN(p,MAX(0,9*(z-r-1)-j));
else j=9;
if ((t|32)=='f')
p = MIN(p,MAX(0,9*(z-r-1)-j));
@@
-417,7
+439,7
@@
static int getint(char **s) {
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type)
{
char *a, *z, *s=(char *)fmt;
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type)
{
char *a, *z, *s=(char *)fmt;
- unsigned l10n=0,
litpct,
fl;
+ unsigned l10n=0, fl;
int w, p;
union arg arg;
int argpos;
int w, p;
union arg arg;
int argpos;
@@
-442,9
+464,7
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
/* Handle literal text and %% format specifiers */
for (a=s; *s && *s!='%'; s++);
/* Handle literal text and %% format specifiers */
for (a=s; *s && *s!='%'; s++);
- litpct = strspn(s, "%")/2; /* Optimize %%%% runs */
- z = s+litpct;
- s += 2*litpct;
+ for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2);
l = z-a;
if (f) out(f, a, l);
if (l) continue;
l = z-a;
if (f) out(f, a, l);
if (l) continue;
@@
-541,7
+561,7
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
fl |= ALT_FORM;
case 'x': case 'X':
a = fmt_x(arg.i, z, t&32);
fl |= ALT_FORM;
case 'x': case 'X':
a = fmt_x(arg.i, z, t&32);
- if (
fl & ALT_FORM
) prefix+=(t>>4), pl=2;
+ if (
arg.i && (fl & ALT_FORM)
) prefix+=(t>>4), pl=2;
if (0) {
case 'o':
a = fmt_o(arg.i, z);
if (0) {
case 'o':
a = fmt_o(arg.i, z);
@@
-559,8
+579,11
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
case 'u':
a = fmt_u(arg.i, z);
}
case 'u':
a = fmt_u(arg.i, z);
}
- if (!arg.i && !p) continue;
if (p>=0) fl &= ~ZERO_PAD;
if (p>=0) fl &= ~ZERO_PAD;
+ if (!arg.i && !p) {
+ a=z;
+ break;
+ }
p = MAX(p, z-a + !arg.i);
break;
case 'c':
p = MAX(p, z-a + !arg.i);
break;
case 'c':
@@
-570,7
+593,7
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
case 'm':
if (1) a = strerror(errno); else
case 's':
case 'm':
if (1) a = strerror(errno); else
case 's':
- a = arg.p;
+ a = arg.p
? arg.p : "(null)"
;
z = memchr(a, 0, p);
if (!z) z=a+p;
else p=z-a;
z = memchr(a, 0, p);
if (!z) z=a+p;
else p=z-a;
@@
-583,12
+606,12
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
p = -1;
case 'S':
ws = arg.p;
p = -1;
case 'S':
ws = arg.p;
- for (i=
0;
*ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l);
+ for (i=
l=0; i<0U+p &&
*ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l);
if (l<0) return -1;
p = i;
pad(f, ' ', w, p, fl);
ws = arg.p;
if (l<0) return -1;
p = i;
pad(f, ' ', w, p, fl);
ws = arg.p;
- for (i=0; *ws && i+(l=wctomb(mb, *ws++))<=p; i+=l)
+ for (i=0;
i<0U+p &&
*ws && i+(l=wctomb(mb, *ws++))<=p; i+=l)
out(f, mb, l);
pad(f, ' ', w, p, fl^LEFT_ADJ);
l = w>p ? w : p;
out(f, mb, l);
pad(f, ' ', w, p, fl^LEFT_ADJ);
l = w>p ? w : p;
@@
-622,18
+645,32
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
return 1;
}
return 1;
}
-int vfprintf(FILE *
f, const char *
fmt, va_list ap)
+int vfprintf(FILE *
restrict f, const char *restrict
fmt, va_list ap)
{
va_list ap2;
{
va_list ap2;
- int nl_type[NL_ARGMAX] = {0};
- union arg nl_arg[NL_ARGMAX];
+ int nl_type[NL_ARGMAX+1] = {0};
+ union arg nl_arg[NL_ARGMAX+1];
+ unsigned char internal_buf[80], *saved_buf = 0;
int ret;
va_copy(ap2, ap);
if (printf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) return -1;
FLOCK(f);
int ret;
va_copy(ap2, ap);
if (printf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) return -1;
FLOCK(f);
+ if (!f->buf_size) {
+ saved_buf = f->buf;
+ f->wpos = f->wbase = f->buf = internal_buf;
+ f->buf_size = sizeof internal_buf;
+ f->wend = internal_buf + sizeof internal_buf;
+ }
ret = printf_core(f, fmt, &ap2, nl_arg, nl_type);
ret = printf_core(f, fmt, &ap2, nl_arg, nl_type);
+ if (saved_buf) {
+ f->write(f, 0, 0);
+ if (!f->wpos) ret = -1;
+ f->buf = saved_buf;
+ f->buf_size = 0;
+ f->wpos = f->wbase = f->wend = 0;
+ }
FUNLOCK(f);
va_end(ap2);
return ret;
FUNLOCK(f);
va_end(ap2);
return ret;