Index: kernel/generic/include/lib/memfnc.h =================================================================== --- kernel/generic/include/lib/memfnc.h (revision 4ae90f920ae7c2b893c028ff132e1176bec081de) +++ kernel/generic/include/lib/memfnc.h (revision 4ae90f920ae7c2b893c028ff132e1176bec081de) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef KERN_LIB_MEMFNC_H_ +#define KERN_LIB_MEMFNC_H_ + +#include + +extern void *memset(void *, int, size_t); +extern void *memcpy(void *, const void *, size_t); + +#endif + +/** @} + */ Index: kernel/generic/include/memstr.h =================================================================== --- kernel/generic/include/memstr.h (revision a504856ad02124fee0cc58033efab9344ce981e6) +++ kernel/generic/include/memstr.h (revision 4ae90f920ae7c2b893c028ff132e1176bec081de) @@ -38,9 +38,9 @@ #include +#define memset(dst, val, cnt) __builtin_memset((dst), (val), (cnt)) +#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) + extern void memsetb(void *, size_t, uint8_t); extern void memsetw(void *, size_t, uint16_t); -extern void *memset(void *, int, size_t); - -extern void *memcpy(void *, const void *, size_t); extern void *memmove(void *, const void *, size_t); Index: kernel/generic/src/lib/memfnc.c =================================================================== --- kernel/generic/src/lib/memfnc.c (revision 4ae90f920ae7c2b893c028ff132e1176bec081de) +++ kernel/generic/src/lib/memfnc.c (revision 4ae90f920ae7c2b893c028ff132e1176bec081de) @@ -0,0 +1,91 @@ + /* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ + +/** + * @file + * @brief Memory string functions. + * + * This file provides architecture independent functions to manipulate blocks + * of memory. These functions are optimized as much as generic functions of + * this type can be. + */ + +#include +#include + +/** 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) +{ + size_t i; + uint8_t *ptr = (uint8_t *) dst; + + for (i = 0; i < cnt; i++) + ptr[i] = val; + + return dst; +} + +/** 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; +} + +/** @} + */ Index: kernel/generic/src/lib/memstr.c =================================================================== --- kernel/generic/src/lib/memstr.c (revision a504856ad02124fee0cc58033efab9344ce981e6) +++ kernel/generic/src/lib/memstr.c (revision 4ae90f920ae7c2b893c028ff132e1176bec081de) @@ -43,5 +43,4 @@ #include #include -#include /** Fill block of memory. @@ -56,5 +55,5 @@ void memsetb(void *dst, size_t cnt, uint8_t val) { - __builtin_memset(dst, val, cnt); + memset(dst, val, cnt); } @@ -76,37 +75,4 @@ for (i = 0; i < cnt; i++) ptr[i] = val; -} - -/** 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); -} - -/** 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) -{ - return __builtin_memcpy(dst, src, cnt); } @@ -133,12 +99,12 @@ return memcpy(dst, src, cnt); + uint8_t *dp; const uint8_t *sp; - uint8_t *dp; /* Which direction? */ if (src > dst) { /* Forwards. */ + dp = dst; sp = src; - dp = dst; while (cnt-- != 0) @@ -146,6 +112,6 @@ } else { /* Backwards. */ + dp = dst + (cnt - 1); sp = src + (cnt - 1); - dp = dst + (cnt - 1); while (cnt-- != 0)