Index: kernel/generic/src/lib/memfnc.c =================================================================== --- kernel/generic/src/lib/memfnc.c (revision 033cbf8287ef01edf5fe473bad471d9c5e3c3b3b) +++ kernel/generic/src/lib/memfnc.c (revision 033cbf8287ef01edf5fe473bad471d9c5e3c3b3b) @@ -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 f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/generic/src/lib/memstr.c (revision 033cbf8287ef01edf5fe473bad471d9c5e3c3b3b) @@ -28,5 +28,5 @@ */ -/** @addtogroup generic +/** @addtogroup generic * @{ */ @@ -34,129 +34,90 @@ /** * @file - * @brief Memory string operations. + * @brief Memory string operations. * - * 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. However, architectures are free to provide even more optimized - * versions of these 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 -#include -/** Copy block of memory. +/** Fill block of memory. * - * Copy cnt bytes from src address to dst address. The copying is done - * word-by-word and then byte-by-byte. The source and destination memory areas - * cannot overlap. + * Fill cnt bytes at dst address with the value val. * - * @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 fill. + * @param cnt Number of bytes to fill. + * @param val Value to fill. * - * @return Destination address. */ -void *_memcpy(void *dst, const void *src, size_t cnt) +void memsetb(void *dst, size_t cnt, uint8_t val) { - unsigned int i, j; + memset(dst, val, cnt); +} + +/** Fill block of memory. + * + * Fill cnt words at dst address with the value val. The filling + * is done word-by-word. + * + * @param dst Destination address to fill. + * @param cnt Number of words to fill. + * @param val Value to fill. + * + */ +void memsetw(void *dst, size_t cnt, uint16_t val) +{ + size_t i; + uint16_t *ptr = (uint16_t *) dst; - if (ALIGN_UP((uintptr_t) src, sizeof(sysarg_t)) != (uintptr_t) src || - ALIGN_UP((uintptr_t) dst, sizeof(sysarg_t)) != (uintptr_t) dst) { - for (i = 0; i < cnt; i++) - ((uint8_t *) dst)[i] = ((uint8_t *) src)[i]; - } else { - for (i = 0; i < cnt / sizeof(sysarg_t); i++) - ((sysarg_t *) dst)[i] = ((sysarg_t *) src)[i]; - - for (j = 0; j < cnt % sizeof(sysarg_t); j++) - ((uint8_t *)(((sysarg_t *) dst) + i))[j] = - ((uint8_t *)(((sysarg_t *) src) + i))[j]; - } - - return (char *) dst; + for (i = 0; i < cnt; i++) + ptr[i] = val; } /** Move memory block with possible overlapping. * - * Copy cnt bytes from src address to dst address. The source and destination - * memory areas may overlap. + * Copy cnt bytes from src address to dst address. The source + * and destination memory areas may 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 *memmove(void *dst, const void *src, size_t n) +void *memmove(void *dst, const void *src, size_t cnt) { - const uint8_t *sp; - uint8_t *dp; - /* Nothing to do? */ if (src == dst) return dst; - + /* Non-overlapping? */ - if (dst >= src + n || src >= dst + n) { - return memcpy(dst, src, n); - } - + if ((dst >= src + cnt) || (src >= dst + cnt)) + return memcpy(dst, src, cnt); + + uint8_t *dp; + const uint8_t *sp; + /* Which direction? */ if (src > dst) { /* Forwards. */ + dp = dst; sp = src; - dp = dst; - - while (n-- != 0) + + while (cnt-- != 0) *dp++ = *sp++; } else { /* Backwards. */ - sp = src + (n - 1); - dp = dst + (n - 1); - - while (n-- != 0) + dp = dst + (cnt - 1); + sp = src + (cnt - 1); + + while (cnt-- != 0) *dp-- = *sp--; } - + return dst; -} - -/** Fill block of memory - * - * Fill cnt bytes at dst address with the value x. The filling is done - * byte-by-byte. - * - * @param dst Destination address to fill. - * @param cnt Number of bytes to fill. - * @param x Value to fill. - * - */ -void _memsetb(void *dst, size_t cnt, uint8_t x) -{ - unsigned int i; - uint8_t *p = (uint8_t *) dst; - - for (i = 0; i < cnt; i++) - p[i] = x; -} - -/** Fill block of memory. - * - * Fill cnt words at dst address with the value x. The filling is done - * word-by-word. - * - * @param dst Destination address to fill. - * @param cnt Number of words to fill. - * @param x Value to fill. - * - */ -void _memsetw(void *dst, size_t cnt, uint16_t x) -{ - unsigned int i; - uint16_t *p = (uint16_t *) dst; - - for (i = 0; i < cnt; i++) - p[i] = x; } Index: kernel/generic/src/main/main.c =================================================================== --- kernel/generic/src/main/main.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/generic/src/main/main.c (revision 033cbf8287ef01edf5fe473bad471d9c5e3c3b3b) @@ -58,5 +58,4 @@ #include #include -#include #include
#include
@@ -217,5 +216,4 @@ tlb_init(); ddi_init(); - tasklet_init(); arch_post_mm_init(); arch_pre_smp_init(); Index: kernel/generic/src/mm/backend_elf.c =================================================================== --- kernel/generic/src/mm/backend_elf.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/generic/src/mm/backend_elf.c (revision 033cbf8287ef01edf5fe473bad471d9c5e3c3b3b) @@ -91,7 +91,11 @@ if (!as_area_check_access(area, access)) return AS_PF_FAULT; - - ASSERT((addr >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) && - (addr < entry->p_vaddr + entry->p_memsz)); + + if (addr < ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) + return AS_PF_FAULT; + + if (addr >= entry->p_vaddr + entry->p_memsz) + return AS_PF_FAULT; + i = (addr - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH; base = (uintptr_t) Index: kernel/generic/src/proc/tasklet.c =================================================================== --- kernel/generic/src/proc/tasklet.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,64 +1,0 @@ -/* - * Copyright (c) 2007 Jan Hudecek - * Copyright (c) 2008 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 genericproc - * @{ - */ -/** @file tasklet.c - * @brief Tasklet implementation - */ - -#include -#include -#include -#include - -/** Spinlock protecting list of tasklets */ -SPINLOCK_INITIALIZE(tasklet_lock); - -/** Array of tasklet lists for every CPU */ -tasklet_descriptor_t **tasklet_list; - -void tasklet_init(void) -{ - unsigned int i; - - tasklet_list = malloc(sizeof(tasklet_descriptor_t *) * config.cpu_count, 0); - if (!tasklet_list) - panic("Error initializing tasklets."); - - for (i = 0; i < config.cpu_count; i++) - tasklet_list[i] = NULL; - - spinlock_initialize(&tasklet_lock, "tasklet_lock"); -} - - -/** @} - */