2006-10-27 Joel Schopp <jschopp@austin.ibm.com>

        * libc/machine/spu/memcpy.c: Override generic function with vectorized
        version optimized for the cell spu.
        * libc/machine/spu/memmove.c: Ditto.
        * libc/machine/spu/memset.c: Ditto.
        * libc/machine/spu/strcat.c: Ditto.
        * libc/machine/spu/strchr.c: Ditto.
        * libc/machine/spu/strcmp.c: Ditto.
        * libc/machine/spu/strcpy.c: Ditto.
        * libc/machine/spu/strcspn.c: Ditto.
        * libc/machine/spu/strlen.c: Ditto.
        * libc/machine/spu/strncat.c: Ditto.
        * libc/machine/spu/strncmp.c: Ditto.
        * libc/machine/spu/strncpy.c: Ditto.
        * libc/machine/spu/strpbrk.c: Ditto.
        * libc/machine/spu/strrchr.c: Ditto.
        * libc/machine/spu/strspn.c: Ditto.
        * libc/machine/spu/strxfrm.c: Ditto.
        * libc/machine/spu/vec_literal.h: Add abstraction of vector literals,
        removing altivec style initializers.
        * libc/machine/spu/Makefile.am: Add new files to list so they build
        * libc/machine/spu/Makefile.in: Regenerate from new Makefile.am

1 files changed, 98 insertions, 0 deletions

diff --git a/newlib/libc/machine/spu/strncat.c b/newlib/libc/machine/spu/strncat.c
new file mode 100644
index 000000000..e1c3088a4
--- /dev/null
+++ b/newlib/libc/machine/spu/strncat.c
@@ -0,0 +1,98 @@
+/*
+  (C) Copyright 2001,2006,
+  International Business Machines Corporation,
+  Sony Computer Entertainment, Incorporated,
+  Toshiba Corporation,
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+    * Neither the names of the copyright holders nor the names of their
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <spu_intrinsics.h>
+#include <stddef.h>
+#include <string.h>
+
+/* Appends the string pointed to by src (up to and including the /0
+ * character) to the array pointed to by dest (overwriting the
+ * /0 character at the end of dest. The strings may not overlap and
+ * the dest string must have enough space for the result.
+ */
+
+char * strncat(char * __restrict__ dest, const char * __restrict__ src, size_t n)
+{
+  size_t len;
+  unsigned int cmp, skip, mask;
+  vec_uchar16 *ptr, data;
+  vec_uint4 cnt, gt, N;
+  char *dst;
+
+  /* Determine the starting location to begin concatenation.
+   */
+  dst = dest + strlen(dest);
+
+  /* Copy the src image until either the src string terminates
+   * or n characters are copied.
+   */
+  N = spu_promote(n, 0);
+
+  /* Determine the string length, not including termination character,
+   * clamped to n characters.
+   */
+  ptr = (vec_uchar16 *)src;
+  skip = (unsigned int)(ptr) & 15;
+  mask = 0xFFFF >> skip;
+
+  data = *ptr++;
+  cmp = spu_extract(spu_gather(spu_cmpeq(data, 0)), 0);
+  cmp &= mask;
+
+  cnt = spu_cntlz(spu_promote(cmp, 0));
+  len = spu_extract(cnt, 0) - (skip + 16);
+
+  gt = spu_cmpgt(spu_promote(len, 0), N);
+
+  while (spu_extract(spu_andc(spu_cmpeq(cnt, 32), gt), 0)) {
+    data = *ptr++;
+    len -= 16;
+    cnt  = spu_cntlz(spu_gather(spu_cmpeq(data, 0)));
+    len += spu_extract(cnt, 0);
+
+    gt = spu_cmpgt(spu_promote(len, 0), N);
+  }
+
+  /* len = MIN(len, n)
+   */
+  len = spu_extract(spu_sel(spu_promote(len, 0), N, gt), 0);
+
+  /* Perform a memcpy of the resulting length
+   */
+  (void)memcpy((void *)dst, (const void *)src, len);
+
+  /* Terminate the resulting concetenated string.
+   */
+  dst[len] = '\0';
+
+  return (dest);
+}