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

Timestamp:

2013-03-26T15:06:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea15a89a

Parents:

8a26f82 (diff), 5c4356b (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) (1 diff)

boot/generic/src/memstr.c

@@ -35 +35 @@
  * memory areas cannot overlap.
  *
- * @param src           Source address to copy from.
- * @param dst           Destination address to copy to.
- * @param cnt           Number of bytes to copy.
+ * @param src Source address to copy from.
+ * @param dst Destination address to copy to.
+ * @param cnt Number of bytes to copy.
  *
- * @return              Destination address.
+ * @return Destination address.
+ *
  */
 void *memcpy(void *dst, const void *src, size_t cnt)
 {
-        size_t i;
+        return __builtin_memcpy(dst, src, cnt);
+}
 
-        for (i = 0; i < cnt; i++)
-                ((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
-
-        return dst;
+/** Fill block of memory.
+ *
+ * Fill cnt bytes at dst address with the value val.
+ *
+ * @param dst Destination address to fill.
+ * @param val Value to fill.
+ * @param cnt Number of bytes to fill.
+ *
+ * @return Destination address.
+ *
+ */
+void *memset(void *dst, int val, size_t cnt)
+{
+        return __builtin_memset(dst, val, cnt);
 }