X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fmemcpy.c;h=064cc3479f54a498ad0144a712f58eb16290dba5;hb=40d0246771c8e593d4b5fdc97dd87b4afd260be2;hp=d53b22e0fa3ae3fb2b063ec92234989ce69cbee2;hpb=0a5395faab237ba9008352b0f4bee9659bbd3d5f;p=pdclib

diff --git a/functions/string/memcpy.c b/functions/string/memcpy.c
index d53b22e..064cc34 100644
--- a/functions/string/memcpy.c
+++ b/functions/string/memcpy.c
@@ -1,74 +1,44 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-void * memcpy( void * restrict s1, const void * restrict s2, size_t n ) { /* TODO */ };
+/* Release $Name$ */
 
-/* Therx code
-{
-    void * ret = s1;
-    const char * src = (const char *) s2;
-    char * dst = (char *) s1;
-    for( ; n != 0; n-- )
-    {
-        *dst++ = *src++;
-    }
-    return ret;
-}
+/* memcpy( void *, const void *, size_t )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
 */
 
-/* PDPC code - unreviewed
-void *memcpy(void *s1, const void *s2, size_t n)
+#include <_PDCLIB_aux.h>
+#include <string.h>
+
+#ifndef REGTEST
+
+void * memcpy( void * _PDCLIB_restrict s1, const void * _PDCLIB_restrict s2, size_t n )
 {
-    register const unsigned char *f = s2;
-    register const unsigned char *fe;
-    register unsigned char *t = s1;
-    
-    fe = f + n;
-    while (f != fe)
+    char * dest = (char *) s1;
+    const char * src = (const char *) s2;
+    while ( n-- )
     {
-        *t++ = *f++;
+        *dest++ = *src++;
     }
-    return (s1);
+    return s1;
 }
-#else
-void *memcpy(void *s1, const void *s2, size_t n)
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main()
 {
-    register unsigned int *p = (unsigned int *)s1;
-    register unsigned int *cs2 = (unsigned int *)s2;
-    register unsigned int *endi;
-    
-    endi = (unsigned int *)((char *)p + (n & ~0x03));
-    while (p != endi)
-    {
-        *p++ = *cs2++;
-    }
-    switch (n & 0x03)
-    {
-        case 0:
-            break;
-        case 1:
-            *(char *)p = *(char *)cs2;
-            break;
-        case 2:
-            *(char *)p = *(char *)cs2;
-            p = (unsigned int *)((char *)p + 1);
-            cs2 = (unsigned int *)((char *)cs2 + 1);
-            *(char *)p = *(char *)cs2;
-            break;
-        case 3:
-            *(char *)p = *(char *)cs2;
-            p = (unsigned int *)((char *)p + 1);
-            cs2 = (unsigned int *)((char *)cs2 + 1);
-            *(char *)p = *(char *)cs2;
-            p = (unsigned int *)((char *)p + 1);
-            cs2 = (unsigned int *)((char *)cs2 + 1);
-            *(char *)p = *(char *)cs2;
-            break;
-    }
-    return (s1);
+    char s[] = "xxxxxxxxxxx";
+    BEGIN_TESTS;
+    TESTCASE( memcpy( s, abcde, 6 ) == s );
+    TESTCASE( s[4] == 'e' );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( memcpy( s + 5, abcde, 5 ) == s + 5 );
+    TESTCASE( s[9] == 'e' );
+    TESTCASE( s[10] == 'x' );
+    return TEST_RESULTS;
 }
-*/
+#endif