* 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 2bb6d29f6be6f927cf3ebdea1c4ed3574d64a85a..540c2cf296e9f6ff51b84b5ea3de2dc4c65aaa8c 100644 (file)
--- a/device/lib/_memcpy.c
+++ b/device/lib/_memcpy.c
@@ -24,21 +24,25 @@
 #include "string.h" 
 #include <sdcc-lib.h>
 
-#define NULL (void *)0
+#if !_SDCC_PORT_PROVIDES_MEMCPY
 
-void _generic * memcpy (
-       void _generic * dst,
-       void _generic * src,
-       int acount
+#undef memcpy /* Avoid conflict with builtin memcpy() in Z80 port */
+
+void * memcpy (
+       void * dst,
+       void * src,
+       size_t acount
        ) 
 {
 #if _SDCC_Z80_STYLE_LIB_OPT
-       char _generic * d = dst;
-       char _generic * s = src;
-       int count = -acount;
 
-        count /= 4;
-        
+#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++;
@@ -56,9 +60,9 @@ void _generic * memcpy (
         }
        return dst;
 #else
-       void _generic * ret = dst;
-       char _generic * d = dst;
-       char _generic * s = src;
+       void * ret = dst;
+       char * d = dst;
+       char * s = src;
        
        /*
         * copy from lower addresses to higher addresses
@@ -70,3 +74,4 @@ void _generic * memcpy (
        return(ret);
 #endif
 }
+#endif