Changeset 745

Timestamp:

Dec 15, 2015, 12:16:20 PM (9 years ago)

Author:

alain

Message:

Fix a bug in memcpy() when both buffers are word aligned,
but the size is not a multiple of 4 bytes.

File:

• soft/giet_vm/giet_common/utils.c (modified) (2 diffs)

soft/giet_vm/giet_common/utils.c

@@ -722 +722 @@
     unsigned int* isrc = (unsigned int*)source;
 
-    // word-by-word copy
+    // word-by-word copy if both buffers are word aligned 
     if (!((unsigned int) idst & 3) && !((unsigned int) isrc & 3)) 
     {
@@ -732 +732 @@
     }
 
-    unsigned char* cdst = (unsigned char*)dest;
-    unsigned char* csrc = (unsigned char*)source;
-
-    /* byte-by-byte copy */
-    while (size--) 
+    unsigned char* cdst = (unsigned char*)idst;
+    unsigned char* csrc = (unsigned char*)isrc;
+
+    // byte-by-byte copy if size not multiple of 4 bytes 
+    while (size) 
     {
         *cdst++ = *csrc++;
-    }
+        size--;
+    }
+
     return dest;
 }