Loading...
--- Libc/Libc-498/stdio/FreeBSD/vfwprintf.c.patch
+++ Libc/Libc-391.2.7/stdio/FreeBSD/vfwprintf.c.patch
@@ -1,5 +1,5 @@
---- vfwprintf.c.orig 2006-10-01 00:03:16.000000000 -0700
-+++ vfwprintf.c 2006-10-01 00:21:40.000000000 -0700
+--- vfwprintf.c.orig 2004-11-25 11:38:36.000000000 -0800
++++ vfwprintf.c 2005-02-24 15:17:14.000000000 -0800
@@ -42,6 +42,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.23 2004/08/26 06:25:28 des Exp $");
@@ -9,7 +9,7 @@
/*
* Actual wprintf innards.
*
-@@ -63,12 +65,20 @@
+@@ -63,12 +65,19 @@
#include <string.h>
#include <wchar.h>
#include <wctype.h>
@@ -20,21 +20,20 @@
#include "local.h"
#include "fvwrite.h"
-+#ifdef VECTORS
-+typedef __attribute__ ((vector_size(16))) unsigned char VECTORTYPE;
-+#ifdef __SSE2__
-+#define V64TYPE
-+#endif /* __SSE2__ */
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++#include <machine/cpu_capabilities.h>
++
++#define VECTORTYPE vector unsigned char
++#endif /* ALTIVEC */
+
union arg {
int intarg;
u_int uintarg;
-@@ -96,6 +106,21 @@
+@@ -96,6 +105,16 @@
#endif
wint_t wintarg;
wchar_t *pwchararg;
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ VECTORTYPE vectorarg;
+ unsigned char vuchararg[16];
+ signed char vchararg[16];
@@ -43,24 +42,19 @@
+ unsigned int vuintarg[4];
+ signed int vintarg[4];
+ float vfloatarg[4];
-+#ifdef V64TYPE
-+ double vdoublearg[2];
-+ unsigned long long vulonglongarg[2];
-+ long long vlonglongarg[2];
-+#endif /* V64TYPE */
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
};
/*
-@@ -106,16 +131,20 @@
+@@ -106,26 +125,63 @@
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 VECTORS
++#ifdef ALTIVEC
+ T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR, T_VECTOR
-+#else /* ! VECTORS */
++#else /* ! ALTIVEC */
T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
};
-static int __sbprintf(FILE *, const wchar_t *, va_list);
@@ -76,7 +70,42 @@
static void __find_arguments(const wchar_t *, va_list, union arg **);
static void __grow_type_table(int, enum typeid **, int *);
-@@ -125,7 +154,7 @@
++ /*
++ * 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 *, const union arg *, int, va_list) __attribute__((noinline));
++
++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 */
++
+ /*
+ * Helper function for `fprintf to unbuffered unix file': creates a
+ * temporary buffer. We only work on write-only files; this avoids
* worries about ungetc buffers and so forth.
*/
static int
@@ -85,7 +114,7 @@
{
int ret;
FILE fake;
-@@ -144,7 +173,7 @@
+@@ -144,7 +200,7 @@
fake._lbfsize = 0; /* not actually used, but Just In Case */
/* do the work, then copy any error status */
@@ -94,7 +123,7 @@
if (ret >= 0 && __fflush(&fake))
ret = WEOF;
if (fake._flags & __SERR)
-@@ -157,7 +186,7 @@
+@@ -157,7 +213,7 @@
* File must already be locked.
*/
static wint_t
@@ -103,7 +132,7 @@
{
static const mbstate_t initial;
mbstate_t mbs;
-@@ -167,10 +196,10 @@
+@@ -167,10 +223,10 @@
size_t len;
if ((fp->_flags & __SSTR) == 0)
@@ -116,7 +145,7 @@
fp->_flags |= __SERR;
return (WEOF);
}
-@@ -350,13 +379,14 @@
+@@ -350,13 +406,14 @@
* that the multibyte char. string ends in a null character.
*/
static wchar_t *
@@ -127,13 +156,12 @@
mbstate_t mbs;
wchar_t *convbuf, *wcp;
const char *p;
-- size_t insize, nchars, nconv;
-+ size_t insize, nchars, nconv = 0;
+ size_t insize, nchars, nconv;
+ int mb_cur_max = MB_CUR_MAX_L(loc);
if (mbsarg == NULL)
return (NULL);
-@@ -374,7 +404,7 @@
+@@ -374,7 +431,7 @@
insize = nchars = 0;
mbs = initial;
while (nchars != (size_t)prec) {
@@ -142,7 +170,7 @@
if (nconv == 0 || nconv == (size_t)-1 ||
nconv == (size_t)-2)
break;
-@@ -399,7 +429,7 @@
+@@ -399,7 +456,7 @@
p = mbsarg;
mbs = initial;
while (insize != 0) {
@@ -151,16 +179,7 @@
if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2)
break;
wcp++;
-@@ -418,6 +448,8 @@
- /*
- * MT-safe version
- */
-+__private_extern__ const char *__fix_nogrouping(const char *);
-+
- int
- vfwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt0, va_list ap)
-
-@@ -425,7 +457,21 @@
+@@ -425,7 +482,21 @@
int ret;
FLOCKFILE(fp);
@@ -183,13 +202,13 @@
FUNLOCKFILE(fp);
return (ret);
}
-@@ -474,12 +520,15 @@
+@@ -474,12 +545,15 @@
#define PTRDIFFT 0x800 /* ptrdiff_t */
#define INTMAXT 0x1000 /* intmax_t */
#define CHARINT 0x2000 /* print char using int format */
-+#ifdef VECTORS
-+#define VECTOR 0x4000 /* Altivec or SSE vector */
-+#endif /* VECTORS */
++#ifdef ALTIVEC
++#define VECTOR 0x4000 /* Altivec vector */
++#endif /* ALTIVEC */
/*
* Non-MT-safe version
@@ -201,21 +220,11 @@
{
wchar_t *fmt; /* format string */
wchar_t ch; /* character from fmt */
-@@ -507,7 +556,8 @@
- * D: expchar holds this character; '\0' if no exponent, e.g. %f
- * F: at least two digits for decimal, at least one digit for hex
- */
-- char *decimal_point; /* locale specific decimal point */
-+ wchar_t decimal_point; /* locale specific decimal point */
-+ char *decimal_point_mb; /* multibyte decimal point */
- int signflag; /* true if float is negative */
- union { /* floating point arguments %[aAeEfFgG] */
- double dbl;
-@@ -524,6 +574,11 @@
+@@ -524,6 +598,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. */
+ wchar_t *pct; /* Pointer to '%' at beginning of specifier. */
+ wchar_t vsep; /* Vector separator character. */
@@ -223,7 +232,7 @@
u_long ulval; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */
-@@ -560,7 +615,7 @@
+@@ -560,7 +639,7 @@
*/
#define PRINT(ptr, len) do { \
for (n3 = 0; n3 < (len); n3++) \
@@ -232,16 +241,23 @@
} while (0)
#define PAD(howmany, with) do { \
if ((n = (howmany)) > 0) { \
-@@ -606,7 +661,7 @@
- #define INTMAX_SIZE (INTMAXT|SIZET|PTRDIFFT|LLONGINT)
- #define SJARG() \
- (flags&INTMAXT ? GETARG(intmax_t) : \
-- flags&SIZET ? (intmax_t)GETARG(size_t) : \
-+ flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
- flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
- (intmax_t)GETARG(long long))
- #define UJARG() \
-@@ -640,21 +695,24 @@
+@@ -581,15 +660,6 @@
+ } while(0)
+
+ /*
+- * 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.
+ */
+@@ -640,21 +710,22 @@
val = GETARG (int); \
}
@@ -250,8 +266,7 @@
grouping = NULL;
#ifndef NO_FLOATING_POINT
- decimal_point = localeconv()->decimal_point;
-+ decimal_point_mb = localeconv_l(loc)->decimal_point;
-+ mbtowc_l(&decimal_point, decimal_point_mb, strlen(decimal_point_mb), loc);
++ decimal_point = localeconv_l(loc)->decimal_point;
#endif
convbuf = NULL;
/* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */
@@ -260,7 +275,6 @@
+ errno = EBADF;
return (EOF);
+ }
-+ ORIENT(fp, 1);
/* optimise fprintf(stderr) (and other unbuffered Unix files) */
if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
@@ -270,57 +284,59 @@
fmt = (wchar_t *)fmt0;
argtable = NULL;
-@@ -678,6 +736,9 @@
+@@ -678,6 +749,9 @@
}
if (ch == '\0')
goto done;
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ pct = fmt;
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
fmt++; /* skip over '%' */
flags = 0;
-@@ -686,6 +747,9 @@
+@@ -686,6 +760,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) {
-@@ -701,6 +765,11 @@
+@@ -701,6 +778,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
-@@ -721,8 +790,8 @@
+@@ -721,8 +803,8 @@
goto rflag;
case '\'':
flags |= GROUPING;
- thousands_sep = *(localeconv()->thousands_sep);
- grouping = localeconv()->grouping;
+ thousands_sep = *(localeconv_l(loc)->thousands_sep);
-+ grouping = __fix_nogrouping(localeconv_l(loc)->grouping);
++ grouping = localeconv_l(loc)->grouping;
goto rflag;
case '.':
if ((ch = *fmt++) == '*') {
-@@ -796,10 +865,14 @@
+@@ -796,10 +878,16 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'c':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
+ break;
-+#endif /* VECTORS */
++ }
++#endif /* ALTIVEC */
if (flags & LONGINT)
*(cp = buf) = (wchar_t)GETARG(wint_t);
else
@@ -329,31 +345,20 @@
size = 1;
sign = '\0';
break;
-@@ -808,6 +881,10 @@
+@@ -808,6 +896,12 @@
/*FALLTHROUGH*/
case 'd':
case 'i':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
+ break;
-+#endif /* VECTORS */
++ }
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE) {
ujval = SJARG();
if ((intmax_t)ujval < 0) {
-@@ -826,6 +903,12 @@
- #ifndef NO_FLOATING_POINT
- case 'a':
- case 'A':
-+#ifdef VECTORS
-+ if (flags & VECTOR) {
-+ flags |= FPT;
-+ break;
-+ }
-+#endif /* VECTORS */
- if (ch == 'a') {
- ox[1] = 'x';
- xdigs = xdigs_lower;
-@@ -837,6 +920,12 @@
+@@ -837,6 +931,12 @@
}
if (prec >= 0)
prec++;
@@ -366,7 +371,7 @@
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult =
-@@ -848,6 +937,7 @@
+@@ -848,6 +948,7 @@
__hdtoa(fparg.dbl, xdigs, prec,
&expt, &signflag, &dtoaend);
}
@@ -374,7 +379,7 @@
if (prec < 0)
prec = dtoaend - dtoaresult;
if (expt == INT_MAX)
-@@ -855,11 +945,17 @@
+@@ -855,7 +956,7 @@
if (convbuf != NULL)
free(convbuf);
ndig = dtoaend - dtoaresult;
@@ -383,40 +388,32 @@
freedtoa(dtoaresult);
goto fp_common;
case 'e':
- case 'E':
-+#ifdef VECTORS
-+ if (flags & VECTOR) {
-+ flags |= FPT;
-+ break;
-+ }
-+#endif /* VECTORS */
- expchar = ch;
- if (prec < 0) /* account for digit before decpt */
- prec = DEFPREC + 1;
-@@ -868,10 +964,22 @@
+@@ -868,10 +969,24 @@
goto fp_begin;
case 'f':
case 'F':
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ flags |= FPT;
++ SETVEC(vval);
+ break;
+ }
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
expchar = '\0';
goto fp_begin;
case 'g':
case 'G':
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ flags |= FPT;
++ SETVEC(vval);
+ break;
+ }
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
expchar = ch - ('g' - 'e');
if (prec == 0)
prec = 1;
-@@ -880,6 +988,14 @@
+@@ -880,6 +995,14 @@
prec = DEFPREC;
if (convbuf != NULL)
free(convbuf);
@@ -431,7 +428,7 @@
if (flags & LONGDBL) {
fparg.ldbl = GETARG(long double);
dtoaresult =
-@@ -893,8 +1009,9 @@
+@@ -893,8 +1016,9 @@
if (expt == 9999)
expt = INT_MAX;
}
@@ -442,29 +439,33 @@
freedtoa(dtoaresult);
fp_common:
if (signflag)
-@@ -989,6 +1106,10 @@
+@@ -989,6 +1113,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'o':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
+ break;
-+#endif /* VECTORS */
++ }
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1003,6 +1124,10 @@
+@@ -1003,6 +1133,12 @@
* defined manner.''
* -- ANSI X3J11
*/
-+#ifdef VECTORS
-+ if (flags & VECTOR)
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
+ break;
-+#endif /* VECTORS */
++ }
++#endif /* ALTIVEC */
ujval = (uintmax_t)(uintptr_t)GETARG(void *);
base = 16;
xdigs = xdigs_lower;
-@@ -1024,7 +1149,7 @@
+@@ -1024,7 +1160,7 @@
if ((mbp = GETARG(char *)) == NULL)
cp = L"(null)";
else {
@@ -473,62 +474,52 @@
if (convbuf == NULL) {
fp->_flags |= __SERR;
goto error;
-@@ -1055,6 +1180,10 @@
+@@ -1055,6 +1191,12 @@
flags |= LONGINT;
/*FALLTHROUGH*/
case 'u':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
+ break;
-+#endif /* VECTORS */
++ }
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1067,6 +1196,10 @@
+@@ -1067,6 +1209,12 @@
case 'x':
xdigs = xdigs_lower;
hex:
-+#ifdef VECTORS
-+ if (flags & VECTOR)
++#ifdef ALTIVEC
++ if (flags & VECTOR) {
++ SETVEC(vval);
+ break;
-+#endif /* VECTORS */
++ }
++#endif /* ALTIVEC */
if (flags & INTMAX_SIZE)
ujval = UJARG();
else
-@@ -1092,6 +1225,7 @@
- * ``The result of converting a zero value with an
- * explicit precision of zero is no characters.''
- * -- ANSI X3J11
-+ * except for %#.0o and zero value
- */
- cp = buf + BUF;
- if (flags & INTMAX_SIZE) {
-@@ -1101,7 +1235,7 @@
- flags & GROUPING, thousands_sep,
- grouping);
- } else {
-- if (ulval != 0 || prec != 0)
-+ if (ulval != 0 || prec != 0 || (flags & ALT))
- cp = __ultoa(ulval, cp, base,
- flags & ALT, xdigs,
- flags & GROUPING, thousands_sep,
-@@ -1111,6 +1245,11 @@
+@@ -1111,6 +1259,14 @@
if (size > BUF) /* should never happen */
abort();
break;
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ case 'v':
-+ flags |= VECTOR;
-+ goto rflag;
-+#endif /* VECTORS */
++ if (hasAltivec) {
++ flags |= VECTOR;
++ goto rflag;
++ }
++ /* drop through */
++#endif /* ALTIVEC */
default: /* "%?" prints ?, unless ? is NUL */
if (ch == '\0')
goto done;
-@@ -1122,6 +1261,288 @@
+@@ -1122,6 +1278,183 @@
break;
}
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR) {
+ /*
+ * Do the minimum amount of work necessary to construct
@@ -538,32 +529,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') {
@@ -596,57 +579,13 @@
+ * finish up the format specifier.
+ */
+ if (flags & SHORTINT) {
-+ switch (ch) {
-+ case 'c':
-+ vtype = V_SHORT;
-+ break;
-+ case 'p':
-+ vtype = V_PSHORT;
-+ break;
-+ default:
++ if (ch != 'c')
+ vfmt[j++] = 'h';
-+ vtype = V_SHORT;
-+ break;
-+ }
+ vcnt = 8;
+ } else if (flags & LONGINT) {
++ if (ch != 'c')
++ 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':
@@ -657,148 +596,95 @@
+ 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 *)(long)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 *)(long)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 *)(long)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 *)(long)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_l(&vstr, loc, 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_l(&vstr, loc, vfmt , ## args, velm.i); \
+ } \
+ ret += vlen; \
+ PRINT(vstr, vlen); \
+ 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 *)(long)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 *)(long)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 *)(long)vval.vuintarg[ind]); \
-+ break; \
-+ case V_FLOAT: \
-+ vlen = asprintf_l(&vstr, loc, vfmt , ## args, vval.vfloatarg[ind]); \
-+ break; \
-+ } \
-+ ret += vlen; \
-+ PRINT(vstr, vlen); \
-+ 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)
-+ PRINT(&vsep, 1);
++ 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)
-+ PRINT(&vsep, 1);
++ 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)
-+ PRINT(&vsep, 1);
++ 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)
-+ PRINT(&vsep, 1);
++ PRINT(&vsep, 1);
+
+ /* Element. */
-+ VPRINT(vtype, i, width, prec);
++ VPRINT(vcnt, i, width, prec);
+ }
+ }
+ }
@@ -809,109 +695,67 @@
+
+ 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
-@@ -1177,7 +1598,7 @@
- if (expt <= 0) {
- PRINT(zeroes, 1);
- if (prec || flags & ALT)
-- PRINT(decimal_point, 1);
-+ PRINT(&decimal_point, 1);
- PAD(-expt, zeroes);
- /* already handled initial 0's */
- prec += expt;
-@@ -1203,15 +1624,14 @@
- cp = convbuf + ndig;
- }
- if (prec || flags & ALT) {
-- buf[0] = *decimal_point;
-- PRINT(buf, 1);
-+ PRINT(&decimal_point, 1);
- }
- }
- PRINTANDPAD(cp, convbuf + ndig, prec, zeroes);
- } else { /* %[eE] or sufficiently long %[gG] */
- if (prec > 1 || flags & ALT) {
- buf[0] = *cp++;
-- buf[1] = *decimal_point;
-+ buf[1] = decimal_point;
- PRINT(buf, 2);
- PRINT(cp, ndig-1);
- PAD(prec - ndig, zeroes);
-@@ -1401,6 +1821,11 @@
+@@ -1401,6 +1734,11 @@
if (flags & LONGINT)
ADDTYPE(T_WINT);
else
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ if (flags & VECTOR)
+ ADDTYPE(T_VECTOR);
+ else
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
ADDTYPE(T_INT);
break;
case 'D':
-@@ -1408,6 +1833,11 @@
- /*FALLTHROUGH*/
- case 'd':
- case 'i':
-+#ifdef VECTORS
+@@ -1418,6 +1756,11 @@
+ case 'f':
+ case 'g':
+ case 'G':
++#ifdef ALTIVEC
+ if (flags & VECTOR)
+ ADDTYPE(T_VECTOR);
+ else
-+#endif /* VECTORS */
- ADDSARG();
- break;
- #ifndef NO_FLOATING_POINT
-@@ -1416,8 +1846,14 @@
- case 'e':
- case 'E':
- case 'f':
-+ case 'F':
- case 'g':
- case 'G':
-+#ifdef VECTORS
++#endif /* ALTIVEC */
+ if (flags & LONGDBL)
+ ADDTYPE(T_LONG_DOUBLE);
+ else
+@@ -1446,9 +1789,19 @@
+ flags |= LONGINT;
+ /*FALLTHROUGH*/
+ case 'o':
++#ifdef ALTIVEC
+ if (flags & VECTOR)
+ ADDTYPE(T_VECTOR);
+ else
-+#endif /* VECTORS */
- if (flags & LONGDBL)
- ADDTYPE(T_LONG_DOUBLE);
- else
-@@ -1446,9 +1882,19 @@
- flags |= LONGINT;
- /*FALLTHROUGH*/
- case 'o':
-+#ifdef VECTORS
++#endif /* ALTIVEC */
+ ADDUARG();
+ break;
+ case 'p':
++#ifdef ALTIVEC
+ if (flags & VECTOR)
+ ADDTYPE(T_VECTOR);
+ else
-+#endif /* VECTORS */
- ADDUARG();
- break;
- case 'p':
-+#ifdef VECTORS
++#endif /* ALTIVEC */
+ ADDTYPE(TP_VOID);
+ break;
+ case 'S':
+@@ -1466,6 +1819,11 @@
+ case 'u':
+ case 'X':
+ case 'x':
++#ifdef ALTIVEC
+ if (flags & VECTOR)
+ ADDTYPE(T_VECTOR);
+ else
-+#endif /* VECTORS */
- ADDTYPE(TP_VOID);
- break;
- case 'S':
-@@ -1466,6 +1912,11 @@
- case 'u':
- case 'X':
- case 'x':
-+#ifdef VECTORS
-+ if (flags & VECTOR)
-+ ADDTYPE(T_VECTOR);
-+ else
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
ADDUARG();
break;
default: /* "%?" prints ?, unless ? is NUL */
-@@ -1532,7 +1983,7 @@
+@@ -1532,7 +1890,7 @@
(*argtable) [n].sizearg = va_arg (ap, size_t);
break;
case TP_SIZET:
@@ -920,15 +764,16 @@
break;
case T_INTMAXT:
(*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-@@ -1551,6 +2002,11 @@
+@@ -1551,6 +1909,12 @@
(*argtable) [n].longdoublearg = va_arg (ap, long double);
break;
#endif
-+#ifdef VECTORS
++#ifdef ALTIVEC
+ case T_VECTOR:
-+ (*argtable) [n].vectorarg = va_arg (ap, VECTORTYPE);
++ if (hasAltivec)
++ ap = getvec( &((*argtable) [n]), NULL, 0, ap );
+ break;
-+#endif /* VECTORS */
++#endif /* ALTIVEC */
case TP_CHAR:
(*argtable) [n].pchararg = va_arg (ap, char *);
break;