Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/Makefile (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -226,5 +226,4 @@ generic/src/proc/task.c \ generic/src/proc/the.c \ - generic/src/proc/tasklet.c \ generic/src/syscall/syscall.c \ generic/src/syscall/copy.c \ @@ -240,4 +239,5 @@ generic/src/lib/func.c \ generic/src/lib/memstr.c \ + generic/src/lib/memfnc.c \ generic/src/lib/sort.c \ generic/src/lib/str.c \ @@ -381,5 +381,4 @@ generic/src/main/kinit.c \ generic/src/proc/the.c \ - generic/src/proc/tasklet.c \ generic/src/mm/frame.c \ generic/src/mm/page.c \ Index: kernel/arch/abs32le/include/memstr.h =================================================================== --- kernel/arch/abs32le/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2010 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 abs32le - * @{ - */ -/** @file - */ - -#ifndef KERN_abs32le_MEMSTR_H_ -#define KERN_abs32le_MEMSTR_H_ - -#define memcpy(dst, src, cnt) _memcpy((dst), (src), (cnt)) -#define memsetb(dst, cnt, val) _memsetb((dst), (cnt), (val)) -#define memsetw(dst, cnt, val) _memsetw((dst), (cnt), (val)) - -#endif - -/** @} - */ Index: kernel/arch/amd64/Makefile.inc =================================================================== --- kernel/arch/amd64/Makefile.inc (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/amd64/Makefile.inc (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -33,5 +33,22 @@ FPU_NO_CFLAGS = -mno-sse -mno-sse2 -CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer + +# +# FIXME: +# +# The -fno-optimize-sibling-calls should be removed as soon as a bug +# in GCC concerning the "large" memory model and tail call optimization +# is fixed. +# +# If GCC generates a code for tail call, instead of generating .. +# +# jmp *fnc +# +# it generates an assembly code with an illegal immediate prefix: +# +# jmp *$fnc +# + +CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer -fno-optimize-sibling-calls GCC_CFLAGS += $(CMN1) ICC_CFLAGS += $(CMN1) Index: kernel/arch/amd64/_link.ld.in =================================================================== --- kernel/arch/amd64/_link.ld.in (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/amd64/_link.ld.in (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -26,10 +26,10 @@ .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) { ktext_start = .; - *(.text); + *(.text .text.*); ktext_end = .; kdata_start = .; - *(.data); /* initialized data */ - *(.rodata*); /* string literals */ + *(.data); /* initialized data */ + *(.rodata .rodata.*); /* string literals */ hardcoded_load_address = .; QUAD(PA2KA(BOOT_OFFSET)); Index: kernel/arch/amd64/include/memstr.h =================================================================== --- kernel/arch/amd64/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 amd64 - * @{ - */ -/** @file - */ - -#ifndef KERN_amd64_MEMSTR_H_ -#define KERN_amd64_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/amd64/src/asm.S =================================================================== --- kernel/arch/amd64/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/amd64/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -37,7 +37,4 @@ .global read_efer_flag .global set_efer_flag -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -46,12 +43,4 @@ .global early_putchar -/* Wrapper for generic memsetb */ -memsetb: - jmp _memsetb - -/* Wrapper for generic memsetw */ -memsetw: - jmp _memsetw - #define MEMCPY_DST %rdi #define MEMCPY_SRC %rsi @@ -74,5 +63,4 @@ * */ -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/arm32/include/memstr.h =================================================================== --- kernel/arch/arm32/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 arm32 - * @{ - */ -/** @file - * @brief Memory manipulating functions declarations. - */ - -#ifndef KERN_arm32_MEMSTR_H_ -#define KERN_arm32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/arm32/src/asm.S =================================================================== --- kernel/arch/arm32/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/arm32/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -29,7 +29,4 @@ .text -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -38,11 +35,4 @@ .global early_putchar -memsetb: - b _memsetb - -memsetw: - b _memsetw - -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/arm32/src/exception.c =================================================================== --- kernel/arch/arm32/src/exception.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/arm32/src/exception.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -35,5 +35,4 @@ #include -#include #include #include Index: kernel/arch/ia32/_link.ld.in =================================================================== --- kernel/arch/ia32/_link.ld.in (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ia32/_link.ld.in (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -25,10 +25,10 @@ .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)): AT (SIZEOF(.unmapped)) { ktext_start = .; - *(.text); + *(.text .text.*); ktext_end = .; kdata_start = .; *(.data); /* initialized data */ - *(.rodata*); /* string literals */ + *(.rodata .rodata.*); /* string literals */ *(COMMON); /* global variables */ hardcoded_load_address = .; Index: kernel/arch/ia32/include/memstr.h =================================================================== --- kernel/arch/ia32/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 ia32 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia32_MEMSTR_H_ -#define KERN_ia32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/ia32/src/asm.S =================================================================== --- kernel/arch/ia32/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ia32/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -38,7 +38,4 @@ .global paging_on .global enable_l_apic_in_msr -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_from_uspace_failover_address @@ -47,12 +44,4 @@ .global early_putchar -/* Wrapper for generic memsetb */ -memsetb: - jmp _memsetb - -/* Wrapper for generic memsetw */ -memsetw: - jmp _memsetw - #define MEMCPY_DST 4 #define MEMCPY_SRC 8 @@ -74,5 +63,4 @@ * */ -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/ia32/src/cpu/cpu.c =================================================================== --- kernel/arch/ia32/src/cpu/cpu.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ia32/src/cpu/cpu.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -92,5 +92,4 @@ void cpu_arch_init(void) { - cpuid_extended_feature_info efi; cpu_info_t info; uint32_t help = 0; @@ -104,5 +103,4 @@ CPU->arch.fi.word = info.cpuid_edx; - efi.word = info.cpuid_ecx; if (CPU->arch.fi.bits.fxsr) Index: kernel/arch/ia64/_link.ld.in =================================================================== --- kernel/arch/ia64/_link.ld.in (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ia64/_link.ld.in (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -16,5 +16,5 @@ ktext_start = .; *(K_TEXT_START); - *(.text) + *(.text .text.*) ktext_end = .; @@ -36,15 +36,14 @@ *(.bss) *(COMMON); - + . = ALIGN(8); - symbol_table = .; - *(symtab.*); /* Symbol table, must be LAST symbol!*/ - + symbol_table = .; + *(symtab.*); /* Symbol table, must be LAST symbol!*/ + kdata_end = .; } - + /DISCARD/ : { *(*); } - } Index: kernel/arch/ia64/include/memstr.h =================================================================== --- kernel/arch/ia64/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 ia64 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia64_MEMSTR_H_ -#define KERN_ia64_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/ia64/src/asm.S =================================================================== --- kernel/arch/ia64/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ia64/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -30,5 +30,4 @@ .text -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -39,5 +38,6 @@ * * This memcpy() has been taken from the assembler output of - * the generic _memcpy() and modified to have the failover part. + * a plain C implementation of memcpy() modified to have the + * failover part. * * @param in0 Destination address. @@ -46,5 +46,4 @@ * */ -memcpy: memcpy_from_uspace: memcpy_to_uspace: @@ -141,12 +140,4 @@ br.ret.sptk.many rp -.global memsetb -memsetb: - br _memsetb - -.global memsetw -memsetw: - br _memsetw - .global cpu_halt cpu_halt: Index: kernel/arch/ia64/src/mm/tlb.c =================================================================== --- kernel/arch/ia64/src/mm/tlb.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ia64/src/mm/tlb.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -475,12 +475,8 @@ void alternate_instruction_tlb_fault(uint64_t vector, istate_t *istate) { - region_register_t rr; - rid_t rid; uintptr_t va; pte_t *t; va = istate->cr_ifa; /* faulting address */ - rr.word = rr_read(VA2VRN(va)); - rid = rr.map.rid; page_table_lock(AS, true); @@ -649,12 +645,8 @@ void data_dirty_bit_fault(uint64_t vector, istate_t *istate) { - region_register_t rr; - rid_t rid; uintptr_t va; pte_t *t; va = istate->cr_ifa; /* faulting address */ - rr.word = rr_read(VA2VRN(va)); - rid = rr.map.rid; page_table_lock(AS, true); @@ -686,12 +678,8 @@ void instruction_access_bit_fault(uint64_t vector, istate_t *istate) { - region_register_t rr; - rid_t rid; uintptr_t va; pte_t *t; va = istate->cr_ifa; /* faulting address */ - rr.word = rr_read(VA2VRN(va)); - rid = rr.map.rid; page_table_lock(AS, true); @@ -723,12 +711,8 @@ void data_access_bit_fault(uint64_t vector, istate_t *istate) { - region_register_t rr; - rid_t rid; uintptr_t va; pte_t *t; va = istate->cr_ifa; /* faulting address */ - rr.word = rr_read(VA2VRN(va)); - rid = rr.map.rid; page_table_lock(AS, true); @@ -760,12 +744,8 @@ void data_access_rights_fault(uint64_t vector, istate_t *istate) { - region_register_t rr; - rid_t rid; uintptr_t va; pte_t *t; va = istate->cr_ifa; /* faulting address */ - rr.word = rr_read(VA2VRN(va)); - rid = rr.map.rid; /* @@ -792,12 +772,8 @@ void page_not_present(uint64_t vector, istate_t *istate) { - region_register_t rr; - rid_t rid; uintptr_t va; pte_t *t; va = istate->cr_ifa; /* faulting address */ - rr.word = rr_read(VA2VRN(va)); - rid = rr.map.rid; page_table_lock(AS, true); Index: kernel/arch/mips32/include/atomic.h =================================================================== --- kernel/arch/mips32/include/atomic.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/mips32/include/atomic.h (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -91,4 +91,5 @@ " sc %0, %1\n" " beqz %0, 1b\n" + " nop\n" "2:\n" : "=&r" (tmp), Index: kernel/arch/mips32/include/cp0.h =================================================================== --- kernel/arch/mips32/include/cp0.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/mips32/include/cp0.h (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -70,5 +70,5 @@ { \ uint32_t retval; \ - asm("mfc0 %0, $" #reg : "=r"(retval)); \ + asm volatile ("mfc0 %0, $" #reg : "=r"(retval)); \ return retval; \ } @@ -76,5 +76,5 @@ #define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(uint32_t val) \ { \ - asm("mtc0 %0, $" #reg : : "r"(val) ); \ + asm volatile ("mtc0 %0, $" #reg : : "r"(val) ); \ } Index: kernel/arch/mips32/include/memstr.h =================================================================== --- kernel/arch/mips32/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 mips32 - * @{ - */ -/** @file - */ - -#ifndef KERN_mips32_MEMSTR_H_ -#define KERN_mips32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/mips32/src/asm.S =================================================================== --- kernel/arch/mips32/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/mips32/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -57,20 +57,8 @@ nop -.global memsetb -memsetb: - j _memsetb - nop - -.global memsetw -memsetw: - j _memsetw - nop - -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace .global memcpy_from_uspace_failover_address .global memcpy_to_uspace_failover_address -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/ppc32/_link.ld.in =================================================================== --- kernel/arch/ppc32/_link.ld.in (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ppc32/_link.ld.in (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -36,6 +36,5 @@ kdata_start = .; *(K_DATA_START); - *(.rodata); - *(.rodata.*); + *(.rodata .rodata.*); *(.data); /* initialized data */ *(.sdata); Index: kernel/arch/ppc32/include/memstr.h =================================================================== --- kernel/arch/ppc32/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 ppc32 - * @{ - */ -/** @file - */ - -#ifndef KERN_ppc32_MEMSTR_H_ -#define KERN_ppc32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/ppc32/src/asm.S =================================================================== --- kernel/arch/ppc32/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/ppc32/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -35,7 +35,4 @@ .global iret .global iret_syscall -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -208,11 +205,4 @@ rfi -memsetb: - b _memsetb - -memsetw: - b _memsetw - -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/sparc64/_link.ld.in =================================================================== --- kernel/arch/sparc64/_link.ld.in (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/_link.ld.in (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -15,11 +15,10 @@ ktext_start = .; *(K_TEXT_START) - *(.text); + *(.text .text.*); ktext_end = .; kdata_start = .; *(K_DATA_START) - *(.rodata); - *(.rodata.*); + *(.rodata .rodata.*); *(.data); /* initialized data */ *(.sdata); Index: kernel/arch/sparc64/include/memstr.h =================================================================== --- kernel/arch/sparc64/include/memstr.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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 sparc64 - * @{ - */ -/** @file - */ - -#ifndef KERN_sparc64_MEMSTR_H_ -#define KERN_sparc64_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/sparc64/src/asm.S =================================================================== --- kernel/arch/sparc64/src/asm.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/src/asm.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -34,78 +34,4 @@ .register %g2, #scratch .register %g3, #scratch - -/* - * This is the assembly language version of our _memcpy() generated by gcc. - */ -.global memcpy -memcpy: - mov %o0, %o3 /* save dst */ - add %o1, 7, %g1 - and %g1, -8, %g1 - cmp %o1, %g1 - be,pn %xcc, 3f - add %o0, 7, %g1 - mov 0, %g3 - - 0: - - brz,pn %o2, 2f - mov 0, %g2 - - 1: - - ldub [%g3 + %o1], %g1 - add %g2, 1, %g2 - cmp %o2, %g2 - stb %g1, [%g3 + %o0] - bne,pt %xcc, 1b - mov %g2, %g3 - - 2: - - jmp %o7 + 8 /* exit point */ - mov %o3, %o0 - - 3: - - and %g1, -8, %g1 - cmp %o0, %g1 - bne,pt %xcc, 0b - mov 0, %g3 - srlx %o2, 3, %g4 - brz,pn %g4, 5f - mov 0, %g5 - - 4: - - sllx %g3, 3, %g2 - add %g5, 1, %g3 - ldx [%o1 + %g2], %g1 - mov %g3, %g5 - cmp %g4, %g3 - bne,pt %xcc, 4b - stx %g1, [%o0 + %g2] - - 5: - - and %o2, 7, %o2 - brz,pn %o2, 2b - sllx %g4, 3, %g1 - mov 0, %g2 - add %g1, %o0, %o0 - add %g1, %o1, %g4 - mov 0, %g3 - - 6: - - ldub [%g2 + %g4], %g1 - stb %g1, [%g2 + %o0] - add %g3, 1, %g2 - cmp %o2, %g2 - bne,pt %xcc, 6b - mov %g2, %g3 - - jmp %o7 + 8 /* exit point */ - mov %o3, %o0 /* @@ -264,14 +190,4 @@ mov %g0, %o0 /* return 0 on failure */ -.global memsetb -memsetb: - ba %xcc, _memsetb - nop - -.global memsetw -memsetw: - ba %xcc, _memsetw - nop - .global early_putchar early_putchar: Index: kernel/arch/sparc64/src/mm/sun4u/as.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/as.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/src/mm/sun4u/as.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -43,5 +43,4 @@ #include -#include #include #include Index: kernel/arch/sparc64/src/mm/sun4v/as.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4v/as.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/src/mm/sun4v/as.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -46,5 +46,4 @@ #include -#include #include #include Index: kernel/arch/sparc64/src/smp/sun4v/smp.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4v/smp.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/src/smp/sun4v/smp.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -1,5 +1,5 @@ /* * Copyright (c) 2006 Jakub Jermar - * Copyright (c) 2009 Pavel Rimsky + * Copyright (c) 2009 Pavel Rimsky * All rights reserved. * @@ -439,5 +439,5 @@ if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) - printf("%s: waiting for processor (cpuid = %" PRIu32 ") timed out\n", + printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n", __func__, cpuid); Index: kernel/arch/sparc64/src/sun4v/start.S =================================================================== --- kernel/arch/sparc64/src/sun4v/start.S (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/src/sun4v/start.S (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -296,5 +296,5 @@ * Create the first stack frame. */ - save %sp, -(STACK_WINDWO_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp + save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp flushw add %g0, -STACK_BIAS, %fp Index: kernel/arch/sparc64/src/trap/sun4v/interrupt.c =================================================================== --- kernel/arch/sparc64/src/trap/sun4v/interrupt.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -111,5 +111,5 @@ ((void (*)(void)) data1)(); } else { - printf("Spurious interrupt on %d, data = %" PRIx64 ".\n", + printf("Spurious interrupt on %" PRIu64 ", data = %" PRIx64 ".\n", CPU->arch.id, data1); } Index: kernel/genarch/src/drivers/via-cuda/cuda.c =================================================================== --- kernel/genarch/src/drivers/via-cuda/cuda.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/genarch/src/drivers/via-cuda/cuda.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -239,9 +239,9 @@ cuda_instance_t *instance = irq->instance; cuda_t *dev = instance->cuda; - uint8_t data, b; - + uint8_t b; + b = pio_read_8(&dev->b); - data = pio_read_8(&dev->sr); - + pio_read_8(&dev->sr); + if ((b & TREQ) == 0) { instance->xstate = cx_receive; @@ -251,7 +251,7 @@ cuda_send_start(instance); } - - memcpy(buf, instance->rcv_buf, instance->bidx); - *len = instance->bidx; + + memcpy(buf, instance->rcv_buf, instance->bidx); + *len = instance->bidx; instance->bidx = 0; } Index: kernel/genarch/src/ofw/ebus.c =================================================================== --- kernel/genarch/src/ofw/ebus.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/genarch/src/ofw/ebus.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -39,5 +39,4 @@ #include #include -#include #include #include Index: kernel/genarch/src/ofw/fhc.c =================================================================== --- kernel/genarch/src/ofw/fhc.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/genarch/src/ofw/fhc.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -39,5 +39,4 @@ #include #include -#include #include #include Index: kernel/genarch/src/ofw/ofw_tree.c =================================================================== --- kernel/genarch/src/ofw/ofw_tree.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/genarch/src/ofw/ofw_tree.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -37,6 +37,6 @@ #include -#include #include +#include #include #include Index: kernel/genarch/src/ofw/pci.c =================================================================== --- kernel/genarch/src/ofw/pci.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/genarch/src/ofw/pci.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -40,5 +40,4 @@ #include #include -#include #include #include Index: kernel/genarch/src/ofw/upa.c =================================================================== --- kernel/genarch/src/ofw/upa.c (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/genarch/src/ofw/upa.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -38,5 +38,4 @@ #include #include -#include #include #include Index: kernel/generic/include/lib/memfnc.h =================================================================== --- kernel/generic/include/lib/memfnc.h (revision ccca251bb0673718b534366ace0e22857d73804b) +++ kernel/generic/include/lib/memfnc.h (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -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 f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ kernel/generic/include/memstr.h (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -37,13 +37,11 @@ #include -#include -/* - * Architecture independent variants. - */ -extern void *_memcpy(void *dst, const void *src, size_t cnt); -extern void _memsetb(void *dst, size_t cnt, uint8_t x); -extern void _memsetw(void *dst, size_t cnt, uint16_t x); -extern void *memmove(void *dst, const void *src, size_t cnt); +#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 *memmove(void *, const void *, size_t); #endif Index: kernel/generic/include/proc/tasklet.h =================================================================== --- kernel/generic/include/proc/tasklet.h (revision f6bffeebe3a4e9f347a03931d2c463a8718cd991) +++ (revision ) @@ -1,73 +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.h - * @brief Tasklets declarations - */ - -#ifndef KERN_TASKLET_H_ -#define KERN_TASKLET_H_ - -#include - -/** Tasklet callback type */ -typedef void (* tasklet_callback_t)(void *arg); - -/** Tasklet state */ -typedef enum { - NotActive, - Scheduled, - InProgress, - Disabled -} tasklet_state_t; - -/** Structure describing a tasklet */ -typedef struct tasklet_descriptor { - link_t link; - - /** Callback to call */ - tasklet_callback_t callback; - - /** Argument passed to the callback */ - void *arg; - - /** State of the tasklet */ - tasklet_state_t state; -} tasklet_descriptor_t; - - -extern void tasklet_init(void); - -#endif - -/** @} - */ Index: kernel/generic/src/lib/memfnc.c =================================================================== --- kernel/generic/src/lib/memfnc.c (revision ccca251bb0673718b534366ace0e22857d73804b) +++ kernel/generic/src/lib/memfnc.c (revision ccca251bb0673718b534366ace0e22857d73804b) @@ -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 ccca251bb0673718b534366ace0e22857d73804b) @@ -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 ccca251bb0673718b534366ace0e22857d73804b) @@ -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 ccca251bb0673718b534366ace0e22857d73804b) @@ -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"); -} - - -/** @} - */