---- vfprintf.c.orig Thu Jul 24 12:42:14 2003
-+++ vfprintf.c Tue Apr 6 17:44:49 2004
+--- vfprintf.c.orig Sun May 30 01:12:48 2004
++++ vfprintf.c Sun May 30 01:18:16 2004
@@ -58,6 +58,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include "un-namespace.h"
-@@ -66,9 +67,20 @@
+@@ -66,6 +67,12 @@
#include "local.h"
#include "fvwrite.h"
+#ifdef ALTIVEC
+#include <machine/cpu_capabilities.h>
+
-+#define VECTORTYPE vector unsigned char
++#define VECTORTYPE vector unsigned char
+#endif /* ALTIVEC */
-+
- /* Define FLOATING_POINT to get floating point. */
- #define FLOATING_POINT
-
-+/* if no floating point, turn off HEXFLOAT as well */
-+#if defined(HEXFLOAT) && !defined(FLOATING_POINT)
-+#undef HEXFLOAT
-+#endif /* defined(HEXFLOAT) && !defined(FLOATING_POINT) */
+
union arg {
int intarg;
u_int uintarg;
-@@ -88,7 +100,7 @@
- long *plongarg;
- long long *plonglongarg;
- ptrdiff_t *pptrdiffarg;
-- size_t *psizearg;
-+ ssize_t *psizearg;
- intmax_t *pintmaxarg;
- #ifdef FLOATING_POINT
- double doublearg;
-@@ -96,6 +108,16 @@
+@@ -93,6 +100,16 @@
#endif
wint_t wintarg;
wchar_t *pwchararg;
};
/*
-@@ -106,7 +128,11 @@
+@@ -103,7 +120,11 @@
T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
};
static int __sprint(FILE *, struct __suio *);
-@@ -119,6 +145,37 @@
+@@ -116,6 +137,37 @@
static void __find_arguments(const char *, va_list, union arg **);
static void __grow_type_table(int, enum typeid **, int *);
/*
* Flush out all the vectors defined by the given uio,
* then reset it so that it can be reused.
-@@ -424,6 +481,15 @@
-
- #endif /* FLOATING_POINT */
-
-+#ifdef HEXFLOAT
-+extern int __hdtoa(double d, const char *xdigs, int prec, char *cp,
-+ int *expt, int *signflag, char **dtoaend);
-+#if !__TYPE_LONGDOUBLE_IS_DOUBLE
-+extern int __hldtoa(long double d, const char *xdigs, int prec, char *cp,
-+ int *expt, int *signflag, char **dtoaend);
-+#endif /* !__TYPE_LONGDOUBLE_IS_DOUBLE */
-+#endif /* HEXFLOAT */
-+
- /*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things. Technically, we would need the
-@@ -452,6 +518,9 @@
+@@ -451,6 +503,9 @@
#define PTRDIFFT 0x800 /* ptrdiff_t */
#define INTMAXT 0x1000 /* intmax_t */
#define CHARINT 0x2000 /* print char using int format */
/*
* Non-MT-safe version
-@@ -503,6 +572,11 @@
+@@ -502,6 +557,11 @@
int nseps; /* number of group separators with ' */
int nrepeats; /* number of repeats of the last group */
#endif
u_long ulval; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */
-@@ -535,6 +609,12 @@
-
- static const char xdigs_lower[16] = "0123456789abcdef";
- static const char xdigs_upper[16] = "0123456789ABCDEF";
-+#ifdef HEXFLOAT
-+#define HEXFLOATDELTA 32
-+#define HEXFLOATSTART 32
-+ static char *hexfloat = NULL;
-+ static int hexfloatlen = 0;
-+#endif /* HEXFLOAT */
-
- /*
- * BEWARE, these `goto error' on error, and PAD uses `n'.
-@@ -575,15 +655,6 @@
+@@ -574,15 +634,6 @@
}
/*
* To extend shorts properly, we need both signed and unsigned
* argument extraction methods.
*/
-@@ -634,7 +705,6 @@
+@@ -633,7 +684,6 @@
val = GETARG (int); \
}
thousands_sep = '\0';
grouping = NULL;
convbuf = NULL;
-@@ -643,8 +713,10 @@
+@@ -642,8 +692,10 @@
decimal_point = localeconv()->decimal_point;
#endif
/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
/* optimise fprintf(stderr) (and other unbuffered Unix files) */
if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-@@ -676,6 +748,9 @@
+@@ -675,6 +727,9 @@
}
if (ch == '\0')
goto done;
fmt++; /* skip over '%' */
flags = 0;
-@@ -684,6 +759,9 @@
+@@ -683,6 +738,9 @@
prec = -1;
sign = '\0';
ox[1] = '\0';
rflag: ch = *fmt++;
reswitch: switch (ch) {
-@@ -699,6 +777,11 @@
+@@ -698,6 +756,11 @@
case '#':
flags |= ALT;
goto rflag;
case '*':
/*-
* ``A negative field width argument is taken as a
-@@ -807,6 +890,12 @@
- }
- size = (int)mbseqlen;
- } else {
+@@ -793,6 +856,12 @@
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'c':
+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ }
+#endif /* ALTIVEC */
- *(cp = buf) = GETARG(int);
- size = 1;
- }
-@@ -817,6 +906,12 @@
+ if (flags & LONGINT) {
+ static const mbstate_t initial;
+ mbstate_t mbs;
+@@ -817,6 +886,12 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ } else
++ }
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE) {
ujval = SJARG();
if ((intmax_t)ujval < 0) {
-@@ -836,6 +931,13 @@
- #ifdef HEXFLOAT
+@@ -835,6 +910,13 @@
+ #ifndef NO_FLOATING_POINT
case 'a':
case 'A':
+#ifdef ALTIVEC
if (ch == 'a') {
ox[1] = 'x';
xdigs = xdigs_lower;
-@@ -845,25 +947,51 @@
- xdigs = xdigs_upper;
- expchar = 'P';
- }
-- /*
-- * XXX We don't actually have a conversion
-- * XXX routine for this yet.
-- */
-+ if (!hexfloat) {
-+ hexfloat = malloc(hexfloatlen = HEXFLOATSTART);
-+ if (!hexfloat)
-+ goto error;
-+ }
-+ if (prec > hexfloatlen - 1) {
-+ int hlen = prec + HEXFLOATDELTA;
-+ char *hf = realloc(hexfloat, hlen);
-+ if (hf == NULL)
-+ goto error;
-+ hexfloat = hf;
-+ hexfloatlen = hlen;
-+ }
-+ cp = hexfloat;
- if (flags & LONGDBL) {
-- fparg.ldbl = (double)GETARG(long double);
-- dtoaresult = cp =
-- __hldtoa(fparg.ldbl, xdigs, prec,
-+#if __TYPE_LONGDOUBLE_IS_DOUBLE
-+ fparg.dbl = (double)GETARG(long double);
-+ prec = __hdtoa(fparg.dbl, xdigs, prec, cp,
- &expt, &signflag, &dtoaend);
-+#else /* ! __TYPE_LONGDOUBLE_IS_DOUBLE */
-+ fparg.ldbl = GETARG(long double);
-+ prec = __hldtoa(fparg.ldbl, xdigs, prec, cp,
-+ &expt, &signflag, &dtoaend);
-+#endif /* __TYPE_LONGDOUBLE_IS_DOUBLE */
- } else {
- fparg.dbl = GETARG(double);
-- dtoaresult = cp =
-- __hdtoa(fparg.dbl, xdigs, prec,
-+ prec = __hdtoa(fparg.dbl, xdigs, prec, cp,
- &expt, &signflag, &dtoaend);
- }
-- goto fp_begin;
-+ prec++;
-+ if (expt == INT_MAX)
-+ ox[1] = 0;
-+ else
-+ expt++;
-+ goto hex_begin;
- #endif
+@@ -866,6 +948,13 @@
+ goto fp_common;
case 'e':
case 'E':
+#ifdef ALTIVEC
expchar = ch;
if (prec < 0) /* account for digit before decpt */
prec = DEFPREC + 1;
-@@ -872,10 +1000,24 @@
+@@ -874,10 +963,24 @@
goto fp_begin;
case 'f':
case 'F':
expchar = ch - ('g' - 'e');
if (prec == 0)
prec = 1;
-@@ -884,6 +1026,17 @@
- prec = DEFPREC;
- if (dtoaresult != NULL)
- freedtoa(dtoaresult);
-+#if __TYPE_LONGDOUBLE_IS_DOUBLE
-+ if (flags & LONGDBL)
-+ fparg.dbl = (double)GETARG(long double);
-+ else
-+ fparg.dbl = GETARG(double);
-+ dtoaresult = cp =
-+ dtoa(fparg.dbl, expchar ? 2 : 3, prec,
-+ &expt, &signflag, &dtoaend);
-+ if (expt == 9999)
-+ expt = INT_MAX;
-+#else /* ! __TYPE_LONGDOUBLE_IS_DOUBLE */
- if (flags & LONGDBL) {
- fparg.ldbl = GETARG(long double);
- dtoaresult = cp =
-@@ -897,6 +1050,10 @@
- if (expt == 9999)
- expt = INT_MAX;
- }
-+#endif /* __TYPE_LONGDOUBLE_IS_DOUBLE */
-+#ifdef HEXFLOAT
-+hex_begin:
-+#endif /* HEXFLOAT */
- if (signflag)
- sign = '-';
- if (expt == INT_MAX) { /* inf or nan */
-@@ -990,6 +1147,12 @@
+@@ -993,6 +1096,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ } else
++ }
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1004,6 +1167,12 @@
+@@ -1007,6 +1116,12 @@
* defined manner.''
* -- ANSI X3J11
*/
ujval = (uintmax_t)(uintptr_t)GETARG(void *);
base = 16;
xdigs = xdigs_lower;
-@@ -1053,6 +1222,12 @@
+@@ -1056,6 +1171,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'u':
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ } else
++ }
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1065,6 +1240,12 @@
+@@ -1068,6 +1189,12 @@
case 'x':
xdigs = xdigs_lower;
hex:
+ if (flags & VECTOR) {
+ SETVEC(vval);
+ break;
-+ } else
++ }
+#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1109,6 +1290,14 @@
+@@ -1112,6 +1239,14 @@
if (size > BUF) /* should never happen */
abort();
break;
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
-@@ -1120,6 +1309,186 @@
+@@ -1123,6 +1258,184 @@
break;
}
+ * finish up the format specifier.
+ */
+ if (flags & SHORTINT) {
-+ vfmt[j++] = 'h';
++ if (ch != 'c')
++ vfmt[j++] = 'h';
+ vcnt = 8;
+ } else if (flags & LONGINT) {
-+ vfmt[j++] = 'l';
++ if (ch != 'c')
++ vfmt[j++] = 'l';
+ vcnt = 4;
+ } else {
+ switch (ch) {
+ VPRINT(vcnt, 0);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if (vsep)
-+ PRINT(&vsep, 1);
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i);
+ VPRINT(vcnt, 0, prec);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if (vsep)
-+ PRINT(&vsep, 1);
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i, prec);
+ VPRINT(vcnt, 0, width);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if (vsep)
-+ PRINT(&vsep, 1);
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i, width);
+ VPRINT(vcnt, 0, width, prec);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if (vsep)
-+ PRINT(&vsep, 1);
++ PRINT(&vsep, 1);
+
+ /* Element. */
+ VPRINT(vcnt, i, width, prec);
/*
* All reasonable formats wind up here. At this point, `cp'
* points to a string which (if not flags&LADJUST) should be
-@@ -1137,7 +1506,7 @@
- realsz = dprec > size ? dprec : size;
- if (sign)
- realsz++;
-- else if (ox[1])
-+ if (ox[1])
- realsz += 2;
-
- prsize = width > realsz ? width : realsz;
-@@ -1151,9 +1520,9 @@
- PAD(width - realsz, blanks);
-
- /* prefix */
-- if (sign) {
-+ if (sign)
- PRINT(&sign, 1);
-- } else if (ox[1]) { /* ox[1] is either x, X, or \0 */
-+ if (ox[1]) { /* ox[1] is either x, X, or \0 */
- ox[0] = '0';
- PRINT(ox, 2);
- }
-@@ -1400,6 +1769,11 @@
+@@ -1405,6 +1718,11 @@
if (flags & LONGINT)
ADDTYPE(T_WINT);
else
ADDTYPE(T_INT);
break;
case 'D':
-@@ -1407,6 +1781,11 @@
+@@ -1412,6 +1730,11 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
+#endif
ADDSARG();
break;
- #ifdef FLOATING_POINT
-@@ -1419,6 +1798,11 @@
+ #ifndef NO_FLOATING_POINT
+@@ -1422,6 +1745,11 @@
case 'f':
case 'g':
case 'G':
if (flags & LONGDBL)
ADDTYPE(T_LONG_DOUBLE);
else
-@@ -1447,9 +1831,19 @@
+@@ -1450,9 +1778,19 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
ADDTYPE(TP_VOID);
break;
case 'S':
-@@ -1467,6 +1861,11 @@
+@@ -1470,6 +1808,11 @@
case 'u':
case 'X':
case 'x':
ADDUARG();
break;
default: /* "%?" prints ?, unless ? is NUL */
-@@ -1552,6 +1951,12 @@
+@@ -1555,6 +1898,12 @@
(*argtable) [n].longdoublearg = va_arg (ap, long double);
break;
#endif
projects / apple / libc.git / blobdiff