Changeset 3deb0155 in mainline for boot

Timestamp:

2013-04-10T19:11:45Z (13 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

dd0c8a0

Parents:

44186b01 (diff), b4f43a1 (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

Location:

boot/generic

Files:

• include/memstr.h (modified) (1 diff)
• src/memstr.c (modified) (1 diff)

boot/generic/include/memstr.h

@@ -35 +35 @@
 #include <typedefs.h>
 
-extern void *memcpy(void *, const void *, size_t);
+extern void *memcpy(void *, const void *, size_t)
+    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+extern void *memset(void *, int, size_t)
+    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
 extern void *memmove(void *, const void *, size_t);
 

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 src           Source address to copy from.
- * @param dst           Destination address to copy to.
- * @param cnt           Number of bytes to copy.
+ * @param dst Destination address to copy to.
+ * @param src Source address to copy from.
+ * @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;
+        uint8_t *dp = (uint8_t *) dst;
+        const uint8_t *sp = (uint8_t *) src;
+        
+        while (cnt-- != 0)
+                *dp++ = *sp++;
+        
+        return dst;
+}
 
-        for (i = 0; i < cnt; i++)
-                ((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
-
+/** 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)
+{
+        uint8_t *dp = (uint8_t *) dst;
+        
+        while (cnt-- != 0)
+                *dp++ = val;
+        
         return dst;
 }