X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstring%2Fmemcpy.c;h=ca460ef9b52de4f7fc399597b726a607caa5b98b;hp=2990952679275fba517edfb5fe0e50f23848eec7;hb=ab9dfa663d4a2f62a8db2f113de4155a73cc3b0a;hpb=34ec605229b4640c3f4ac8b4c6268e7197012a4f

diff --git a/functions/string/memcpy.c b/functions/string/memcpy.c
index 2990952..ca460ef 100644
--- a/functions/string/memcpy.c
+++ b/functions/string/memcpy.c
@@ -1,59 +1,40 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
+/* Release $Name$ */
+
+/* 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.
+*/
+
+#include <_PDCLIB_aux.h>
 #include <string.h>
 
-void * memcpy( void * restrict dest, const void * restrict src, size_t n )
+void * memcpy( void * _PDCLIB_restrict s1, const void * _PDCLIB_restrict s2, size_t n )
 {
-    const char * src_p = (const char *) src;
-    char * dest_p = (char *) dest;
+    char * dest = (char *) s1;
+    const char * src = (const char *) s2;
     while ( n-- )
     {
-        *dest_p++ = *src_p++;
+        *dest++ = *src++;
     }
-    return dest;
+    return s1;
 }
 
-/* TODO: This is code from PDPC, optimizing for word access.
+#ifdef TEST
+#include <_PDCLIB_test.h>
 
-void *memcpy(void *s1, const void *s2, size_t n)
+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[11] = "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