Loading...
--- Libc/Libc-391/stdio/FreeBSD/vfprintf.c.patch
+++ /dev/null
@@ -1,786 +0,0 @@
---- vfprintf.c.orig 2004-11-25 11:38:35.000000000 -0800
-+++ vfprintf.c 2005-02-24 15:16:20.000000000 -0800
-@@ -40,6 +40,8 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.68 2004/08/26 06:25:28 des Exp $");
-
-+#include "xlocale_private.h"
-+
- /*
- * Actual printf innards.
- *
-@@ -58,6 +60,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <wchar.h>
-+#include <errno.h>
-
- #include <stdarg.h>
- #include "un-namespace.h"
-@@ -66,6 +69,12 @@
- #include "local.h"
- #include "fvwrite.h"
-
-+#ifdef ALTIVEC
-+#include <machine/cpu_capabilities.h>
-+
-+#define VECTORTYPE vector unsigned char
-+#endif /* ALTIVEC */
-+
- union arg {
- int intarg;
- u_int uintarg;
-@@ -93,6 +102,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 */
- };
-
- /*
-@@ -103,19 +122,56 @@
- 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 *);
--static int __sbprintf(FILE *, const char *, va_list) __printflike(2, 0);
-+static int __sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0);
- static char *__ujtoa(uintmax_t, char *, int, int, const char *, int, char,
- const char *);
- static char *__ultoa(u_long, char *, int, int, const char *, int, char,
- const char *);
--static char *__wcsconv(wchar_t *, int);
-+static char *__wcsconv(wchar_t *, int, locale_t);
- 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 *, 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 */
-+
- /*
- * Flush out all the vectors defined by the given uio,
- * then reset it so that it can be reused.
-@@ -141,7 +197,7 @@
- * 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;
-@@ -160,7 +216,7 @@
- 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)
-@@ -336,7 +392,7 @@
- * that the wide char. string ends in a null character.
- */
- 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;
-@@ -354,7 +410,7 @@
- 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;
-@@ -363,7 +419,7 @@
- } else {
- 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);
- }
-@@ -378,7 +434,7 @@
- p = wcsarg;
- mbs = initial;
- while (mbp - convbuf < nbytes) {
-- clen = wcrtomb(mbp, *p++, &mbs);
-+ clen = wcrtomb_l(mbp, *p++, &mbs, loc);
- if (clen == 0 || clen == (size_t)-1)
- break;
- mbp += clen;
-@@ -402,7 +458,21 @@
- int ret;
-
- FLOCKFILE(fp);
-- ret = __vfprintf(fp, fmt0, ap);
-+ ret = __vfprintf(fp, __current_locale(), fmt0, ap);
-+ FUNLOCKFILE(fp);
-+ return (ret);
-+}
-+
-+int
-+vfprintf_l(FILE * __restrict fp, locale_t loc, const char * __restrict fmt0,
-+ va_list ap)
-+
-+{
-+ int ret;
-+
-+ NORMALIZE_LOCALE(loc);
-+ FLOCKFILE(fp);
-+ ret = __vfprintf(fp, loc, fmt0, ap);
- FUNLOCKFILE(fp);
- return (ret);
- }
-@@ -451,12 +521,15 @@
- #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 */
-@@ -502,6 +575,11 @@
- int nseps; /* number of group separators with ' */
- int nrepeats; /* number of repeats of the last group */
- #endif
-+#ifdef ALTIVEC
-+ union arg vval; /* Vector argument. */
-+ char *pct; /* Pointer to '%' at beginning of specifier. */
-+ char vsep; /* Vector separator character. */
-+#endif
- u_long ulval; /* integer arguments %[diouxX] */
- uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */
- int base; /* base for [diouxX] conversion */
-@@ -574,15 +652,6 @@
- }
-
- /*
-- * 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.
- */
-@@ -633,22 +702,23 @@
- val = GETARG (int); \
- }
-
--
- thousands_sep = '\0';
- grouping = NULL;
- convbuf = NULL;
- #ifndef NO_FLOATING_POINT
- dtoaresult = NULL;
-- decimal_point = localeconv()->decimal_point;
-+ decimal_point = localeconv_l(loc)->decimal_point;
- #endif
- /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-- if (prepwrite(fp) != 0)
-+ if (prepwrite(fp) != 0) {
-+ errno = EBADF;
- return (EOF);
-+ }
-
- /* optimise fprintf(stderr) (and other unbuffered Unix files) */
- if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
- fp->_file >= 0)
-- return (__sbprintf(fp, fmt0, ap));
-+ return (__sbprintf(fp, loc, fmt0, ap));
-
- fmt = (char *)fmt0;
- argtable = NULL;
-@@ -675,6 +745,9 @@
- }
- if (ch == '\0')
- goto done;
-+#ifdef ALTIVEC
-+ pct = fmt;
-+#endif /* ALTIVEC */
- fmt++; /* skip over '%' */
-
- flags = 0;
-@@ -683,6 +756,9 @@
- prec = -1;
- sign = '\0';
- ox[1] = '\0';
-+#ifdef ALTIVEC
-+ vsep = 'X'; /* Illegal value, changed to defaults later. */
-+#endif /* ALTIVEC */
-
- rflag: ch = *fmt++;
- reswitch: switch (ch) {
-@@ -698,6 +774,11 @@
- case '#':
- flags |= ALT;
- goto rflag;
-+#ifdef ALTIVEC
-+ case ',': case ';': case ':': case '_':
-+ vsep = ch;
-+ goto rflag;
-+#endif /* ALTIVEC */
- case '*':
- /*-
- * ``A negative field width argument is taken as a
-@@ -718,8 +799,8 @@
- goto rflag;
- case '\'':
- flags |= GROUPING;
-- thousands_sep = *(localeconv()->thousands_sep);
-- grouping = localeconv()->grouping;
-+ thousands_sep = *(localeconv_l(loc)->thousands_sep);
-+ grouping = localeconv_l(loc)->grouping;
- goto rflag;
- case '.':
- if ((ch = *fmt++) == '*') {
-@@ -793,14 +874,20 @@
- flags |= LONGINT;
- /*FALLTHROUGH*/
- case 'c':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- 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;
-@@ -817,6 +904,12 @@
- /*FALLTHROUGH*/
- case 'd':
- case 'i':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- if (flags & INTMAX_SIZE) {
- ujval = SJARG();
- if ((intmax_t)ujval < 0) {
-@@ -835,6 +928,13 @@
- #ifndef NO_FLOATING_POINT
- case 'a':
- case 'A':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ flags |= FPT;
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- if (ch == 'a') {
- ox[1] = 'x';
- xdigs = xdigs_lower;
-@@ -848,6 +948,12 @@
- 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 */
- if (flags & LONGDBL) {
- fparg.ldbl = GETARG(long double);
- dtoaresult = cp =
-@@ -859,6 +965,7 @@
- __hdtoa(fparg.dbl, xdigs, prec,
- &expt, &signflag, &dtoaend);
- }
-+#endif /* LDBL_COMPAT */
- if (prec < 0)
- prec = dtoaend - cp;
- if (expt == INT_MAX)
-@@ -866,6 +973,13 @@
- goto fp_common;
- case 'e':
- case 'E':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ flags |= FPT;
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- expchar = ch;
- if (prec < 0) /* account for digit before decpt */
- prec = DEFPREC + 1;
-@@ -874,10 +988,24 @@
- goto fp_begin;
- case 'f':
- case 'F':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ flags |= FPT;
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- expchar = '\0';
- goto fp_begin;
- case 'g':
- case 'G':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ flags |= FPT;
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- expchar = ch - ('g' - 'e');
- if (prec == 0)
- prec = 1;
-@@ -886,6 +1014,14 @@
- prec = DEFPREC;
- if (dtoaresult != NULL)
- freedtoa(dtoaresult);
-+#ifdef LDBL_COMPAT
-+ 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 */
- if (flags & LONGDBL) {
- fparg.ldbl = GETARG(long double);
- dtoaresult = cp =
-@@ -899,6 +1035,7 @@
- if (expt == 9999)
- expt = INT_MAX;
- }
-+#endif /* LDBL_COMPAT */
- fp_common:
- if (signflag)
- sign = '-';
-@@ -993,6 +1130,12 @@
- flags |= LONGINT;
- /*FALLTHROUGH*/
- case 'o':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- if (flags & INTMAX_SIZE)
- ujval = UJARG();
- else
-@@ -1007,6 +1150,12 @@
- * defined manner.''
- * -- ANSI X3J11
- */
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- ujval = (uintmax_t)(uintptr_t)GETARG(void *);
- base = 16;
- xdigs = xdigs_lower;
-@@ -1025,7 +1174,7 @@
- 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;
-@@ -1056,6 +1205,12 @@
- flags |= LONGINT;
- /*FALLTHROUGH*/
- case 'u':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- if (flags & INTMAX_SIZE)
- ujval = UJARG();
- else
-@@ -1068,6 +1223,12 @@
- case 'x':
- xdigs = xdigs_lower;
- hex:
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ SETVEC(vval);
-+ break;
-+ }
-+#endif /* ALTIVEC */
- if (flags & INTMAX_SIZE)
- ujval = UJARG();
- else
-@@ -1112,6 +1273,14 @@
- if (size > BUF) /* should never happen */
- abort();
- break;
-+#ifdef ALTIVEC
-+ case 'v':
-+ if (hasAltivec) {
-+ flags |= VECTOR;
-+ goto rflag;
-+ }
-+ /* drap through */
-+#endif /* ALTIVEC */
- default: /* "%?" prints ?, unless ? is NUL */
- if (ch == '\0')
- goto done;
-@@ -1123,6 +1292,184 @@
- break;
- }
-
-+#ifdef ALTIVEC
-+ if (flags & VECTOR) {
-+ /*
-+ * Do the minimum amount of work necessary to construct
-+ * a format specifier that can be used to recursively
-+ * call vfprintf() for each element in the vector.
-+ */
-+ int i, j; /* Counter. */
-+ int vcnt; /* Number of elements in vector. */
-+ char *vfmt; /* Pointer to format specifier. */
-+ 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(). */
-+
-+ /*
-+ * Set vfmt. If vfmt_buf may not be big enough,
-+ * malloc() space, taking care to free it later.
-+ */
-+ if (&fmt[-1] - pct < sizeof(vfmt_buf))
-+ vfmt = vfmt_buf;
-+ else
-+ vfmt = (char *)malloc(&fmt[-1] - pct + 1);
-+
-+ /* Set the separator character, if not specified. */
-+ if (vsep == 'X') {
-+ if (ch == 'c')
-+ vsep = '\0';
-+ else
-+ vsep = ' ';
-+ }
-+
-+ /* Create the format specifier. */
-+ for (i = j = 0; i < &fmt[-1] - pct; i++) {
-+ switch (pct[i]) {
-+ case ',': case ';': case ':': case '_':
-+ case 'v': case 'h': case 'l':
-+ /* Ignore. */
-+ break;
-+ case '*':
-+ if (pct[i - 1] != '.')
-+ vwidth = 1;
-+ else
-+ vprec = 1;
-+ /* FALLTHROUGH */
-+ default:
-+ vfmt[j++] = pct[i];
-+ }
-+ }
-+
-+ /*
-+ * Determine the number of elements in the vector and
-+ * finish up the format specifier.
-+ */
-+ if (flags & SHORTINT) {
-+ if (ch != 'c')
-+ vfmt[j++] = 'h';
-+ vcnt = 8;
-+ } else if (flags & LONGINT) {
-+ if (ch != 'c')
-+ vfmt[j++] = 'l';
-+ vcnt = 4;
-+ } else {
-+ switch (ch) {
-+ case 'a':
-+ case 'A':
-+ case 'e':
-+ case 'E':
-+ case 'f':
-+ case 'g':
-+ case 'G':
-+ vcnt = 4;
-+ break;
-+ default:
-+ /*
-+ * The default case should never
-+ * happen.
-+ */
-+ case 'c':
-+ case 'd':
-+ case 'i':
-+ case 'u':
-+ case 'o':
-+ case 'p':
-+ case 'x':
-+ case 'X':
-+ vcnt = 16;
-+ }
-+ }
-+ vfmt[j++] = ch;
-+ vfmt[j++] = '\0';
-+
-+/* Get a vector element. */
-+#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); \
-+ FLUSH(); \
-+ free(vstr); \
-+} while (0)
-+
-+ /* Actually print. */
-+ if (vwidth == 0) {
-+ if (vprec == 0) {
-+ /* First element. */
-+ VPRINT(vcnt, 0);
-+ for (i = 1; i < vcnt; i++) {
-+ /* Separator. */
-+ PRINT(&vsep, 1);
-+
-+ /* Element. */
-+ VPRINT(vcnt, i);
-+ }
-+ } else {
-+ /* First element. */
-+ VPRINT(vcnt, 0, prec);
-+ for (i = 1; i < vcnt; i++) {
-+ /* Separator. */
-+ PRINT(&vsep, 1);
-+
-+ /* Element. */
-+ VPRINT(vcnt, i, prec);
-+ }
-+ }
-+ } else {
-+ if (vprec == 0) {
-+ /* First element. */
-+ VPRINT(vcnt, 0, width);
-+ for (i = 1; i < vcnt; i++) {
-+ /* Separator. */
-+ PRINT(&vsep, 1);
-+
-+ /* Element. */
-+ VPRINT(vcnt, i, width);
-+ }
-+ } else {
-+ /* First element. */
-+ VPRINT(vcnt, 0, width, prec);
-+ for (i = 1; i < vcnt; i++) {
-+ /* Separator. */
-+ PRINT(&vsep, 1);
-+
-+ /* Element. */
-+ VPRINT(vcnt, i, width, prec);
-+ }
-+ }
-+ }
-+#undef VPRINT
-+
-+ if (vfmt != vfmt_buf)
-+ free(vfmt);
-+
-+ continue;
-+ }
-+#endif /* ALTIVEC */
- /*
- * All reasonable formats wind up here. At this point, `cp'
- * points to a string which (if not flags&LADJUST) should be
-@@ -1406,6 +1753,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':
-@@ -1413,6 +1765,11 @@
- /*FALLTHROUGH*/
- case 'd':
- case 'i':
-+#ifdef ALTIVEC
-+ if (flags & VECTOR)
-+ ADDTYPE(T_VECTOR);
-+ else
-+#endif
- ADDSARG();
- break;
- #ifndef NO_FLOATING_POINT
-@@ -1423,6 +1780,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
-@@ -1451,9 +1813,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':
-@@ -1471,6 +1843,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 */
-@@ -1537,7 +1914,7 @@
- (*argtable) [n].sizearg = va_arg (ap, size_t);
- break;
- case TP_SIZET:
-- (*argtable) [n].psizearg = va_arg (ap, ssize_t *);
-+ (*argtable) [n].psizearg = va_arg (ap, size_t *);
- break;
- case T_INTMAXT:
- (*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-@@ -1556,6 +1933,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;