* as/z80/z80mch.c: fixed bug #1704376: missing as-z80 errors

[fw/sdcc] / device / lib / _memcpy.c

diff --git a/device/lib/_memcpy.c b/device/lib/_memcpy.c
index b59c27fb20509c6ef624682ba60ad056c33b1a0b..540c2cf296e9f6ff51b84b5ea3de2dc4c65aaa8c 100644 (file)
--- a/device/lib/_memcpy.c
+++ b/device/lib/_memcpy.c
@@ -22,24 +22,56 @@
    what you give them.   Help stamp out software-hoarding!  
 -------------------------------------------------------------------------*/
 #include "string.h" 
-#define NULL (void *)0
+#include <sdcc-lib.h>
 
-void _generic * memcpy (
-       void _generic * dst,
-       void _generic * src,
-       int count
+#if !_SDCC_PORT_PROVIDES_MEMCPY
+
+#undef memcpy /* Avoid conflict with builtin memcpy() in Z80 port */
+
+void * memcpy (
+       void * dst,
+       void * src,
+       size_t acount
        ) 
 {
-       void _generic * ret = dst;
-       char _generic * d = dst;
-       char _generic * s = src;
+#if _SDCC_Z80_STYLE_LIB_OPT
+
+#pragma noinduction
+
+       char * d = dst;
+       char * s = src;
+       /* PENDING: Divide first to get around sign problems */
+       int count = -(acount >> 2);
+
+        while (count) {
+               *d++ = *s++;
+               *d++ = *s++;
+               *d++ = *s++;
+               *d++ = *s++;
+                count++;
+        }
+
+        if (acount & 2) {
+               *d++ = *s++; 
+               *d++ = *s++;
+        }
+        if (acount & 1) {
+               *d++ = *s++;
+        }
+       return dst;
+#else
+       void * ret = dst;
+       char * d = dst;
+       char * s = src;
        
        /*
         * copy from lower addresses to higher addresses
         */
-       while (count--) {
+       while (acount--) {
                *d++ = *s++;
        }
 
        return(ret);
+#endif
 }
+#endif