dbuf update to version 1.1.1 - re-added C++ stuff to make it still more portable

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

diff --git a/device/lib/_memcpy.c b/device/lib/_memcpy.c
index 9211c09e07ea3ef5208f45d9cebd9483143015ae..38d01ad8047d790ea0aa48a75e1aef4224330e73 100644 (file)
--- a/device/lib/_memcpy.c
+++ b/device/lib/_memcpy.c
@@ -26,11 +26,9 @@
 
 #if !_SDCC_PORT_PROVIDES_MEMCPY
 
-#define NULL (void *)0
-
-void _generic * memcpy (
-       void _generic * dst,
-       void _generic * src,
+void * memcpy (
+       void * dst,
+       void * src,
        int acount
        ) 
 {
@@ -38,12 +36,11 @@ void _generic * memcpy (
 
 #pragma NOINDUCTION
 
-       char _generic * d = dst;
-       char _generic * s = src;
-       int count = -acount;
+       char * d = dst;
+       char * s = src;
+       /* PENDING: Divide first to get around sign problems */
+       int count = -(acount/4);
 
-        count /= 4;
-        
         while (count) {
                *d++ = *s++;
                *d++ = *s++;
@@ -61,9 +58,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