unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / infra / v2_0 / src / memcpy.c

diff --git a/packages/infra/v2_0/src/memcpy.c b/packages/infra/v2_0/src/memcpy.c
index 6ff8fd6d1542dabc96b81c5a032edad29b8e85c6..1fb9f0b519e8112fe8a0929396fbce16f9434217 100644 (file)
--- a/packages/infra/v2_0/src/memcpy.c
+++ b/packages/infra/v2_0/src/memcpy.c
@@ -92,9 +92,13 @@ memcpy( void *s1, const void *s2, size_t n ) __attribute__((weak,
 void *
 _memcpy( void *s1, const void *s2, size_t n )
 {
-#if defined(CYGIMP_INFRA_PREFER_SMALL_TO_FAST_MEMCPY) || defined(__OPTIMIZE_SIZE__)
     char *dst = (char *) s1;
     const char *src = (const char *) s2;
+
+    CYG_ASSERT((dst >= (src+n)) || ((dst+n) <= src),
+               "memcpy() has undefined result for overlapping copies");
+       
+#if defined(CYGIMP_INFRA_PREFER_SMALL_TO_FAST_MEMCPY) || defined(__OPTIMIZE_SIZE__)
     
 #ifdef CYG_TRACING_FIXED
     CYG_REPORT_FUNCNAMETYPE( "_memcpy", "returning %08x" );
@@ -119,8 +123,6 @@ _memcpy( void *s1, const void *s2, size_t n )
 #endif
     return s1;
 #else
-    char *dst;
-    const char *src;
     CYG_WORD *aligned_dst;
     const CYG_WORD *aligned_src;
     
@@ -128,8 +130,6 @@ _memcpy( void *s1, const void *s2, size_t n )
     CYG_REPORT_FUNCNAMETYPE( "_memcpy", "returning %08x" );
 #endif
 
-    dst = (char *)s1;
-    src = (const char *)s2;
 
 #ifdef CYG_TRACING_FIXED
     CYG_REPORT_FUNCARG3( "dst=%08x, src=%08x, n=%d", dst, src, n );