Index: defaults/arm32/gta02/Makefile.config =================================================================== --- defaults/arm32/gta02/Makefile.config (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ defaults/arm32/gta02/Makefile.config (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -4,11 +4,2 @@ # RAM disk format RDFMT = tmpfs - -# Support for userspace debuggers -CONFIG_UDEBUG = n - -# Compile kernel tests -CONFIG_TEST = n - -# Barebone build with essential binaries only -CONFIG_BAREBONE = y Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/Makefile (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -240,4 +240,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 \ Index: rnel/arch/abs32le/include/memstr.h =================================================================== --- kernel/arch/abs32le/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/amd64/Makefile.inc (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/amd64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: rnel/arch/amd64/include/memstr.h =================================================================== --- kernel/arch/amd64/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/amd64/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: rnel/arch/arm32/include/memstr.h =================================================================== --- kernel/arch/arm32/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/arm32/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/arm32/src/exception.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -35,5 +35,4 @@ #include -#include #include #include Index: kernel/arch/ia32/_link.ld.in =================================================================== --- kernel/arch/ia32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ia32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: rnel/arch/ia32/include/memstr.h =================================================================== --- kernel/arch/ia32/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ia32/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ia32/src/cpu/cpu.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ia64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: rnel/arch/ia64/include/memstr.h =================================================================== --- kernel/arch/ia64/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ia64/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ia64/src/mm/tlb.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: rnel/arch/mips32/include/memstr.h =================================================================== --- kernel/arch/mips32/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/mips32/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ppc32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -36,6 +36,5 @@ kdata_start = .; *(K_DATA_START); - *(.rodata); - *(.rodata.*); + *(.rodata .rodata.*); *(.data); /* initialized data */ *(.sdata); Index: rnel/arch/ppc32/include/memstr.h =================================================================== --- kernel/arch/ppc32/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/ppc32/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/sparc64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: rnel/arch/sparc64/include/memstr.h =================================================================== --- kernel/arch/sparc64/include/memstr.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ (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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/sparc64/src/asm.S (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/sparc64/src/mm/sun4u/as.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/arch/sparc64/src/mm/sun4v/as.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -46,5 +46,4 @@ #include -#include #include #include Index: kernel/genarch/src/drivers/via-cuda/cuda.c =================================================================== --- kernel/genarch/src/drivers/via-cuda/cuda.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/genarch/src/drivers/via-cuda/cuda.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/genarch/src/ofw/ebus.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -39,5 +39,4 @@ #include #include -#include #include #include Index: kernel/genarch/src/ofw/fhc.c =================================================================== --- kernel/genarch/src/ofw/fhc.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/genarch/src/ofw/fhc.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/genarch/src/ofw/ofw_tree.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -37,6 +37,6 @@ #include -#include #include +#include #include #include Index: kernel/genarch/src/ofw/pci.c =================================================================== --- kernel/genarch/src/ofw/pci.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/genarch/src/ofw/pci.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -40,5 +40,4 @@ #include #include -#include #include #include Index: kernel/genarch/src/ofw/upa.c =================================================================== --- kernel/genarch/src/ofw/upa.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/genarch/src/ofw/upa.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -38,5 +38,4 @@ #include #include -#include #include #include Index: kernel/generic/include/lib/memfnc.h =================================================================== --- kernel/generic/include/lib/memfnc.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) +++ kernel/generic/include/lib/memfnc.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/generic/include/memstr.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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/src/lib/memfnc.c =================================================================== --- kernel/generic/src/lib/memfnc.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) +++ kernel/generic/src/lib/memfnc.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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 e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/generic/src/lib/memstr.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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/mm/backend_elf.c =================================================================== --- kernel/generic/src/mm/backend_elf.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ kernel/generic/src/mm/backend_elf.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -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: tools/autotool.py =================================================================== --- tools/autotool.py (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ tools/autotool.py (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -501,5 +501,5 @@ cross_prefix = os.environ['CROSS_PREFIX'] else: - cross_prefix = "/usr/local" + cross_prefix = "/usr/local/cross" # Prefix binutils tools on Solaris Index: tools/toolchain.sh =================================================================== --- tools/toolchain.sh (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ tools/toolchain.sh (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -52,4 +52,13 @@ #endif EOF + +BINUTILS_VERSION="2.21" +GCC_VERSION="4.6.0" + +BASEDIR="`pwd`" +BINUTILS="binutils-${BINUTILS_VERSION}.tar.bz2" +GCC_CORE="gcc-core-${GCC_VERSION}.tar.bz2" +GCC_OBJC="gcc-objc-${GCC_VERSION}.tar.bz2" +GCC_CPP="gcc-g++-${GCC_VERSION}.tar.bz2" # @@ -139,8 +148,9 @@ echo " sparc64 SPARC V9" echo " all build all targets" + echo " parallel same as 'all', but in parallel" echo echo "The toolchain will be installed to the directory specified by" echo "the CROSS_PREFIX environment variable. If the variable is not" - echo "defined, /usr/local will be used by default." + echo "defined, /usr/local/cross will be used by default." echo @@ -194,5 +204,5 @@ } -download_check() { +download_fetch() { SOURCE="$1" FILE="$2" @@ -208,4 +218,15 @@ } +source_check() { + FILE="$1" + + if [ ! -f "${FILE}" ]; then + echo + echo "File ${FILE} not found." + + exit 4 + fi +} + cleanup_dir() { DIR="$1" @@ -241,25 +262,16 @@ } -patch_binutils() { - PLATFORM="$1" - - if [ "${PLATFORM}" == "arm32" ] ; then - patch -p1 <tc_frag_data.first_map == NULL); - frag->tc_frag_data.first_map = symbolP; - } -- if (frag->tc_frag_data.last_map != NULL) -+ if (frag->tc_frag_data.last_map != NULL) { - know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP)); -+ } - frag->tc_frag_data.last_map = symbolP; - } -EOF - check_error $? "Error patching binutils" - fi +prepare() { + show_dependencies + check_dependecies + show_countdown 10 + + BINUTILS_SOURCE="ftp://ftp.gnu.org/gnu/binutils/" + GCC_SOURCE="ftp://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/" + + download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "c84c5acc9d266f1a7044b51c85a823f5" + download_fetch "${GCC_SOURCE}" "${GCC_CORE}" "b1957f3209080b2f55bc3756d3a62b7c" + download_fetch "${GCC_SOURCE}" "${GCC_OBJC}" "120d4675366ee82ea52f9ed65b57da04" + download_fetch "${GCC_SOURCE}" "${GCC_CPP}" "a30090fa655d0db4c970740d353c81f1" } @@ -268,16 +280,5 @@ TARGET="$2" - BINUTILS_VERSION="2.20" - GCC_VERSION="4.5.1" - - BINUTILS="binutils-${BINUTILS_VERSION}.tar.bz2" - GCC_CORE="gcc-core-${GCC_VERSION}.tar.bz2" - GCC_OBJC="gcc-objc-${GCC_VERSION}.tar.bz2" - GCC_CPP="gcc-g++-${GCC_VERSION}.tar.bz2" - - BINUTILS_SOURCE="ftp://ftp.gnu.org/gnu/binutils/" - GCC_SOURCE="ftp://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/" - - WORKDIR="`pwd`" + WORKDIR="${BASEDIR}/${PLATFORM}" BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}" GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}" @@ -285,5 +286,5 @@ if [ -z "${CROSS_PREFIX}" ] ; then - CROSS_PREFIX="/usr/local" + CROSS_PREFIX="/usr/local/cross" fi @@ -291,14 +292,12 @@ echo ">>> Downloading tarballs" - download_check "${BINUTILS_SOURCE}" "${BINUTILS}" "ee2d3e996e9a2d669808713360fa96f8" - download_check "${GCC_SOURCE}" "${GCC_CORE}" "dc8959e31b01a65ce10d269614815054" - download_check "${GCC_SOURCE}" "${GCC_OBJC}" "3c11b7037896e967eddf8178af2ddd98" - download_check "${GCC_SOURCE}" "${GCC_CPP}" "b294953ff0bb2f20c7acb2bf005d832a" + source_check "${BASEDIR}/${BINUTILS}" + source_check "${BASEDIR}/${GCC_CORE}" + source_check "${BASEDIR}/${GCC_OBJC}" + source_check "${BASEDIR}/${GCC_CPP}" echo ">>> Removing previous content" cleanup_dir "${PREFIX}" - cleanup_dir "${OBJDIR}" - cleanup_dir "${BINUTILSDIR}" - cleanup_dir "${GCCDIR}" + cleanup_dir "${WORKDIR}" create_dir "${PREFIX}" "destination directory" @@ -306,13 +305,15 @@ echo ">>> Unpacking tarballs" - unpack_tarball "${BINUTILS}" "binutils" - unpack_tarball "${GCC_CORE}" "GCC Core" - unpack_tarball "${GCC_OBJC}" "Objective C" - unpack_tarball "${GCC_CPP}" "C++" + cd "${WORKDIR}" + check_error $? "Change directory failed." + + unpack_tarball "${BASEDIR}/${BINUTILS}" "binutils" + unpack_tarball "${BASEDIR}/${GCC_CORE}" "GCC Core" + unpack_tarball "${BASEDIR}/${GCC_OBJC}" "Objective C" + unpack_tarball "${BASEDIR}/${GCC_CPP}" "C++" echo ">>> Processing binutils (${PLATFORM})" cd "${BINUTILSDIR}" check_error $? "Change directory failed." - patch_binutils "${PLATFORM}" change_title "binutils: configure (${PLATFORM})" @@ -336,11 +337,9 @@ check_error $? "Error compiling/installing GCC." - cd "${WORKDIR}" + cd "${BASEDIR}" check_error $? "Change directory failed." echo ">>> Cleaning up" - cleanup_dir "${OBJDIR}" - cleanup_dir "${BINUTILSDIR}" - cleanup_dir "${GCCDIR}" + cleanup_dir "${WORKDIR}" echo @@ -352,47 +351,50 @@ fi -show_dependencies -check_dependecies -show_countdown 10 - case "$1" in "amd64") + prepare build_target "amd64" "amd64-linux-gnu" ;; "arm32") + prepare build_target "arm32" "arm-linux-gnu" ;; "ia32") + prepare build_target "ia32" "i686-pc-linux-gnu" ;; "ia64") + prepare build_target "ia64" "ia64-pc-linux-gnu" ;; - "ia64") - build_target "ia64" "ia64-pc-linux-gnu" - ;; "mips32") + prepare build_target "mips32" "mipsel-linux-gnu" ;; "mips32eb") + prepare build_target "mips32eb" "mips-linux-gnu" ;; "mips64") + prepare build_target "mips64" "mips64el-linux-gnu" ;; "ppc32") + prepare build_target "ppc32" "ppc-linux-gnu" ;; "ppc64") + prepare build_target "ppc64" "ppc64-linux-gnu" ;; "sparc64") + prepare build_target "sparc64" "sparc64-linux-gnu" ;; "all") + prepare build_target "amd64" "amd64-linux-gnu" build_target "arm32" "arm-linux-gnu" build_target "ia32" "i686-pc-linux-gnu" - build_target "ia64" "ia64-pc-linux-gnu" build_target "ia64" "ia64-pc-linux-gnu" build_target "mips32" "mipsel-linux-gnu" @@ -403,4 +405,18 @@ build_target "sparc64" "sparc64-linux-gnu" ;; + "parallel") + prepare + build_target "amd64" "amd64-linux-gnu" & + build_target "arm32" "arm-linux-gnu" & + build_target "ia32" "i686-pc-linux-gnu" & + build_target "ia64" "ia64-pc-linux-gnu" & + build_target "mips32" "mipsel-linux-gnu" & + build_target "mips32eb" "mips-linux-gnu" & + build_target "mips64" "mips64el-linux-gnu" & + build_target "ppc32" "ppc-linux-gnu" & + build_target "ppc64" "ppc64-linux-gnu" & + build_target "sparc64" "sparc64-linux-gnu" & + wait + ;; *) show_usage Index: uspace/app/bdsh/cmds/modules/cat/cat.c =================================================================== --- uspace/app/bdsh/cmds/modules/cat/cat.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/app/bdsh/cmds/modules/cat/cat.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -164,5 +164,4 @@ { int fd, bytes = 0, count = 0, reads = 0; - off64_t total = 0; char *buff = NULL; int i; @@ -174,7 +173,4 @@ return 1; } - - total = lseek(fd, 0, SEEK_END); - lseek(fd, 0, SEEK_SET); if (NULL == (buff = (char *) malloc(blen + 1))) { Index: uspace/app/sbi/src/run_expr.c =================================================================== --- uspace/app/sbi/src/run_expr.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/app/sbi/src/run_expr.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -2529,4 +2529,6 @@ if (rc1 == EOK) rc2 = os_str_get_char(string->value, elem_index, &cval); + else + rc2 = EOK; if (rc1 != EOK || rc2 != EOK) { Index: uspace/app/tester/fault/fault2.c =================================================================== --- uspace/app/tester/fault/fault2.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/app/tester/fault/fault2.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -29,4 +29,5 @@ #include "../tester.h" +#include typedef int __attribute__((may_alias)) aliasing_int; @@ -38,4 +39,5 @@ var1 = *((aliasing_int *) (((char *) (&var)) + 1)); + printf("Read %d\n", var1); return "Survived unaligned read"; Index: uspace/app/trace/trace.c =================================================================== --- uspace/app/trace/trace.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/app/trace/trace.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -872,5 +872,5 @@ static display_mask_t parse_display_mask(const char *text) { - display_mask_t dm; + display_mask_t dm = 0; const char *c = text; Index: uspace/drv/ohci/hc.c =================================================================== --- uspace/drv/ohci/hc.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/drv/ohci/hc.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -58,5 +58,5 @@ char *match_str = NULL; - int ret = asprintf(&match_str, "usb&mid"); + int ret = asprintf(&match_str, "usb&class=hub"); ret = (match_str == NULL) ? ret : EOK; if (ret < 0) { Index: uspace/drv/ohci/ohci.c =================================================================== --- uspace/drv/ohci/ohci.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/drv/ohci/ohci.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -31,5 +31,5 @@ */ /** @file - * @brief UHCI driver + * @brief OHCI driver */ #include @@ -117,10 +117,10 @@ /** Initialize hc and rh ddf structures and their respective drivers. * - * @param[in] instance UHCI structure to use. + * @param[in] instance OHCI structure to use. * @param[in] device DDF instance of the device to use. * * This function does all the preparatory work for hc and rh drivers: * - gets device hw resources - * - disables UHCI legacy support + * - disables OHCI legacy support * - asks for interrupt * - registers interrupt handler @@ -185,5 +185,5 @@ ret = ddf_fun_bind(instance->hc_fun); CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to bind UHCI device function: %s.\n", + "Failed(%d) to bind OHCI device function: %s.\n", ret, str_error(ret)); #undef CHECK_RET_HC_RETURN @@ -216,5 +216,5 @@ ret = ddf_fun_bind(instance->rh_fun); CHECK_RET_FINI_RETURN(ret, - "Failed(%d) to register UHCI root hub.\n", ret); + "Failed(%d) to register OHCI root hub.\n", ret); return EOK; Index: uspace/lib/c/arch/abs32le/_link.ld.in =================================================================== --- uspace/lib/c/arch/abs32le/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/abs32le/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -11,6 +11,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/amd64/_link.ld.in =================================================================== --- uspace/lib/c/arch/amd64/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/amd64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -16,6 +16,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/arm32/_link.ld.in =================================================================== --- uspace/lib/c/arch/arm32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/arm32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/ia32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/ia32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -16,6 +16,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/ia64/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia64/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/ia64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text @@ -23,5 +23,5 @@ .got : { _gp = .; - *(.got*); + *(.got .got.*); } :data Index: uspace/lib/c/arch/mips32/_link.ld.in =================================================================== --- uspace/lib/c/arch/mips32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/mips32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/ppc32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ppc32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/ppc32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/sparc64/_link.ld.in =================================================================== --- uspace/lib/c/arch/sparc64/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/arch/sparc64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/generic/net/packet.c =================================================================== --- uspace/lib/c/generic/net/packet.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/generic/net/packet.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -190,5 +190,5 @@ } } - gpm_destroy(&pm_globals.packet_map); + gpm_destroy(&pm_globals.packet_map, free); /* leave locked */ } Index: uspace/lib/c/generic/net/socket_client.c =================================================================== --- uspace/lib/c/generic/net/socket_client.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/generic/net/socket_client.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -749,5 +749,5 @@ dyn_fifo_destroy(&socket->received); dyn_fifo_destroy(&socket->accepted); - sockets_exclude(socket_get_sockets(), socket->socket_id); + sockets_exclude(socket_get_sockets(), socket->socket_id, free); } Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/generic/vfs/vfs.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -756,8 +756,9 @@ { struct stat stat; - int rc; - - rc = fstat(fildes, &stat); - + + int rc = fstat(fildes, &stat); + if (rc != 0) + return rc; + if (!stat.device) return -1; Index: uspace/lib/c/include/adt/generic_char_map.h =================================================================== --- uspace/lib/c/include/adt/generic_char_map.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/include/adt/generic_char_map.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -47,4 +47,8 @@ #define GENERIC_CHAR_MAP_MAGIC_VALUE 0x12345622 +/** Generic destructor function pointer. */ +#define DTOR_T(identifier) \ + void (*identifier)(const void *) + /** Character string to generic type map declaration. * @param[in] name Name of the map. @@ -64,6 +68,6 @@ int name##_add(name##_t *, const uint8_t *, const size_t, type *); \ int name##_count(name##_t *); \ - void name##_destroy(name##_t *); \ - void name##_exclude(name##_t *, const uint8_t *, const size_t); \ + void name##_destroy(name##_t *, DTOR_T()); \ + void name##_exclude(name##_t *, const uint8_t *, const size_t, DTOR_T()); \ type *name##_find(name##_t *, const uint8_t *, const size_t); \ int name##_initialize(name##_t *); \ @@ -84,5 +88,4 @@ type *value) \ { \ - int rc; \ int index; \ if (!name##_is_valid(map)) \ @@ -91,10 +94,5 @@ if (index < 0) \ return index; \ - rc = char_map_add(&map->names, name, length, index); \ - if (rc != EOK) { \ - name##_items_exclude_index(&map->values, index); \ - return rc; \ - } \ - return EOK; \ + return char_map_add(&map->names, name, length, index); \ } \ \ @@ -105,14 +103,14 @@ } \ \ - void name##_destroy(name##_t *map) \ + void name##_destroy(name##_t *map, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ char_map_destroy(&map->names); \ - name##_items_destroy(&map->values); \ + name##_items_destroy(&map->values, dtor); \ } \ } \ \ void name##_exclude(name##_t *map, const uint8_t *name, \ - const size_t length) \ + const size_t length, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -121,5 +119,5 @@ if (index != CHAR_MAP_NULL) \ name##_items_exclude_index(&map->values, \ - index); \ + index, dtor); \ } \ } \ Index: uspace/lib/c/include/adt/generic_field.h =================================================================== --- uspace/lib/c/include/adt/generic_field.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/include/adt/generic_field.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -46,4 +46,8 @@ #define GENERIC_FIELD_MAGIC_VALUE 0x55667788 +/** Generic destructor function pointer. */ +#define DTOR_T(identifier) \ + void (*identifier)(const void *) + /** Generic type field declaration. * @@ -63,6 +67,6 @@ int name##_add(name##_t *, type *); \ int name##_count(name##_t *); \ - void name##_destroy(name##_t *); \ - void name##_exclude_index(name##_t *, int); \ + void name##_destroy(name##_t *, DTOR_T()); \ + void name##_exclude_index(name##_t *, int, DTOR_T()); \ type **name##_get_field(name##_t *); \ type *name##_get_index(name##_t *, int); \ @@ -103,12 +107,14 @@ } \ \ - void name##_destroy(name##_t *field) \ + void name##_destroy(name##_t *field, DTOR_T(dtor)) \ { \ if (name##_is_valid(field)) { \ int index; \ field->magic = 0; \ - for (index = 0; index < field->next; index++) { \ - if (field->items[index]) \ - free(field->items[index]); \ + if (dtor) { \ + for (index = 0; index < field->next; index++) { \ + if (field->items[index]) \ + dtor(field->items[index]); \ + } \ } \ free(field->items); \ @@ -116,9 +122,10 @@ } \ \ - void name##_exclude_index(name##_t *field, int index) \ + void name##_exclude_index(name##_t *field, int index, DTOR_T(dtor)) \ { \ if (name##_is_valid(field) && (index >= 0) && \ (index < field->next) && (field->items[index])) { \ - free(field->items[index]); \ + if (dtor) \ + dtor(field->items[index]); \ field->items[index] = NULL; \ } \ Index: uspace/lib/c/include/adt/int_map.h =================================================================== --- uspace/lib/c/include/adt/int_map.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/c/include/adt/int_map.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -49,4 +49,8 @@ #define INT_MAP_ITEM_MAGIC_VALUE 0x55667788 +/** Generic destructor function pointer. */ +#define DTOR_T(identifier) \ + void (*identifier)(const void *) + /** Integer to generic type map declaration. * @@ -72,9 +76,9 @@ \ int name##_add(name##_t *, int, type *); \ - void name##_clear(name##_t *); \ + void name##_clear(name##_t *, DTOR_T()); \ int name##_count(name##_t *); \ - void name##_destroy(name##_t *); \ - void name##_exclude(name##_t *, int); \ - void name##_exclude_index(name##_t *, int); \ + void name##_destroy(name##_t *, DTOR_T()); \ + void name##_exclude(name##_t *, int, DTOR_T()); \ + void name##_exclude_index(name##_t *, int, DTOR_T()); \ type *name##_find(name##_t *, int); \ int name##_update(name##_t *, int, int); \ @@ -82,5 +86,5 @@ int name##_initialize(name##_t *); \ int name##_is_valid(name##_t *); \ - void name##_item_destroy(name##_item_t *); \ + void name##_item_destroy(name##_item_t *, DTOR_T()); \ int name##_item_is_valid(name##_item_t *); @@ -115,5 +119,5 @@ } \ \ - void name##_clear(name##_t *map) \ + void name##_clear(name##_t *map, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -122,5 +126,5 @@ if (name##_item_is_valid(&map->items[index])) { \ name##_item_destroy( \ - &map->items[index]); \ + &map->items[index], dtor); \ } \ } \ @@ -135,5 +139,5 @@ } \ \ - void name##_destroy(name##_t *map) \ + void name##_destroy(name##_t *map, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -143,5 +147,5 @@ if (name##_item_is_valid(&map->items[index])) { \ name##_item_destroy( \ - &map->items[index]); \ + &map->items[index], dtor); \ } \ } \ @@ -150,5 +154,5 @@ } \ \ - void name##_exclude(name##_t *map, int key) \ + void name##_exclude(name##_t *map, int key, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -158,16 +162,16 @@ (map->items[index].key == key)) { \ name##_item_destroy( \ - &map->items[index]); \ - } \ - } \ - } \ - } \ - \ - void name##_exclude_index(name##_t *map, int index) \ + &map->items[index], dtor); \ + } \ + } \ + } \ + } \ + \ + void name##_exclude_index(name##_t *map, int index, DTOR_T(dtor)) \ { \ if (name##_is_valid(map) && (index >= 0) && \ (index < map->next) && \ name##_item_is_valid(&map->items[index])) { \ - name##_item_destroy(&map->items[index]); \ + name##_item_destroy(&map->items[index], dtor); \ } \ } \ @@ -236,10 +240,11 @@ } \ \ - void name##_item_destroy(name##_item_t *item) \ + void name##_item_destroy(name##_item_t *item, DTOR_T(dtor)) \ { \ if (name##_item_is_valid(item)) { \ item->magic = 0; \ if (item->value) { \ - free(item->value); \ + if (dtor) \ + dtor(item->value); \ item->value = NULL; \ } \ Index: uspace/lib/net/tl/socket_core.c =================================================================== --- uspace/lib/net/tl/socket_core.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/net/tl/socket_core.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -107,5 +107,5 @@ socket_release(socket); - socket_cores_exclude(local_sockets, socket->socket_id); + socket_cores_exclude(local_sockets, socket->socket_id, free); } @@ -230,5 +230,5 @@ fail: - socket_port_map_destroy(&socket_port->map); + socket_port_map_destroy(&socket_port->map, free); free(socket_port); return rc; @@ -649,12 +649,12 @@ if (socket_port->count <= 0) { // destroy the map - socket_port_map_destroy(&socket_port->map); + socket_port_map_destroy(&socket_port->map, free); // release the port socket_ports_exclude(global_sockets, - socket->port); + socket->port, free); } else { // remove socket_port_map_exclude(&socket_port->map, - socket->key, socket->key_length); + socket->key, socket->key_length, free); } } Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/lib/net/tl/tl_common.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -182,5 +182,5 @@ else packet_dimensions_exclude(packet_dimensions, - DEVICE_INVALID_ID); + DEVICE_INVALID_ID, free); } } Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/devman/devman.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -274,9 +274,10 @@ } - if (read(fd, buf, len) <= 0) { + ssize_t read_bytes = safe_read(fd, buf, len); + if (read_bytes <= 0) { printf(NAME ": unable to read file '%s'.\n", conf_path); goto cleanup; } - buf[len] = 0; + buf[read_bytes] = 0; suc = parse_match_ids(buf, ids); @@ -1131,4 +1132,11 @@ fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path) { + assert(path != NULL); + + bool is_absolute = path[0] == '/'; + if (!is_absolute) { + return NULL; + } + fibril_rwlock_read_lock(&tree->rwlock); @@ -1140,5 +1148,5 @@ char *rel_path = path; char *next_path_elem = NULL; - bool cont = (rel_path[0] == '/'); + bool cont = true; while (cont && fun != NULL) { Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/devman/main.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -477,5 +477,11 @@ dev = fun->dev; - if (fun == NULL && dev == NULL) { + /* + * For a valid function to connect to we need a device. The root + * function, for example, has no device and cannot be connected to. + * This means @c dev needs to be valid regardless whether we are + * connecting to a device or to a function. + */ + if (dev == NULL) { printf(NAME ": devman_forward error - no device or function with " "handle %" PRIun " was found.\n", handle); Index: uspace/srv/devman/util.c =================================================================== --- uspace/srv/devman/util.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/devman/util.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -111,4 +111,31 @@ } +ssize_t safe_read(int fd, void *buffer, size_t size) +{ + if (size == 0) { + return 0; + } + + uint8_t *buf_ptr = (uint8_t *) buffer; + + size_t total_read = 0; + while (total_read < size) { + ssize_t bytes_read = read(fd, buf_ptr, size - total_read); + if (bytes_read < 0) { + /* Error. */ + return bytes_read; + } else if (bytes_read == 0) { + /* Possibly end of file. */ + break; + } else { + /* Read at least something. */ + buf_ptr += bytes_read; + total_read += bytes_read; + } + } + + return (ssize_t) total_read; +} + /** @} */ Index: uspace/srv/devman/util.h =================================================================== --- uspace/srv/devman/util.h (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/devman/util.h (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -47,4 +47,6 @@ extern void replace_char(char *, char, char); +extern ssize_t safe_read(int, void *, size_t); + #endif Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -367,9 +367,9 @@ static void cuda_irq_rcv_end(void *buf, size_t *len) { - 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; @@ -379,7 +379,7 @@ cuda_send_start(); } - - memcpy(buf, instance->rcv_buf, instance->bidx); - *len = instance->bidx; + + memcpy(buf, instance->rcv_buf, instance->bidx); + *len = instance->bidx; instance->bidx = 0; } Index: uspace/srv/hw/netif/ne2000/dp8390.c =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/hw/netif/ne2000/dp8390.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -391,4 +391,5 @@ if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { + fibril_mutex_unlock(&ne2k->sq_mutex); fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n", NAME, size); Index: uspace/srv/loader/arch/abs32le/_link.ld.in =================================================================== --- uspace/srv/loader/arch/abs32le/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/abs32le/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -21,6 +21,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/amd64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/amd64/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/amd64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -27,6 +27,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/arm32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/arm32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/arm32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ia32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ia32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/ia32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -26,6 +26,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ia64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ia64/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/ia64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -21,6 +21,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text @@ -29,5 +29,5 @@ .got : { _gp = .; - *(.got*); + *(.got .got.*); } :data Index: uspace/srv/loader/arch/mips32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/mips32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/mips32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ppc32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ppc32/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/ppc32/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/sparc64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/sparc64/_link.ld.in (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/arch/sparc64/_link.ld.in (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -20,6 +20,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/loader/main.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -407,12 +407,10 @@ /* Not reached */ default: - retval = ENOENT; + retval = EINVAL; break; } - if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) { - DPRINTF("Responding EINVAL to method %d.\n", - IPC_GET_IMETHOD(call)); - async_answer_0(callid, EINVAL); - } + + if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) + async_answer_0(callid, retval); } } Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/net/il/arp/arp.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -157,9 +157,9 @@ arp_clear_addr(&proto->addresses); - arp_addr_destroy(&proto->addresses); - } - } - - arp_protos_clear(&device->protos); + arp_addr_destroy(&proto->addresses, free); + } + } + + arp_protos_clear(&device->protos, free); } @@ -184,5 +184,5 @@ } - arp_cache_clear(&arp_globals.cache); + arp_cache_clear(&arp_globals.cache, free); fibril_mutex_unlock(&arp_globals.lock); @@ -212,5 +212,5 @@ arp_clear_trans(trans); - arp_addr_exclude(&proto->addresses, address->value, address->length); + arp_addr_exclude(&proto->addresses, address->value, address->length, free); fibril_mutex_unlock(&arp_globals.lock); @@ -345,5 +345,5 @@ header->protocol_length, trans); if (rc != EOK) { - /* The generic char map has already freed trans! */ + free(trans); return rc; } @@ -556,5 +556,5 @@ if (index < 0) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return index; @@ -569,5 +569,5 @@ if (device->phone < 0) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return EREFUSED; @@ -579,5 +579,5 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -589,5 +589,5 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -601,5 +601,5 @@ free(device->addr); free(device->addr_data); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -614,5 +614,5 @@ free(device->broadcast_addr); free(device->broadcast_data); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -746,5 +746,5 @@ arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, target->value, - target->length); + target->length, free); return EAGAIN; } @@ -794,5 +794,5 @@ trans); if (rc != EOK) { - /* The generic char map has already freed trans! */ + free(trans); return rc; } @@ -807,5 +807,5 @@ arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, target->value, - target->length); + target->length, free); return ENOENT; } Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/net/il/ip/ip.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -505,5 +505,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&ip_globals.netifs_lock); - ip_routes_destroy(&ip_netif->routes); + ip_routes_destroy(&ip_netif->routes, free); free(ip_netif); return rc; Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/net/net/net.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -555,5 +555,5 @@ rc = read_netif_configuration(conf_files[i], netif); if (rc != EOK) { - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return rc; @@ -565,5 +565,5 @@ if (!setting) { fprintf(stderr, "%s: Network interface name is missing\n", NAME); - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return EINVAL; @@ -574,5 +574,5 @@ int index = netifs_add(&net_globals.netifs, netif->id, netif); if (index < 0) { - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return index; @@ -586,6 +586,6 @@ index); if (rc != EOK) { - measured_strings_destroy(&netif->configuration); - netifs_exclude_index(&net_globals.netifs, index); + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); return rc; } @@ -595,6 +595,6 @@ printf("%s: Ignoring failed interface %s (%s)\n", NAME, netif->name, str_error(rc)); - measured_strings_destroy(&netif->configuration); - netifs_exclude_index(&net_globals.netifs, index); + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); continue; } Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/net/nil/eth/eth.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -214,5 +214,5 @@ if (rc != EOK) { free(eth_globals.broadcast_addr); - eth_devices_destroy(ð_globals.devices); + eth_devices_destroy(ð_globals.devices, free); } out: Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/net/tl/tcp/tcp.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -1707,5 +1707,5 @@ if (socket->port > 0) { socket_ports_exclude(&tcp_globals.sockets, - socket->port); + socket->port, free); socket->port = 0; } @@ -2492,5 +2492,5 @@ rc = packet_dimensions_initialize(&tcp_globals.dimensions); if (rc != EOK) { - socket_ports_destroy(&tcp_globals.sockets); + socket_ports_destroy(&tcp_globals.sockets, free); goto out; } Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision e4153eadfe26585d8652d9e38196d2cf564007fa) +++ uspace/srv/net/tl/udp/udp.c (revision 1b9c0e2c917259e643c58faaf9a7be28901dae7f) @@ -417,5 +417,5 @@ rc = packet_dimensions_initialize(&udp_globals.dimensions); if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); + socket_ports_destroy(&udp_globals.sockets, free); fibril_rwlock_write_unlock(&udp_globals.lock); return rc; @@ -434,5 +434,5 @@ &data); if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); + socket_ports_destroy(&udp_globals.sockets, free); fibril_rwlock_write_unlock(&udp_globals.lock); return rc;