Changeset ea15a89a in mainline for boot/generic/src/memstr.c

Timestamp:

2013-04-29T14:26:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

533e2d7, 94dfb92

Parents:

b2fa2d86 (diff), 9e7898e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• boot/generic/src/memstr.c (modified) (3 diffs)

boot/generic/src/memstr.c

@@ -30 +30 @@
 #include <typedefs.h>
 
-/** Copy block of memory.
+/** Move memory block without overlapping.
  *
- * Copy cnt bytes from src address to dst address.The source and destination
- * memory areas cannot overlap.
+ * Copy cnt bytes from src address to dst address. The source
+ * and destination memory areas cannot overlap.
  *
+ * @param dst Destination address to copy to.
  * @param src Source address to copy from.
- * @param dst Destination address to copy to.
  * @param cnt Number of bytes to copy.
  *
@@ -44 +44 @@
 void *memcpy(void *dst, const void *src, size_t cnt)
 {
-        return __builtin_memcpy(dst, src, cnt);
+        uint8_t *dp = (uint8_t *) dst;
+        const uint8_t *sp = (uint8_t *) src;
+        
+        while (cnt-- != 0)
+                *dp++ = *sp++;
+        
+        return dst;
 }
 
@@ -60 +66 @@
 void *memset(void *dst, int val, size_t cnt)
 {
-        return __builtin_memset(dst, val, cnt);
+        uint8_t *dp = (uint8_t *) dst;
+        
+        while (cnt-- != 0)
+                *dp++ = val;
+        
+        return dst;
 }