Changeset 8a5a902 in mainline for boot/generic/src/memstr.c

Timestamp:

2013-03-29T16:26:39Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0ca441c

Parents:

2d1195c0

Message:

GCC 4.8 recognizes parts of our C implementation of memset() and memcpy() and actually emits a call to memset() and memcpy()
(which is of course futile and only causes an infinite recursion)
switch to a hand-written memset() and memcpy()

File:

• boot/generic/src/memstr.c (modified) (1 diff)

boot/generic/src/memstr.c

@@ -29 +29 @@
 #include <memstr.h>
 #include <typedefs.h>
-
-/** Move memory block without overlapping.
- *
- * 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 cnt Number of bytes to copy.
- *
- * @return Destination address.
- *
- */
-void *memcpy(void *dst, const void *src, size_t cnt)
-{
-        uint8_t *dp = (uint8_t *) dst;
-        const uint8_t *sp = (uint8_t *) src;
-        
-        while (cnt-- != 0)
-                *dp++ = *sp++;
-        
-        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)
-{
-        uint8_t *dp = (uint8_t *) dst;
-        
-        while (cnt-- != 0)
-                *dp++ = val;
-        
-        return dst;
-}
 
 /** Move memory block with possible overlapping.