Loading...
--- Libc/Libc-763.11/stdio/FreeBSD/vfprintf.c.patch
+++ Libc/Libc-320/stdio/FreeBSD/vfprintf.c.patch
@@ -1,205 +1,133 @@
---- vfprintf.c.orig 2010-11-22 22:37:24.000000000 -0800
-+++ vfprintf.c 2010-11-22 22:38:38.000000000 -0800
-@@ -36,6 +36,8 @@ static char sccsid[] = "@(#)vfprintf.c 8
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.90 2009/02/28 06:06:57 das Exp $");
-
-+#include "xlocale_private.h"
-+
+--- vfprintf.c.orig Thu Jul 24 12:42:14 2003
++++ vfprintf.c Sun Aug 24 16:21:44 2003
+@@ -66,9 +66,20 @@
+ #include "local.h"
+ #include "fvwrite.h"
+
++#ifdef ALTIVEC
++#include <machine/cpu_capabilities.h>
++
++#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 +99,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 +107,16 @@
+ #endif
+ wint_t wintarg;
+ wchar_t *pwchararg;
++#ifdef ALTIVEC
++ VECTORTYPE vectorarg;
++ unsigned char vuchararg[16];
++ signed char vchararg[16];
++ unsigned short vushortarg[8];
++ signed short vshortarg[8];
++ unsigned int vuintarg[4];
++ signed int vintarg[4];
++ float vfloatarg[4];
++#endif /* ALTIVEC */
+ };
+
/*
- * Actual printf innards.
- *
-@@ -54,7 +56,10 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
- #include <stdlib.h>
- #include <string.h>
- #include <wchar.h>
-+#if 0 // xprintf pending API review
- #include <printf.h>
-+#endif
-+#include <errno.h>
-
- #include <stdarg.h>
- #include "un-namespace.h"
-@@ -64,10 +69,11 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/v
- #include "fvwrite.h"
- #include "printflocal.h"
-
--static int __sprint(FILE *, struct __suio *);
--static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 0)
-- __noinline;
--static char *__wcsconv(wchar_t *, int);
-+static int __sprint(FILE *, locale_t, struct __suio *);
-+static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0);
-+static char *__wcsconv(wchar_t *, int, locale_t);
-+
-+__private_extern__ const char *__fix_nogrouping(const char *);
-
- #define CHAR char
- #include "printfcommon.h"
-@@ -87,12 +93,12 @@ struct grouping_state {
- * of bytes that will be needed.
- */
- static int
--grouping_init(struct grouping_state *gs, int ndigits)
-+grouping_init(struct grouping_state *gs, int ndigits, locale_t loc)
- {
- struct lconv *locale;
-
-- locale = localeconv();
-- gs->grouping = locale->grouping;
-+ locale = localeconv_l(loc);
-+ gs->grouping = __fix_nogrouping(locale->grouping);
- gs->thousands_sep = locale->thousands_sep;
- gs->thousep_len = strlen(gs->thousands_sep);
-
-@@ -116,11 +122,11 @@ grouping_init(struct grouping_state *gs,
- */
- static int
- grouping_print(struct grouping_state *gs, struct io_state *iop,
-- const CHAR *cp, const CHAR *ep)
-+ const CHAR *cp, const CHAR *ep, locale_t loc)
- {
- const CHAR *cp0 = cp;
-
-- if (io_printandpad(iop, cp, ep, gs->lead, zeroes))
-+ if (io_printandpad(iop, cp, ep, gs->lead, zeroes, loc))
- return (-1);
- cp += gs->lead;
- while (gs->nseps > 0 || gs->nrepeats > 0) {
-@@ -130,9 +136,9 @@ grouping_print(struct grouping_state *gs
- gs->grouping--;
- gs->nseps--;
- }
-- if (io_print(iop, gs->thousands_sep, gs->thousep_len))
-+ if (io_print(iop, gs->thousands_sep, gs->thousep_len, loc))
- return (-1);
-- if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes))
-+ if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes, loc))
- return (-1);
- cp += *gs->grouping;
- }
-@@ -146,7 +152,7 @@ grouping_print(struct grouping_state *gs
+@@ -106,7 +127,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,
++#ifdef ALTIVEC
++ T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR, T_VECTOR
++#else /* ! ALTIVEC */
+ T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
++#endif /* ALTIVEC */
+ };
+
+ static int __sprint(FILE *, struct __suio *);
+@@ -119,6 +144,37 @@
+ static void __find_arguments(const char *, va_list, union arg **);
+ static void __grow_type_table(int, enum typeid **, int *);
+
++ /*
++ * Get the argument indexed by nextarg. If the argument table is
++ * built, use it to get the argument. If its not, get the next
++ * argument (and arguments must be gotten sequentially).
++ */
++#define GETARG(type) \
++ ((argtable != NULL) ? *((type*)(&argtable[nextarg++])) : \
++ (nextarg++, va_arg(ap, type)))
++
++#ifdef ALTIVEC
++#define hasAltivec (_cpu_capabilities & kHasAltivec)
++/*-----------------------------------------------------------------------
++ * getvec() must be a real subroutine. If it is a #define, then __vfprintf()
++ * would have its calling sequence changed by Altivec so that a non-Altivec
++ * processor would crash on illegal instruction. By isolating the calling
++ * sequence in getvec(), __vprintf() is callable by a non-Altivec processor.
++ *-----------------------------------------------------------------------*/
++static va_list
++getvec(union arg *dst, const union arg *argtable, int nextarg, va_list ap)
++{
++ dst->vectorarg = GETARG(VECTORTYPE);
++ return ap;
++}
++
++#define SETVEC(dst) \
++{ \
++ ap = getvec(&dst, argtable, nextarg, ap); \
++ nextarg++; \
++}
++#endif /* ALTIVEC */
++
+ /*
+ * Flush out all the vectors defined by the given uio,
* then reset it so that it can be reused.
- */
- static int
--__sprint(FILE *fp, struct __suio *uio)
-+__sprint(FILE *fp, locale_t loc __unused, struct __suio *uio)
- {
- int err;
-
-@@ -166,11 +172,14 @@ __sprint(FILE *fp, struct __suio *uio)
- * worries about ungetc buffers and so forth.
- */
- static int
--__sbprintf(FILE *fp, const char *fmt, va_list ap)
-+__sbprintf(FILE *fp, locale_t loc, const char *fmt, va_list ap)
- {
- int ret;
- FILE fake;
- unsigned char buf[BUFSIZ];
-+ struct __sFILEX ext;
-+ fake._extra = &ext;
-+ INITEXTRA(&fake);
-
- /* XXX This is probably not needed. */
- if (prepwrite(fp) != 0)
-@@ -190,7 +199,7 @@ __sbprintf(FILE *fp, const char *fmt, va
- fake._lbfsize = 0; /* not actually used, but Just In Case */
-
- /* do the work, then copy any error status */
-- ret = __vfprintf(&fake, fmt, ap);
-+ ret = __vfprintf(&fake, loc, fmt, ap);
- if (ret >= 0 && __fflush(&fake))
- ret = EOF;
- if (fake._flags & __SERR)
-@@ -205,7 +214,7 @@ __sbprintf(FILE *fp, const char *fmt, va
- * string ends is null-terminated.
- */
- static char *
--__wcsconv(wchar_t *wcsarg, int prec)
-+__wcsconv(wchar_t *wcsarg, int prec, locale_t loc)
- {
- static const mbstate_t initial;
- mbstate_t mbs;
-@@ -218,7 +227,7 @@ __wcsconv(wchar_t *wcsarg, int prec)
- if (prec < 0) {
- p = wcsarg;
- mbs = initial;
-- nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
-+ nbytes = wcsrtombs_l(NULL, (const wchar_t **)&p, 0, &mbs, loc);
- if (nbytes == (size_t)-1)
- return (NULL);
- } else {
-@@ -234,7 +243,7 @@ __wcsconv(wchar_t *wcsarg, int prec)
- p = wcsarg;
- mbs = initial;
- for (;;) {
-- clen = wcrtomb(buf, *p++, &mbs);
-+ clen = wcrtomb_l(buf, *p++, &mbs, loc);
- if (clen == 0 || clen == (size_t)-1 ||
- nbytes + clen > prec)
- break;
-@@ -248,8 +257,8 @@ __wcsconv(wchar_t *wcsarg, int prec)
- /* Fill the output buffer. */
- p = wcsarg;
- mbs = initial;
-- if ((nbytes = wcsrtombs(convbuf, (const wchar_t **)&p,
-- nbytes, &mbs)) == (size_t)-1) {
-+ if ((nbytes = wcsrtombs_l(convbuf, (const wchar_t **)&p,
-+ nbytes, &mbs, loc)) == (size_t)-1) {
- free(convbuf);
- return (NULL);
- }
-@@ -261,22 +270,30 @@ __wcsconv(wchar_t *wcsarg, int prec)
- * MT-safe version
- */
- int
--vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-+vfprintf_l(FILE * __restrict fp, locale_t loc, const char * __restrict fmt0, va_list ap)
-
- {
- int ret;
-
-+ NORMALIZE_LOCALE(loc);
- FLOCKFILE(fp);
- /* optimise fprintf(stderr) (and other unbuffered Unix files) */
- if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
- fp->_file >= 0)
-- ret = __sbprintf(fp, fmt0, ap);
-+ ret = __sbprintf(fp, loc, fmt0, ap);
- else
-- ret = __vfprintf(fp, fmt0, ap);
-+ ret = __vfprintf(fp, loc, fmt0, ap);
- FUNLOCKFILE(fp);
- return (ret);
- }
-
-+int
-+vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-+
-+{
-+ return vfprintf_l(fp, __current_locale(), fmt0, ap);
-+}
+@@ -424,6 +480,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. We need enough space to
-@@ -291,8 +308,8 @@ vfprintf(FILE * __restrict fp, const cha
+ * conversions, among other things. Technically, we would need the
+@@ -452,6 +517,9 @@
+ #define PTRDIFFT 0x800 /* ptrdiff_t */
+ #define INTMAXT 0x1000 /* intmax_t */
+ #define CHARINT 0x2000 /* print char using int format */
++#ifdef ALTIVEC
++#define VECTOR 0x4000 /* Altivec vector */
++#endif /* ALTIVEC */
+
/*
* Non-MT-safe version
- */
--int
--__vfprintf(FILE *fp, const char *fmt0, va_list ap)
-+__private_extern__ int
-+__vfprintf(FILE *fp, locale_t loc, const char *fmt0, va_list ap)
- {
- char *fmt; /* format string */
- int ch; /* character from fmt */
-@@ -335,6 +352,11 @@ __vfprintf(FILE *fp, const char *fmt0, v
- char expstr[MAXEXPDIG+2]; /* buffer for exponent string: e+ZZZ */
- char *dtoaresult; /* buffer allocated by dtoa */
+@@ -503,6 +571,11 @@
+ int nseps; /* number of group separators with ' */
+ int nrepeats; /* number of repeats of the last group */
#endif
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ union arg vval; /* Vector argument. */
+ char *pct; /* Pointer to '%' at beginning of specifier. */
+ char vsep; /* Vector separator character. */
@@ -207,357 +135,303 @@
u_long ulval; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */
-@@ -357,19 +379,19 @@ __vfprintf(FILE *fp, const char *fmt0, v
-
- /* BEWARE, these `goto error' on error. */
- #define PRINT(ptr, len) { \
-- if (io_print(&io, (ptr), (len))) \
-+ if (io_print(&io, (ptr), (len), loc)) \
- goto error; \
+@@ -535,6 +608,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 +654,6 @@
}
- #define PAD(howmany, with) { \
-- if (io_pad(&io, (howmany), (with))) \
-+ if (io_pad(&io, (howmany), (with), loc)) \
- goto error; \
- }
- #define PRINTANDPAD(p, ep, len, with) { \
-- if (io_printandpad(&io, (p), (ep), (len), (with))) \
-+ if (io_printandpad(&io, (p), (ep), (len), (with), loc)) \
- goto error; \
- }
- #define FLUSH() { \
-- if (io_flush(&io)) \
-+ if (io_flush(&io, loc)) \
- goto error; \
- }
-
-@@ -405,7 +427,7 @@ __vfprintf(FILE *fp, const char *fmt0, v
- #define UJARG() \
- (flags&INTMAXT ? GETARG(uintmax_t) : \
- flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-- flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-+ flags&PTRDIFFT ? (uintmax_t)(unsigned long)GETARG(ptrdiff_t) : \
- (uintmax_t)GETARG(unsigned long long))
/*
-@@ -436,14 +458,19 @@ __vfprintf(FILE *fp, const char *fmt0, v
+- * Get the argument indexed by nextarg. If the argument table is
+- * built, use it to get the argument. If its not, get the next
+- * argument (and arguments must be gotten sequentially).
+- */
+-#define GETARG(type) \
+- ((argtable != NULL) ? *((type*)(&argtable[nextarg++])) : \
+- (nextarg++, va_arg(ap, type)))
+-
+- /*
+ * To extend shorts properly, we need both signed and unsigned
+ * argument extraction methods.
+ */
+@@ -634,7 +704,6 @@
val = GETARG (int); \
}
-+#if 0 // xprintf pending API review
- if (__use_xprintf == 0 && getenv("USE_XPRINTF"))
- __use_xprintf = 1;
- if (__use_xprintf > 0)
-- return (__xvprintf(fp, fmt0, ap));
-+ return (__xvprintf(fp, loc, fmt0, ap));
-+#endif
-
- /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-- if (prepwrite(fp) != 0)
-+ if (prepwrite(fp) != 0) {
-+ errno = EBADF;
- return (EOF);
-+ }
-+ ORIENT(fp, -1);
-
+-
+ thousands_sep = '\0';
+ grouping = NULL;
convbuf = NULL;
- fmt = (char *)fmt0;
-@@ -454,7 +481,7 @@ __vfprintf(FILE *fp, const char *fmt0, v
- ret = 0;
- #ifndef NO_FLOATING_POINT
- dtoaresult = NULL;
-- decimal_point = localeconv()->decimal_point;
-+ decimal_point = localeconv_l(loc)->decimal_point;
- /* The overwhelmingly common case is decpt_len == 1. */
- decpt_len = (decimal_point[1] == '\0' ? 1 : strlen(decimal_point));
- #endif
-@@ -475,6 +502,9 @@ __vfprintf(FILE *fp, const char *fmt0, v
+@@ -676,6 +745,9 @@
}
if (ch == '\0')
goto done;
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ pct = fmt;
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
fmt++; /* skip over '%' */
flags = 0;
-@@ -484,6 +514,9 @@ __vfprintf(FILE *fp, const char *fmt0, v
- gs.grouping = NULL;
+@@ -684,6 +756,9 @@
+ prec = -1;
sign = '\0';
ox[1] = '\0';
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ vsep = 'X'; /* Illegal value, changed to defaults later. */
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
rflag: ch = *fmt++;
reswitch: switch (ch) {
-@@ -499,6 +532,11 @@ reswitch: switch (ch) {
+@@ -699,6 +774,11 @@
case '#':
flags |= ALT;
goto rflag;
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ case ',': case ';': case ':': case '_':
+ vsep = ch;
+ goto rflag;
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
case '*':
/*-
* ``A negative field width argument is taken as a
-@@ -595,14 +633,18 @@ reswitch: switch (ch) {
- flags |= LONGINT;
- /*FALLTHROUGH*/
- case 'c':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ break;
-+#endif /* VECTORS */
- if (flags & LONGINT) {
- static const mbstate_t initial;
- mbstate_t mbs;
- size_t mbseqlen;
-
- mbs = initial;
-- mbseqlen = wcrtomb(cp = buf,
-- (wchar_t)GETARG(wint_t), &mbs);
-+ mbseqlen = wcrtomb_l(cp = buf,
-+ (wchar_t)GETARG(wint_t), &mbs, loc);
- if (mbseqlen == (size_t)-1) {
- fp->_flags |= __SERR;
- goto error;
-@@ -619,6 +661,10 @@ reswitch: switch (ch) {
+@@ -807,6 +887,12 @@
+ }
+ size = (int)mbseqlen;
+ } else {
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
+ *(cp = buf) = GETARG(int);
+ size = 1;
+ }
+@@ -817,6 +903,12 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ break;
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ } else
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE) {
ujval = SJARG();
if ((intmax_t)ujval < 0) {
-@@ -637,6 +683,12 @@ reswitch: switch (ch) {
- #ifndef NO_FLOATING_POINT
+@@ -836,6 +928,13 @@
+ #ifdef HEXFLOAT
case 'a':
case 'A':
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ flags |= FPT;
-+ break;
-+ }
-+#endif /* VECTORS */
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
if (ch == 'a') {
ox[1] = 'x';
xdigs = xdigs_lower;
-@@ -650,6 +702,12 @@ reswitch: switch (ch) {
- prec++;
- if (dtoaresult != NULL)
- freedtoa(dtoaresult);
-+#ifdef LDBL_COMPAT
-+ fparg.dbl = GETARG(double);
-+ dtoaresult = cp =
-+ __hdtoa(fparg.dbl, xdigs, prec,
-+ &expt, &signflag, &dtoaend);
-+#else /* !LDBL_COMPAT */
+@@ -845,25 +944,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 = GETARG(long double);
- dtoaresult = cp =
-@@ -661,6 +719,7 @@ reswitch: switch (ch) {
- __hdtoa(fparg.dbl, xdigs, prec,
+- 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);
}
-+#endif /* LDBL_COMPAT */
- if (prec < 0)
- prec = dtoaend - cp;
- if (expt == INT_MAX)
-@@ -668,6 +727,12 @@ reswitch: switch (ch) {
- goto fp_common;
+- goto fp_begin;
++ prec++;
++ if (expt == INT_MAX)
++ ox[1] = 0;
++ else
++ expt++;
++ goto hex_begin;
+ #endif
case 'e':
case 'E':
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ flags |= FPT;
-+ break;
-+ }
-+#endif /* VECTORS */
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
expchar = ch;
if (prec < 0) /* account for digit before decpt */
prec = DEFPREC + 1;
-@@ -676,10 +741,22 @@ reswitch: switch (ch) {
+@@ -872,10 +997,24 @@
goto fp_begin;
case 'f':
case 'F':
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ flags |= FPT;
-+ break;
-+ }
-+#endif /* VECTORS */
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
expchar = '\0';
goto fp_begin;
case 'g':
case 'G':
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ flags |= FPT;
-+ break;
-+ }
-+#endif /* VECTORS */
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
expchar = ch - ('g' - 'e');
if (prec == 0)
prec = 1;
-@@ -688,6 +765,14 @@ fp_begin:
+@@ -884,6 +1023,17 @@
prec = DEFPREC;
if (dtoaresult != NULL)
freedtoa(dtoaresult);
-+#ifdef LDBL_COMPAT
-+ fparg.dbl = GETARG(double);
++#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 /* !LDBL_COMPAT */
++#else /* ! __TYPE_LONGDOUBLE_IS_DOUBLE */
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult = cp =
-@@ -701,6 +786,7 @@ fp_begin:
+@@ -897,6 +1047,10 @@
if (expt == 9999)
expt = INT_MAX;
}
-+#endif /* LDBL_COMPAT */
- fp_common:
++#endif /* __TYPE_LONGDOUBLE_IS_DOUBLE */
++#ifdef HEXFLOAT
++hex_begin:
++#endif /* HEXFLOAT */
if (signflag)
sign = '-';
-@@ -750,37 +836,46 @@ fp_common:
- if (prec || flags & ALT)
- size += prec + decpt_len;
- if ((flags & GROUPING) && expt > 0)
-- size += grouping_init(&gs, expt);
-+ size += grouping_init(&gs, expt, loc);
- }
- break;
- #endif /* !NO_FLOATING_POINT */
- case 'n':
-+ {
- /*
- * Assignment-like behavior is specified if the
- * value overflows or is otherwise unrepresentable.
- * C99 says to use `signed char' for %hhn conversions.
- */
-- if (flags & LLONGINT)
-- *GETARG(long long *) = ret;
-+ void *ptr = GETARG(void *);
-+ if (ptr == NULL)
-+ continue;
-+ else if (flags & LLONGINT)
-+ *(long long *)ptr = ret;
- else if (flags & SIZET)
-- *GETARG(ssize_t *) = (ssize_t)ret;
-+ *(ssize_t *)ptr = (ssize_t)ret;
- else if (flags & PTRDIFFT)
-- *GETARG(ptrdiff_t *) = ret;
-+ *(ptrdiff_t *)ptr = ret;
- else if (flags & INTMAXT)
-- *GETARG(intmax_t *) = ret;
-+ *(intmax_t *)ptr = ret;
- else if (flags & LONGINT)
-- *GETARG(long *) = ret;
-+ *(long *)ptr = ret;
- else if (flags & SHORTINT)
-- *GETARG(short *) = ret;
-+ *(short *)ptr = ret;
- else if (flags & CHARINT)
-- *GETARG(signed char *) = ret;
-+ *(signed char *)ptr = ret;
- else
-- *GETARG(int *) = ret;
-+ *(int *)ptr = ret;
- continue; /* no output */
-+ }
- case 'O':
+ if (expt == INT_MAX) { /* inf or nan */
+@@ -990,6 +1144,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ break;
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ } else
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -795,6 +890,10 @@ fp_common:
+@@ -1004,6 +1164,12 @@
* defined manner.''
* -- ANSI X3J11
*/
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ break;
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ }
++#endif /* ALTIVEC */
ujval = (uintmax_t)(uintptr_t)GETARG(void *);
base = 16;
xdigs = xdigs_lower;
-@@ -813,7 +912,7 @@ fp_common:
- if ((wcp = GETARG(wchar_t *)) == NULL)
- cp = "(null)";
- else {
-- convbuf = __wcsconv(wcp, prec);
-+ convbuf = __wcsconv(wcp, prec, loc);
- if (convbuf == NULL) {
- fp->_flags |= __SERR;
- goto error;
-@@ -829,6 +928,10 @@ fp_common:
+@@ -1053,6 +1219,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'u':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ break;
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ } else
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -841,6 +944,10 @@ fp_common:
+@@ -1065,6 +1237,12 @@
case 'x':
xdigs = xdigs_lower;
hex:
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ break;
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
++ break;
++ } else
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -858,6 +965,7 @@ nosign: sign = '\0';
- * ``... diouXx conversions ... if a precision is
- * specified, the 0 flag will be ignored.''
- * -- ANSI X3J11
-+ * except for %#.0o and zero value
- */
- number: if ((dprec = prec) >= 0)
- flags &= ~ZEROPAD;
-@@ -885,10 +993,15 @@ number: if ((dprec = prec) >= 0)
- }
- size = buf + BUF - cp;
+@@ -1109,6 +1287,14 @@
if (size > BUF) /* should never happen */
-- abort();
-+ LIBC_ABORT("size (%d) > BUF (%d)", size, BUF);
- if ((flags & GROUPING) && size != 0)
-- size += grouping_init(&gs, size);
-+ size += grouping_init(&gs, size, loc);
- break;
-+#ifdef VECTORS
+ abort();
+ break;
++#ifdef ALTIVEC
+ case 'v':
-+ flags |= VECTOR;
-+ goto rflag;
-+#endif /* VECTORS */
++ if (hasAltivec) {
++ flags |= VECTOR;
++ goto rflag;
++ }
++ /* drap through */
++#endif /* ALTIVEC */
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
-@@ -900,6 +1013,290 @@ number: if ((dprec = prec) >= 0)
+@@ -1120,6 +1306,186 @@
break;
}
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ /*
+ * Do the minimum amount of work necessary to construct
@@ -567,32 +441,24 @@
+ int i, j; /* Counter. */
+ int vcnt; /* Number of elements in vector. */
+ char *vfmt; /* Pointer to format specifier. */
-+#define EXTRAHH 2
-+ char vfmt_buf[32 + EXTRAHH]; /* Static buffer for format spec. */
++ char vfmt_buf[32]; /* Static buffer for format spec. */
+ int vwidth = 0; /* Width specified via '*'. */
+ int vprec = 0; /* Precision specified via '*'. */
++ union { /* Element. */
++ int i;
++ float f;
++ } velm;
+ char *vstr; /* Used for asprintf(). */
+ int vlen; /* Length returned by asprintf(). */
-+ enum {
-+ V_CHAR, V_SHORT, V_INT,
-+ V_PCHAR, V_PSHORT, V_PINT,
-+ V_FLOAT,
-+#ifdef V64TYPE
-+ V_LONGLONG, V_PLONGLONG,
-+ V_DOUBLE,
-+#endif /* V64TYPE */
-+ } vtype;
-+
-+ vval.vectorarg = GETARG(VECTORTYPE);
++
+ /*
+ * Set vfmt. If vfmt_buf may not be big enough,
+ * malloc() space, taking care to free it later.
-+ * (EXTRAHH is for possible extra "hh")
+ */
-+ if (&fmt[-1] - pct + EXTRAHH < sizeof(vfmt_buf))
++ if (&fmt[-1] - pct < sizeof(vfmt_buf))
+ vfmt = vfmt_buf;
+ else
-+ vfmt = (char *)malloc(&fmt[-1] - pct + EXTRAHH + 1);
++ vfmt = (char *)malloc(&fmt[-1] - pct + 1);
+
+ /* Set the separator character, if not specified. */
+ if (vsep == 'X') {
@@ -625,57 +491,11 @@
+ * finish up the format specifier.
+ */
+ if (flags & SHORTINT) {
-+ switch (ch) {
-+ case 'c':
-+ vtype = V_SHORT;
-+ break;
-+ case 'p':
-+ vtype = V_PSHORT;
-+ break;
-+ default:
-+ vfmt[j++] = 'h';
-+ vtype = V_SHORT;
-+ break;
-+ }
++ vfmt[j++] = 'h';
+ vcnt = 8;
+ } else if (flags & LONGINT) {
++ vfmt[j++] = 'l';
+ vcnt = 4;
-+ vtype = (ch == 'p') ? V_PINT : V_INT;
-+#ifdef V64TYPE
-+ } else if (flags & LLONGINT) {
-+ switch (ch) {
-+ case 'a':
-+ case 'A':
-+ case 'e':
-+ case 'E':
-+ case 'f':
-+ case 'g':
-+ case 'G':
-+ vcnt = 2;
-+ vtype = V_DOUBLE;
-+ break;
-+ case 'd':
-+ case 'i':
-+ case 'u':
-+ case 'o':
-+ case 'p':
-+ case 'x':
-+ case 'X':
-+ vfmt[j++] = 'l';
-+ vfmt[j++] = 'l';
-+ vcnt = 2;
-+ vtype = (ch == 'p') ? V_PLONGLONG : V_LONGLONG;
-+ break;
-+ default:
-+ /*
-+ * The default case should never
-+ * happen.
-+ */
-+ case 'c':
-+ vcnt = 16;
-+ vtype = V_CHAR;
-+ }
-+#endif /* V64TYPE */
+ } else {
+ switch (ch) {
+ case 'a':
@@ -686,150 +506,100 @@
+ case 'g':
+ case 'G':
+ vcnt = 4;
-+ vtype = V_FLOAT;
+ break;
+ default:
+ /*
+ * The default case should never
+ * happen.
+ */
++ case 'c':
+ case 'd':
+ case 'i':
+ case 'u':
+ case 'o':
++ case 'p':
+ case 'x':
+ case 'X':
-+ vfmt[j++] = 'h';
-+ vfmt[j++] = 'h';
-+ /* drop through */
-+ case 'p':
-+ case 'c':
+ vcnt = 16;
-+ vtype = (ch == 'p') ? V_PCHAR : V_CHAR;
+ }
+ }
+ vfmt[j++] = ch;
+ vfmt[j++] = '\0';
+
+/* Get a vector element. */
-+#ifdef V64TYPE
-+#define VPRINT(type, ind, args...) do { \
-+ switch (type) { \
-+ case V_CHAR: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuchararg[ind]); \
-+ break; \
-+ case V_PCHAR: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuchararg[ind]); \
-+ break; \
-+ case V_SHORT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vushortarg[ind]); \
-+ break; \
-+ case V_PSHORT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vushortarg[ind]); \
-+ break; \
-+ case V_INT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuintarg[ind]); \
-+ break; \
-+ case V_PINT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuintarg[ind]); \
-+ break; \
-+ case V_LONGLONG: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vulonglongarg[ind]); \
-+ break; \
-+ case V_PLONGLONG: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vulonglongarg[ind]); \
-+ break; \
-+ case V_FLOAT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
-+ break; \
-+ case V_DOUBLE: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vdoublearg[ind]); \
-+ break; \
++#define VPRINT(cnt, ind, args...) do { \
++ if (flags & FPT) { \
++ velm.f = vval.vfloatarg[ind]; \
++ vlen = asprintf(&vstr, vfmt , ## args, velm.f); \
++ } else { \
++ switch (cnt) { \
++ default: \
++ /* The default case should never happen. */ \
++ case 4: \
++ velm.i = (unsigned)vval.vintarg[ind]; \
++ break; \
++ case 8: \
++ velm.i = (unsigned short)vval.vshortarg[ind]; \
++ break; \
++ case 16: \
++ velm.i = (unsigned char)vval.vchararg[ind]; \
++ break; \
++ } \
++ vlen = asprintf(&vstr, vfmt , ## args, velm.i); \
+ } \
+ ret += vlen; \
+ PRINT(vstr, vlen); \
+ FLUSH(); \
+ free(vstr); \
+} while (0)
-+#else /* !V64TYPE */
-+#define VPRINT(type, ind, args...) do { \
-+ switch (type) { \
-+ case V_CHAR: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuchararg[ind]); \
-+ break; \
-+ case V_PCHAR: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuchararg[ind]); \
-+ break; \
-+ case V_SHORT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vushortarg[ind]); \
-+ break; \
-+ case V_PSHORT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vushortarg[ind]); \
-+ break; \
-+ case V_INT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vuintarg[ind]); \
-+ break; \
-+ case V_PINT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, (void *)(uintptr_t)vval.vuintarg[ind]); \
-+ break; \
-+ case V_FLOAT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
-+ break; \
-+ } \
-+ ret += vlen; \
-+ PRINT(vstr, vlen); \
-+ FLUSH(); \
-+ free(vstr); \
-+} while (0)
-+#endif /* V64TYPE */
+
+ /* Actually print. */
+ if (vwidth == 0) {
+ if (vprec == 0) {
+ /* First element. */
-+ VPRINT(vtype, 0);
++ VPRINT(vcnt, 0);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if(vsep)
++ if (vsep)
+ PRINT(&vsep, 1);
+
+ /* Element. */
-+ VPRINT(vtype, i);
++ VPRINT(vcnt, i);
+ }
+ } else {
+ /* First element. */
-+ VPRINT(vtype, 0, prec);
++ VPRINT(vcnt, 0, prec);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if(vsep)
++ if (vsep)
+ PRINT(&vsep, 1);
+
+ /* Element. */
-+ VPRINT(vtype, i, prec);
++ VPRINT(vcnt, i, prec);
+ }
+ }
+ } else {
+ if (vprec == 0) {
+ /* First element. */
-+ VPRINT(vtype, 0, width);
++ VPRINT(vcnt, 0, width);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if(vsep)
++ if (vsep)
+ PRINT(&vsep, 1);
+
+ /* Element. */
-+ VPRINT(vtype, i, width);
++ VPRINT(vcnt, i, width);
+ }
+ } else {
+ /* First element. */
-+ VPRINT(vtype, 0, width, prec);
++ VPRINT(vcnt, 0, width, prec);
+ for (i = 1; i < vcnt; i++) {
+ /* Separator. */
-+ if(vsep)
++ if (vsep)
+ PRINT(&vsep, 1);
+
+ /* Element. */
-+ VPRINT(vtype, i, width, prec);
++ VPRINT(vcnt, i, width, prec);
+ }
+ }
+ }
@@ -840,25 +610,109 @@
+
+ continue;
+ }
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
/*
* All reasonable formats wind up here. At this point, `cp'
* points to a string which (if not flags&LADJUST) should be
-@@ -950,7 +1347,7 @@ number: if ((dprec = prec) >= 0)
- /* leading zeroes from decimal precision */
- PAD(dprec - size, zeroes);
- if (gs.grouping) {
-- if (grouping_print(&gs, &io, cp, buf+BUF) < 0)
-+ if (grouping_print(&gs, &io, cp, buf+BUF, loc) < 0)
- goto error;
- } else {
- PRINT(cp, size);
-@@ -968,7 +1365,7 @@ number: if ((dprec = prec) >= 0)
- } else {
- if (gs.grouping) {
- n = grouping_print(&gs, &io,
-- cp, dtoaend);
-+ cp, dtoaend, loc);
- if (n < 0)
- goto error;
- cp += n;
+@@ -1137,7 +1503,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 +1517,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 +1766,11 @@
+ if (flags & LONGINT)
+ ADDTYPE(T_WINT);
+ else
++#ifdef ALTIVEC
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* ALTIVEC */
+ ADDTYPE(T_INT);
+ break;
+ case 'D':
+@@ -1407,6 +1778,11 @@
+ /*FALLTHROUGH*/
+ case 'd':
+ case 'i':
++#ifdef ALTIVEC
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif
+ ADDSARG();
+ break;
+ #ifdef FLOATING_POINT
+@@ -1419,6 +1795,11 @@
+ case 'f':
+ case 'g':
+ case 'G':
++#ifdef ALTIVEC
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* ALTIVEC */
+ if (flags & LONGDBL)
+ ADDTYPE(T_LONG_DOUBLE);
+ else
+@@ -1447,9 +1828,19 @@
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'o':
++#ifdef ALTIVEC
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* ALTIVEC */
+ ADDUARG();
+ break;
+ case 'p':
++#ifdef ALTIVEC
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* ALTIVEC */
+ ADDTYPE(TP_VOID);
+ break;
+ case 'S':
+@@ -1467,6 +1858,11 @@
+ case 'u':
+ case 'X':
+ case 'x':
++#ifdef ALTIVEC
++ if (flags & VECTOR)
++ ADDTYPE(T_VECTOR);
++ else
++#endif /* ALTIVEC */
+ ADDUARG();
+ break;
+ default: /* "%?" prints ?, unless ? is NUL */
+@@ -1552,6 +1948,12 @@
+ (*argtable) [n].longdoublearg = va_arg (ap, long double);
+ break;
+ #endif
++#ifdef ALTIVEC
++ case T_VECTOR:
++ if (hasAltivec)
++ ap = getvec( &((*argtable) [n]), NULL, 0, ap );
++ break;
++#endif /* ALTIVEC */
+ case TP_CHAR:
+ (*argtable) [n].pchararg = va_arg (ap, char *);
+ break;