]> git.saurik.com Git - apple/libc.git/blobdiff - stdio/FreeBSD/vfprintf.c.patch
projects / apple / libc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Libc-391.5.22.tar.gz
[apple/libc.git] / stdio / FreeBSD / vfprintf.c.patch
diff --git a/stdio/FreeBSD/vfprintf.c.patch b/stdio/FreeBSD/vfprintf.c.patch
index 82cc3c6c4e6e0d516a3caa363eafda82ff3c26eb..88df7711c5dd560b95d4e04e82878faf30ef134c 100644 (file)
--- a/stdio/FreeBSD/vfprintf.c.patch
+++ b/stdio/FreeBSD/vfprintf.c.patch
@@ -1,5 +1,5 @@
 --- vfprintf.c.orig    2004-11-25 11:38:35.000000000 -0800
 --- vfprintf.c.orig    2004-11-25 11:38:35.000000000 -0800
-+++ vfprintf.c 2005-02-24 15:16:20.000000000 -0800
++++ vfprintf.c 2005-11-08 22:43:11.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 $");
 @@ -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 $");
@@ -17,24 +17,25 @@
  
  #include <stdarg.h>
  #include "un-namespace.h"
  
  #include <stdarg.h>
  #include "un-namespace.h"
-@@ -66,6 +69,12 @@
+@@ -66,6 +69,13 @@
  #include "local.h"
  #include "fvwrite.h"
  
  #include "local.h"
  #include "fvwrite.h"
  
-+#ifdef ALTIVEC
-+#include <machine/cpu_capabilities.h>
-+
-+#define VECTORTYPE    vector unsigned char
-+#endif /* ALTIVEC */
++#ifdef VECTORS
++typedef __attribute__ ((vector_size(16))) unsigned char VECTORTYPE;
++#ifdef __SSE2__
++#define V64TYPE
++#endif /* __SSE2__ */
++#endif /* VECTORS */
 +
  union arg {
        int     intarg;
        u_int   uintarg;
 +
  union arg {
        int     intarg;
        u_int   uintarg;
-@@ -93,6 +102,16 @@
+@@ -93,6 +103,21 @@
  #endif
        wint_t  wintarg;
        wchar_t *pwchararg;
  #endif
        wint_t  wintarg;
        wchar_t *pwchararg;
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +      VECTORTYPE              vectorarg;
 +      unsigned char           vuchararg[16];
 +      signed char             vchararg[16];
 +      VECTORTYPE              vectorarg;
 +      unsigned char           vuchararg[16];
 +      signed char             vchararg[16];
@@ -43,19 +44,24 @@
 +      unsigned int            vuintarg[4];
 +      signed int              vintarg[4];
 +      float                   vfloatarg[4];
 +      unsigned int            vuintarg[4];
 +      signed int              vintarg[4];
 +      float                   vfloatarg[4];
-+#endif /* ALTIVEC */
++#ifdef V64TYPE
++      double                  vdoublearg[2];
++      unsigned long long      vulonglongarg[2];
++      long long               vlonglongarg[2];
++#endif /* V64TYPE */
++#endif /* VECTORS */
  };
  
  /*
  };
  
  /*
-@@ -103,19 +122,56 @@
+@@ -103,16 +128,20 @@
        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,
        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
++#ifdef VECTORS
 +      T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR, T_VECTOR
 +      T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR, T_VECTOR
-+#else /* ! ALTIVEC */
++#else /* ! VECTORS */
        T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
        T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
  };
  
  static int    __sprint(FILE *, struct __suio *);
  };
  
  static int    __sprint(FILE *, struct __suio *);
@@ -70,43 +76,7 @@
  static void   __find_arguments(const char *, va_list, union arg **);
  static void   __grow_type_table(int, enum typeid **, int *);
  
  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 @@
+@@ -141,7 +170,7 @@
   * worries about ungetc buffers and so forth.
   */
  static int
   * worries about ungetc buffers and so forth.
   */
  static int
@@ -115,7 +85,7 @@
  {
        int ret;
        FILE fake;
  {
        int ret;
        FILE fake;
-@@ -160,7 +216,7 @@
+@@ -160,7 +189,7 @@
        fake._lbfsize = 0;      /* not actually used, but Just In Case */
  
        /* do the work, then copy any error status */
        fake._lbfsize = 0;      /* not actually used, but Just In Case */
  
        /* do the work, then copy any error status */
@@ -124,7 +94,7 @@
        if (ret >= 0 && __fflush(&fake))
                ret = EOF;
        if (fake._flags & __SERR)
        if (ret >= 0 && __fflush(&fake))
                ret = EOF;
        if (fake._flags & __SERR)
-@@ -336,7 +392,7 @@
+@@ -336,7 +365,7 @@
   * that the wide char. string ends in a null character.
   */
  static char *
   * that the wide char. string ends in a null character.
   */
  static char *
@@ -133,7 +103,7 @@
  {
        static const mbstate_t initial;
        mbstate_t mbs;
  {
        static const mbstate_t initial;
        mbstate_t mbs;
-@@ -354,7 +410,7 @@
+@@ -354,7 +383,7 @@
                p = wcsarg;
                mbs = initial;
                for (;;) {
                p = wcsarg;
                mbs = initial;
                for (;;) {
@@ -142,7 +112,7 @@
                        if (clen == 0 || clen == (size_t)-1 ||
                            nbytes + clen > prec)
                                break;
                        if (clen == 0 || clen == (size_t)-1 ||
                            nbytes + clen > prec)
                                break;
-@@ -363,7 +419,7 @@
+@@ -363,7 +392,7 @@
        } else {
                p = wcsarg;
                mbs = initial;
        } else {
                p = wcsarg;
                mbs = initial;
@@ -151,7 +121,7 @@
                if (nbytes == (size_t)-1)
                        return (NULL);
        }
                if (nbytes == (size_t)-1)
                        return (NULL);
        }
-@@ -378,7 +434,7 @@
+@@ -378,7 +407,7 @@
        p = wcsarg;
        mbs = initial;
        while (mbp - convbuf < nbytes) {
        p = wcsarg;
        mbs = initial;
        while (mbp - convbuf < nbytes) {
@@ -160,7 +130,7 @@
                if (clen == 0 || clen == (size_t)-1)
                        break;
                mbp += clen;
                if (clen == 0 || clen == (size_t)-1)
                        break;
                mbp += clen;
-@@ -402,7 +458,21 @@
+@@ -402,7 +431,21 @@
        int ret;
  
        FLOCKFILE(fp);
        int ret;
  
        FLOCKFILE(fp);
@@ -183,13 +153,13 @@
        FUNLOCKFILE(fp);
        return (ret);
  }
        FUNLOCKFILE(fp);
        return (ret);
  }
-@@ -451,12 +521,15 @@
+@@ -451,12 +494,15 @@
  #define       PTRDIFFT        0x800           /* ptrdiff_t */
  #define       INTMAXT         0x1000          /* intmax_t */
  #define       CHARINT         0x2000          /* print char using int format */
  #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 */
++#ifdef VECTORS
++#define       VECTOR          0x4000          /* Altivec or SSE vector */
++#endif /* VECTORS */
  
  /*
   * Non-MT-safe version
  
  /*
   * Non-MT-safe version
@@ -201,11 +171,11 @@
  {
        char *fmt;              /* format string */
        int ch;                 /* character from fmt */
  {
        char *fmt;              /* format string */
        int ch;                 /* character from fmt */
-@@ -502,6 +575,11 @@
+@@ -502,6 +548,11 @@
        int nseps;              /* number of group separators with ' */
        int nrepeats;           /* number of repeats of the last group */
  #endif
        int nseps;              /* number of group separators with ' */
        int nrepeats;           /* number of repeats of the last group */
  #endif
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +      union arg vval;         /* Vector argument. */
 +      char *pct;              /* Pointer to '%' at beginning of specifier. */
 +      char vsep;              /* Vector separator character. */
 +      union arg vval;         /* Vector argument. */
 +      char *pct;              /* Pointer to '%' at beginning of specifier. */
 +      char vsep;              /* Vector separator character. */
@@ -213,23 +183,7 @@
        u_long  ulval;          /* integer arguments %[diouxX] */
        uintmax_t ujval;        /* %j, %ll, %q, %t, %z integers */
        int base;               /* base for [diouxX] conversion */
        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 @@
+@@ -633,22 +684,23 @@
                val = GETARG (int); \
        }
  
                val = GETARG (int); \
        }
  
@@ -257,39 +211,39 @@
  
        fmt = (char *)fmt0;
        argtable = NULL;
  
        fmt = (char *)fmt0;
        argtable = NULL;
-@@ -675,6 +745,9 @@
+@@ -675,6 +727,9 @@
                }
                if (ch == '\0')
                        goto done;
                }
                if (ch == '\0')
                        goto done;
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +              pct = fmt;
 +              pct = fmt;
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                fmt++;          /* skip over '%' */
  
                flags = 0;
                fmt++;          /* skip over '%' */
  
                flags = 0;
-@@ -683,6 +756,9 @@
+@@ -683,6 +738,9 @@
                prec = -1;
                sign = '\0';
                ox[1] = '\0';
                prec = -1;
                sign = '\0';
                ox[1] = '\0';
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +              vsep = 'X'; /* Illegal value, changed to defaults later. */
 +              vsep = 'X'; /* Illegal value, changed to defaults later. */
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
  
  rflag:                ch = *fmt++;
  reswitch:     switch (ch) {
  
  rflag:                ch = *fmt++;
  reswitch:     switch (ch) {
-@@ -698,6 +774,11 @@
+@@ -698,6 +756,11 @@
                case '#':
                        flags |= ALT;
                        goto rflag;
                case '#':
                        flags |= ALT;
                        goto rflag;
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +              case ',': case ';': case ':': case '_':
 +                      vsep = ch;
 +                      goto rflag;
 +              case ',': case ';': case ':': case '_':
 +                      vsep = ch;
 +                      goto rflag;
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                case '*':
                        /*-
                         * ``A negative field width argument is taken as a
                case '*':
                        /*-
                         * ``A negative field width argument is taken as a
-@@ -718,8 +799,8 @@
+@@ -718,8 +781,8 @@
                        goto rflag;
                case '\'':
                        flags |= GROUPING;
                        goto rflag;
                case '\'':
                        flags |= GROUPING;
@@ -300,16 +254,14 @@
                        goto rflag;
                case '.':
                        if ((ch = *fmt++) == '*') {
                        goto rflag;
                case '.':
                        if ((ch = *fmt++) == '*') {
-@@ -793,14 +874,20 @@
+@@ -793,14 +856,18 @@
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'c':
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'c':
-+#ifdef ALTIVEC
-+                      if (flags & VECTOR) {
-+                              SETVEC(vval);
++#ifdef VECTORS
++                      if (flags & VECTOR)
 +                              break;
 +                              break;
-+                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (flags & LONGINT) {
                                static const mbstate_t initial;
                                mbstate_t mbs;
                        if (flags & LONGINT) {
                                static const mbstate_t initial;
                                mbstate_t mbs;
@@ -323,34 +275,31 @@
                                if (mbseqlen == (size_t)-1) {
                                        fp->_flags |= __SERR;
                                        goto error;
                                if (mbseqlen == (size_t)-1) {
                                        fp->_flags |= __SERR;
                                        goto error;
-@@ -817,6 +904,12 @@
+@@ -817,6 +884,10 @@
                        /*FALLTHROUGH*/
                case 'd':
                case 'i':
                        /*FALLTHROUGH*/
                case 'd':
                case 'i':
-+#ifdef ALTIVEC
-+                      if (flags & VECTOR) {
-+                              SETVEC(vval);
++#ifdef VECTORS
++                      if (flags & VECTOR)
 +                              break;
 +                              break;
-+                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (flags & INTMAX_SIZE) {
                                ujval = SJARG();
                                if ((intmax_t)ujval < 0) {
                        if (flags & INTMAX_SIZE) {
                                ujval = SJARG();
                                if ((intmax_t)ujval < 0) {
-@@ -835,6 +928,13 @@
+@@ -835,6 +906,12 @@
  #ifndef NO_FLOATING_POINT
                case 'a':
                case 'A':
  #ifndef NO_FLOATING_POINT
                case 'a':
                case 'A':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
-+                              SETVEC(vval);
 +                              break;
 +                      }
 +                              break;
 +                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (ch == 'a') {
                                ox[1] = 'x';
                                xdigs = xdigs_lower;
                        if (ch == 'a') {
                                ox[1] = 'x';
                                xdigs = xdigs_lower;
-@@ -848,6 +948,12 @@
+@@ -848,6 +925,12 @@
                                prec++;
                        if (dtoaresult != NULL)
                                freedtoa(dtoaresult);
                                prec++;
                        if (dtoaresult != NULL)
                                freedtoa(dtoaresult);
@@ -363,7 +312,7 @@
                        if (flags & LONGDBL) {
                                fparg.ldbl = GETARG(long double);
                                dtoaresult = cp =
                        if (flags & LONGDBL) {
                                fparg.ldbl = GETARG(long double);
                                dtoaresult = cp =
-@@ -859,6 +965,7 @@
+@@ -859,6 +942,7 @@
                                    __hdtoa(fparg.dbl, xdigs, prec,
                                    &expt, &signflag, &dtoaend);
                        }
                                    __hdtoa(fparg.dbl, xdigs, prec,
                                    &expt, &signflag, &dtoaend);
                        }
@@ -371,46 +320,43 @@
                        if (prec < 0)
                                prec = dtoaend - cp;
                        if (expt == INT_MAX)
                        if (prec < 0)
                                prec = dtoaend - cp;
                        if (expt == INT_MAX)
-@@ -866,6 +973,13 @@
+@@ -866,6 +950,12 @@
                        goto fp_common;
                case 'e':
                case 'E':
                        goto fp_common;
                case 'e':
                case 'E':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
-+                              SETVEC(vval);
 +                              break;
 +                      }
 +                              break;
 +                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        expchar = ch;
                        if (prec < 0)   /* account for digit before decpt */
                                prec = DEFPREC + 1;
                        expchar = ch;
                        if (prec < 0)   /* account for digit before decpt */
                                prec = DEFPREC + 1;
-@@ -874,10 +988,24 @@
+@@ -874,10 +964,22 @@
                        goto fp_begin;
                case 'f':
                case 'F':
                        goto fp_begin;
                case 'f':
                case 'F':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
-+                              SETVEC(vval);
 +                              break;
 +                      }
 +                              break;
 +                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        expchar = '\0';
                        goto fp_begin;
                case 'g':
                case 'G':
                        expchar = '\0';
                        goto fp_begin;
                case 'g':
                case 'G':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
 +                      if (flags & VECTOR) {
 +                              flags |= FPT;
-+                              SETVEC(vval);
 +                              break;
 +                      }
 +                              break;
 +                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        expchar = ch - ('g' - 'e');
                        if (prec == 0)
                                prec = 1;
                        expchar = ch - ('g' - 'e');
                        if (prec == 0)
                                prec = 1;
-@@ -886,6 +1014,14 @@
+@@ -886,6 +988,14 @@
                                prec = DEFPREC;
                        if (dtoaresult != NULL)
                                freedtoa(dtoaresult);
                                prec = DEFPREC;
                        if (dtoaresult != NULL)
                                freedtoa(dtoaresult);
@@ -425,7 +371,7 @@
                        if (flags & LONGDBL) {
                                fparg.ldbl = GETARG(long double);
                                dtoaresult = cp =
                        if (flags & LONGDBL) {
                                fparg.ldbl = GETARG(long double);
                                dtoaresult = cp =
-@@ -899,6 +1035,7 @@
+@@ -899,6 +1009,7 @@
                                if (expt == 9999)
                                        expt = INT_MAX;
                        }
                                if (expt == 9999)
                                        expt = INT_MAX;
                        }
@@ -433,33 +379,29 @@
  fp_common:
                        if (signflag)
                                sign = '-';
  fp_common:
                        if (signflag)
                                sign = '-';
-@@ -993,6 +1130,12 @@
+@@ -993,6 +1104,10 @@
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'o':
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'o':
-+#ifdef ALTIVEC
-+                      if (flags & VECTOR) {
-+                              SETVEC(vval);
++#ifdef VECTORS
++                      if (flags & VECTOR)
 +                              break;
 +                              break;
-+                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (flags & INTMAX_SIZE)
                                ujval = UJARG();
                        else
                        if (flags & INTMAX_SIZE)
                                ujval = UJARG();
                        else
-@@ -1007,6 +1150,12 @@
+@@ -1007,6 +1122,10 @@
                         * defined manner.''
                         *      -- ANSI X3J11
                         */
                         * defined manner.''
                         *      -- ANSI X3J11
                         */
-+#ifdef ALTIVEC
-+                      if (flags & VECTOR) {
-+                              SETVEC(vval);
++#ifdef VECTORS
++                      if (flags & VECTOR)
 +                              break;
 +                              break;
-+                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        ujval = (uintmax_t)(uintptr_t)GETARG(void *);
                        base = 16;
                        xdigs = xdigs_lower;
                        ujval = (uintmax_t)(uintptr_t)GETARG(void *);
                        base = 16;
                        xdigs = xdigs_lower;
-@@ -1025,7 +1174,7 @@
+@@ -1025,7 +1144,7 @@
                                if ((wcp = GETARG(wchar_t *)) == NULL)
                                        cp = "(null)";
                                else {
                                if ((wcp = GETARG(wchar_t *)) == NULL)
                                        cp = "(null)";
                                else {
@@ -468,52 +410,45 @@
                                        if (convbuf == NULL) {
                                                fp->_flags |= __SERR;
                                                goto error;
                                        if (convbuf == NULL) {
                                                fp->_flags |= __SERR;
                                                goto error;
-@@ -1056,6 +1205,12 @@
+@@ -1056,6 +1175,10 @@
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'u':
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'u':
-+#ifdef ALTIVEC
-+                      if (flags & VECTOR) {
-+                              SETVEC(vval);
++#ifdef VECTORS
++                      if (flags & VECTOR)
 +                              break;
 +                              break;
-+                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (flags & INTMAX_SIZE)
                                ujval = UJARG();
                        else
                        if (flags & INTMAX_SIZE)
                                ujval = UJARG();
                        else
-@@ -1068,6 +1223,12 @@
+@@ -1068,6 +1191,10 @@
                case 'x':
                        xdigs = xdigs_lower;
  hex:
                case 'x':
                        xdigs = xdigs_lower;
  hex:
-+#ifdef ALTIVEC
-+                      if (flags & VECTOR) {
-+                              SETVEC(vval);
++#ifdef VECTORS
++                      if (flags & VECTOR)
 +                              break;
 +                              break;
-+                      }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (flags & INTMAX_SIZE)
                                ujval = UJARG();
                        else
                        if (flags & INTMAX_SIZE)
                                ujval = UJARG();
                        else
-@@ -1112,6 +1273,14 @@
+@@ -1112,6 +1239,11 @@
                        if (size > BUF) /* should never happen */
                                abort();
                        break;
                        if (size > BUF) /* should never happen */
                                abort();
                        break;
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +              case 'v':
 +              case 'v':
-+                      if (hasAltivec) {
-+                              flags |= VECTOR;
-+                              goto rflag;
-+                      }
-+                      /* drap through */
-+#endif /* ALTIVEC */
++                      flags |= VECTOR;
++                      goto rflag;
++#endif /* VECTORS */
                default:        /* "%?" prints ?, unless ? is NUL */
                        if (ch == '\0')
                                goto done;
                default:        /* "%?" prints ?, unless ? is NUL */
                        if (ch == '\0')
                                goto done;
-@@ -1123,6 +1292,184 @@
+@@ -1123,6 +1255,290 @@
                        break;
                }
  
                        break;
                }
  
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +              if (flags & VECTOR) {
 +                      /*
 +                       * Do the minimum amount of work necessary to construct
 +              if (flags & VECTOR) {
 +                      /*
 +                       * Do the minimum amount of work necessary to construct
@@ -523,24 +458,32 @@
 +                      int i, j;       /* Counter. */
 +                      int vcnt;       /* Number of elements in vector. */
 +                      char *vfmt;     /* Pointer to format specifier. */
 +                      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. */
++#define EXTRAHH 2
++                      char vfmt_buf[32 + EXTRAHH]; /* Static buffer for format spec. */
 +                      int vwidth = 0; /* Width specified via '*'. */
 +                      int vprec = 0;  /* Precision specified via '*'. */
 +                      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(). */
 +                      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.
 +                      /*
 +                       * 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 < sizeof(vfmt_buf))
++                      if (&fmt[-1] - pct + EXTRAHH < sizeof(vfmt_buf))
 +                              vfmt = vfmt_buf;
 +                      else
 +                              vfmt = vfmt_buf;
 +                      else
-+                              vfmt = (char *)malloc(&fmt[-1] - pct + 1);
++                              vfmt = (char *)malloc(&fmt[-1] - pct + EXTRAHH + 1);
 +
 +                      /* Set the separator character, if not specified. */
 +                      if (vsep == 'X') {
 +
 +                      /* Set the separator character, if not specified. */
 +                      if (vsep == 'X') {
@@ -573,13 +516,57 @@
 +                       * finish up the format specifier.
 +                       */
 +                      if (flags & SHORTINT) {
 +                       * finish up the format specifier.
 +                       */
 +                      if (flags & SHORTINT) {
-+                              if (ch != 'c')
++                              switch (ch) {
++                              case 'c':
++                                      vtype = V_SHORT;
++                                      break;
++                              case 'p':
++                                      vtype = V_PSHORT;
++                                      break;
++                              default:
 +                                      vfmt[j++] = 'h';
 +                                      vfmt[j++] = 'h';
++                                      vtype = V_SHORT;
++                                      break;
++                              }
 +                              vcnt = 8;
 +                      } else if (flags & LONGINT) {
 +                              vcnt = 8;
 +                      } else if (flags & LONGINT) {
-+                              if (ch != 'c')
-+                                      vfmt[j++] = 'l';
 +                              vcnt = 4;
 +                              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':
 +                      } else {
 +                              switch (ch) {
 +                              case 'a':
@@ -590,96 +577,150 @@
 +                              case 'g':
 +                              case 'G':
 +                                      vcnt = 4;
 +                              case 'g':
 +                              case 'G':
 +                                      vcnt = 4;
++                                      vtype = V_FLOAT;
 +                                      break;
 +                              default:
 +                                      /*
 +                                       * The default case should never
 +                                       * happen.
 +                                       */
 +                                      break;
 +                              default:
 +                                      /*
 +                                       * The default case should never
 +                                       * happen.
 +                                       */
-+                              case 'c':
 +                              case 'd':
 +                              case 'i':
 +                              case 'u':
 +                              case 'o':
 +                              case 'd':
 +                              case 'i':
 +                              case 'u':
 +                              case 'o':
-+                              case 'p':
 +                              case 'x':
 +                              case 'X':
 +                              case 'x':
 +                              case 'X':
++                                      vfmt[j++] = 'h';
++                                      vfmt[j++] = 'h';
++                                      /* drop through */
++                              case 'p':
++                              case 'c':
 +                                      vcnt = 16;
 +                                      vcnt = 16;
++                                      vtype = (ch == 'p') ? V_PCHAR : V_CHAR;
 +                              }
 +                      }
 +                      vfmt[j++] = ch;
 +                      vfmt[j++] = '\0';
 +
 +/* Get a vector element. */
 +                              }
 +                      }
 +                      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);  \
++#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;                                                  \
++      }                                                               \
++      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 *)(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);                                              \
 +      FLUSH();                                                        \
 +      free(vstr);                                                     \
 +} while (0)
 +      }                                                               \
 +      ret += vlen;                                                    \
 +      PRINT(vstr, vlen);                                              \
 +      FLUSH();                                                        \
 +      free(vstr);                                                     \
 +} while (0)
++#endif /* V64TYPE */
 +
 +                      /* Actually print. */
 +                      if (vwidth == 0) {
 +                              if (vprec == 0) {
 +                                      /* First element. */
 +
 +                      /* Actually print. */
 +                      if (vwidth == 0) {
 +                              if (vprec == 0) {
 +                                      /* First element. */
-+                                      VPRINT(vcnt, 0);
++                                      VPRINT(vtype, 0);
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
-+                                              PRINT(&vsep, 1);
++                                              if(vsep)
++                                                      PRINT(&vsep, 1);
 +
 +                                              /* Element. */
 +
 +                                              /* Element. */
-+                                              VPRINT(vcnt, i);
++                                              VPRINT(vtype, i);
 +                                      }
 +                              } else {
 +                                      /* First element. */
 +                                      }
 +                              } else {
 +                                      /* First element. */
-+                                      VPRINT(vcnt, 0, prec);
++                                      VPRINT(vtype, 0, prec);
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
-+                                              PRINT(&vsep, 1);
++                                              if(vsep)
++                                                      PRINT(&vsep, 1);
 +
 +                                              /* Element. */
 +
 +                                              /* Element. */
-+                                              VPRINT(vcnt, i, prec);
++                                              VPRINT(vtype, i, prec);
 +                                      }
 +                              }
 +                      } else {
 +                              if (vprec == 0) {
 +                                      /* First element. */
 +                                      }
 +                              }
 +                      } else {
 +                              if (vprec == 0) {
 +                                      /* First element. */
-+                                      VPRINT(vcnt, 0, width);
++                                      VPRINT(vtype, 0, width);
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
-+                                              PRINT(&vsep, 1);
++                                              if(vsep)
++                                                      PRINT(&vsep, 1);
 +
 +                                              /* Element. */
 +
 +                                              /* Element. */
-+                                              VPRINT(vcnt, i, width);
++                                              VPRINT(vtype, i, width);
 +                                      }
 +                              } else {
 +                                      /* First element. */
 +                                      }
 +                              } else {
 +                                      /* First element. */
-+                                      VPRINT(vcnt, 0, width, prec);
++                                      VPRINT(vtype, 0, width, prec);
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
 +                                      for (i = 1; i < vcnt; i++) {
 +                                              /* Separator. */
-+                                              PRINT(&vsep, 1);
++                                              if(vsep)
++                                                      PRINT(&vsep, 1);
 +
 +                                              /* Element. */
 +
 +                                              /* Element. */
-+                                              VPRINT(vcnt, i, width, prec);
++                                              VPRINT(vtype, i, width, prec);
 +                                      }
 +                              }
 +                      }
 +                                      }
 +                              }
 +                      }
@@ -690,27 +731,27 @@
 +
 +                      continue;
 +              }
 +
 +                      continue;
 +              }
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                /*
                 * All reasonable formats wind up here.  At this point, `cp'
                 * points to a string which (if not flags&LADJUST) should be
                /*
                 * 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 @@
+@@ -1406,6 +1822,11 @@
                        if (flags & LONGINT)
                                ADDTYPE(T_WINT);
                        else
                        if (flags & LONGINT)
                                ADDTYPE(T_WINT);
                        else
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                                ADDTYPE(T_INT);
                        break;
                case 'D':
                                ADDTYPE(T_INT);
                        break;
                case 'D':
-@@ -1413,6 +1765,11 @@
+@@ -1413,6 +1834,11 @@
                        /*FALLTHROUGH*/
                case 'd':
                case 'i':
                        /*FALLTHROUGH*/
                case 'd':
                case 'i':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
@@ -718,51 +759,51 @@
                        ADDSARG();
                        break;
  #ifndef NO_FLOATING_POINT
                        ADDSARG();
                        break;
  #ifndef NO_FLOATING_POINT
-@@ -1423,6 +1780,11 @@
+@@ -1423,6 +1849,11 @@
                case 'f':
                case 'g':
                case 'G':
                case 'f':
                case 'g':
                case 'G':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        if (flags & LONGDBL)
                                ADDTYPE(T_LONG_DOUBLE);
                        else
                        if (flags & LONGDBL)
                                ADDTYPE(T_LONG_DOUBLE);
                        else
-@@ -1451,9 +1813,19 @@
+@@ -1451,9 +1882,19 @@
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'o':
                        flags |= LONGINT;
                        /*FALLTHROUGH*/
                case 'o':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        ADDUARG();
                        break;
                case 'p':
                        ADDUARG();
                        break;
                case 'p':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        ADDTYPE(TP_VOID);
                        break;
                case 'S':
                        ADDTYPE(TP_VOID);
                        break;
                case 'S':
-@@ -1471,6 +1843,11 @@
+@@ -1471,6 +1912,11 @@
                case 'u':
                case 'X':
                case 'x':
                case 'u':
                case 'X':
                case 'x':
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
 +                      if (flags & VECTOR)
 +                              ADDTYPE(T_VECTOR);
 +                      else
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                        ADDUARG();
                        break;
                default:        /* "%?" prints ?, unless ? is NUL */
                        ADDUARG();
                        break;
                default:        /* "%?" prints ?, unless ? is NUL */
-@@ -1537,7 +1914,7 @@
+@@ -1537,7 +1983,7 @@
                        (*argtable) [n].sizearg = va_arg (ap, size_t);
                        break;
                    case TP_SIZET:
                        (*argtable) [n].sizearg = va_arg (ap, size_t);
                        break;
                    case TP_SIZET:
@@ -771,16 +812,15 @@
                        break;
                    case T_INTMAXT:
                        (*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
                        break;
                    case T_INTMAXT:
                        (*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-@@ -1556,6 +1933,12 @@
+@@ -1556,6 +2002,11 @@
                        (*argtable) [n].longdoublearg = va_arg (ap, long double);
                        break;
  #endif
                        (*argtable) [n].longdoublearg = va_arg (ap, long double);
                        break;
  #endif
-+#ifdef ALTIVEC
++#ifdef VECTORS
 +                  case T_VECTOR:
 +                  case T_VECTOR:
-+                      if (hasAltivec)
-+                              ap = getvec( &((*argtable) [n]), NULL, 0, ap );
++                      (*argtable) [n].vectorarg = va_arg (ap, VECTORTYPE);
 +                      break;
 +                      break;
-+#endif /* ALTIVEC */
++#endif /* VECTORS */
                    case TP_CHAR:
                        (*argtable) [n].pchararg = va_arg (ap, char *);
                        break;
                    case TP_CHAR:
                        (*argtable) [n].pchararg = va_arg (ap, char *);
                        break;
mirror of libc