Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/Makefile (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -59,6 +59,4 @@ -include arch/$(UARCH)/Makefile.inc -EXTRA_CFLAGS += -I../../srv/loader/include - GENERIC_SOURCES = \ generic/libc.c \ @@ -71,4 +69,5 @@ generic/device/hw_res.c \ generic/device/char_dev.c \ + generic/elf/elf_load.c \ generic/event.c \ generic/errno.c \ @@ -134,5 +133,4 @@ generic/dlfcn.c \ generic/rtld/rtld.c \ - generic/rtld/elf_load.c \ generic/rtld/dynamic.c \ generic/rtld/module.c \ Index: uspace/lib/c/arch/abs32le/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/abs32le/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/abs32le/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_ELF_LINUX_H_ +#define LBIC_abs32le_ELF_LINUX_H_ + +#include +#include + +typedef struct { +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/types.h =================================================================== --- uspace/lib/c/arch/abs32le/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/abs32le/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -51,4 +51,5 @@ typedef uint32_t size_t; +typedef int32_t intptr_t; typedef uint32_t uintptr_t; typedef uint32_t atomic_count_t; Index: uspace/lib/c/arch/amd64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/amd64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/amd64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_ELF_LINUX_H_ +#define LBIC_amd64_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint64_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/types.h =================================================================== --- uspace/lib/c/arch/amd64/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/amd64/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -51,4 +51,5 @@ typedef uint64_t size_t; +typedef int64_t intptr_t; typedef uint64_t uintptr_t; typedef uint64_t atomic_count_t; Index: uspace/lib/c/arch/arm32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/arm32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/arm32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcarm32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_arm32_ELF_LINUX_H_ +#define LBIC_arm32_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint32_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/types.h =================================================================== --- uspace/lib/c/arch/arm32/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/arm32/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -52,4 +52,5 @@ typedef uint32_t size_t; +typedef int32_t intptr_t; typedef uint32_t uintptr_t; typedef uint32_t atomic_count_t; Index: uspace/lib/c/arch/ia32/include/atomic.h =================================================================== --- uspace/lib/c/arch/ia32/include/atomic.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/ia32/include/atomic.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -43,6 +43,6 @@ { asm volatile ( - "lock incl %[count]\n" - : [count] "+m" (val->count) + "lock incl %0\n" + : "+m" (val->count) ); } @@ -51,6 +51,6 @@ { asm volatile ( - "lock decl %[count]\n" - : [count] "+m" (val->count) + "lock decl %0\n" + : "+m" (val->count) ); } @@ -61,7 +61,7 @@ asm volatile ( - "lock xaddl %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) + "lock xaddl %1, %0\n" + : "+m" (val->count), + "+r" (r) ); @@ -74,7 +74,7 @@ asm volatile ( - "lock xaddl %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) + "lock xaddl %1, %0\n" + : "+m" (val->count), + "+r" (r) ); Index: uspace/lib/c/arch/ia32/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/ddi.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/ia32/include/ddi.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -44,7 +44,7 @@ asm volatile ( - "inb %w[port], %b[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inb %w1, %b0\n" + : "=a" (val) + : "d" (port) ); @@ -57,7 +57,7 @@ asm volatile ( - "inw %w[port], %w[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inw %w1, %w0\n" + : "=a" (val) + : "d" (port) ); @@ -70,7 +70,7 @@ asm volatile ( - "inl %w[port], %[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inl %w1, %0\n" + : "=a" (val) + : "d" (port) ); @@ -81,6 +81,6 @@ { asm volatile ( - "outb %b[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outb %b0, %w1\n" + :: "a" (val), "d" (port) ); } @@ -89,6 +89,6 @@ { asm volatile ( - "outw %w[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outw %w0, %w1\n" + :: "a" (val), "d" (port) ); } @@ -97,6 +97,6 @@ { asm volatile ( - "outl %[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outl %0, %w1\n" + :: "a" (val), "d" (port) ); } Index: uspace/lib/c/arch/ia32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/ia32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_ELF_LINUX_H_ +#define LBIC_ia32_ELF_LINUX_H_ + +#include +#include + +typedef struct { + uint32_t ebx; + uint32_t ecx; + uint32_t edx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + uint32_t eax; + uint32_t ds; + uint32_t es; + uint32_t fs; + uint32_t gs; + uint32_t old_eax; + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t esp; + uint32_t ss; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->ebx = istate->ebx; + elf_regs->ecx = istate->ecx; + elf_regs->edx = istate->edx; + elf_regs->esi = istate->esi; + elf_regs->edi = istate->edi; + elf_regs->ebp = istate->ebp; + elf_regs->eax = istate->eax; + + elf_regs->ds = istate->ds; + elf_regs->es = istate->es; + elf_regs->fs = istate->fs; + elf_regs->gs = istate->gs; + + elf_regs->old_eax = 0; + elf_regs->eip = istate->eip; + elf_regs->cs = istate->cs; + elf_regs->eflags = istate->eflags; + elf_regs->esp = istate->esp; + elf_regs->ss = istate->ss; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/types.h =================================================================== --- uspace/lib/c/arch/ia32/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/ia32/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -51,4 +51,5 @@ typedef uint32_t size_t; +typedef int32_t intptr_t; typedef uint32_t uintptr_t; typedef uint32_t atomic_count_t; Index: uspace/lib/c/arch/ia64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/ia64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_ELF_LINUX_H_ +#define LBIC_ia64_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint64_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/types.h =================================================================== --- uspace/lib/c/arch/ia64/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/ia64/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -61,4 +61,5 @@ typedef uint64_t size_t; +typedef int64_t intptr_t; typedef uint64_t uintptr_t; typedef uint64_t atomic_count_t; Index: uspace/lib/c/arch/mips32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/mips32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32_ELF_LINUX_H_ +#define LBIC_mips32_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint32_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/types.h =================================================================== --- uspace/lib/c/arch/mips32/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/mips32/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -52,4 +52,5 @@ typedef uint32_t size_t; +typedef int32_t intptr_t; typedef uint32_t uintptr_t; typedef uint32_t atomic_count_t; Index: uspace/lib/c/arch/mips32eb/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/mips32eb/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,1 @@ +../../mips32/include/elf_linux.h Index: uspace/lib/c/arch/mips64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/mips64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_ELF_LINUX_H_ +#define LBIC_mips64_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint64_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ppc32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/ppc32/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_ELF_LINUX_H_ +#define LBIC_ppc32_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint32_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/types.h =================================================================== --- uspace/lib/c/arch/ppc32/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/ppc32/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -51,4 +51,5 @@ typedef uint32_t size_t; +typedef int32_t intptr_t; typedef uint32_t uintptr_t; typedef uint32_t atomic_count_t; Index: uspace/lib/c/arch/sparc64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/sparc64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/arch/sparc64/include/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_ELF_LINUX_H_ +#define LBIC_sparc64_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint64_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/types.h =================================================================== --- uspace/lib/c/arch/sparc64/include/types.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/arch/sparc64/include/types.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -51,4 +51,5 @@ typedef uint64_t size_t; +typedef int64_t intptr_t; typedef uint64_t uintptr_t; typedef uint64_t atomic_count_t; Index: uspace/lib/c/generic/elf/elf_load.c =================================================================== --- uspace/lib/c/generic/elf/elf_load.c (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/generic/elf/elf_load.c (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,482 @@ +/* + * Copyright (c) 2006 Sergey Bondari + * Copyright (c) 2006 Jakub Jermar + * Copyright (c) 2011 Jiri Svoboda + * 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 Userspace ELF loader. + * + * This module allows loading ELF binaries (both executables and + * shared objects) from VFS. The current implementation allocates + * anonymous memory, fills it with segment data and then adjusts + * the memory areas' flags to the final value. In the future, + * the segments will be mapped directly from the file. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define DPRINTF(...) + +static const char *error_codes[] = { + "no error", + "invalid image", + "address space error", + "incompatible image", + "unsupported image type", + "irrecoverable error" +}; + +static unsigned int elf_load(elf_ld_t *elf, size_t so_bias); +static int segment_header(elf_ld_t *elf, elf_segment_header_t *entry); +static int section_header(elf_ld_t *elf, elf_section_header_t *entry); +static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry); + +/** Read until the buffer is read in its entirety. */ +static int my_read(int fd, void *buf, size_t len) +{ + int cnt = 0; + do { + buf += cnt; + len -= cnt; + cnt = read(fd, buf, len); + } while ((cnt > 0) && ((len - cnt) > 0)); + + return cnt; +} + +/** Load ELF binary from a file. + * + * Load an ELF binary from the specified file. If the file is + * an executable program, it is loaded unbiased. If it is a shared + * object, it is loaded with the bias @a so_bias. Some information + * extracted from the binary is stored in a elf_info_t structure + * pointed to by @a info. + * + * @param file_name Path to the ELF file. + * @param so_bias Bias to use if the file is a shared object. + * @param info Pointer to a structure for storing information + * extracted from the binary. + * + * @return EOK on success or negative error code. + * + */ +int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags, + elf_info_t *info) +{ + elf_ld_t elf; + + int fd; + int rc; + + fd = open(file_name, O_RDONLY); + if (fd < 0) { + DPRINTF("failed opening file\n"); + return -1; + } + + elf.fd = fd; + elf.info = info; + elf.flags = flags; + + rc = elf_load(&elf, so_bias); + + close(fd); + + return rc; +} + +/** Create the program control block (PCB). + * + * Fills the program control block @a pcb with information from + * @a info. + * + * @param info Program info structure + * @return EOK on success or negative error code + */ +void elf_create_pcb(elf_info_t *info, pcb_t *pcb) +{ + pcb->entry = info->entry; + pcb->dynamic = info->dynamic; + pcb->rtld_runtime = NULL; +} + + +/** Load an ELF binary. + * + * The @a elf structure contains the loader state, including + * an open file, from which the binary will be loaded, + * a pointer to the @c info structure etc. + * + * @param elf Pointer to loader state buffer. + * @param so_bias Bias to use if the file is a shared object. + * @return EE_OK on success or EE_xx error code. + */ +static unsigned int elf_load(elf_ld_t *elf, size_t so_bias) +{ + elf_header_t header_buf; + elf_header_t *header = &header_buf; + int i, rc; + + rc = my_read(elf->fd, header, sizeof(elf_header_t)); + if (rc < 0) { + DPRINTF("Read error.\n"); + return EE_INVALID; + } + + elf->header = header; + + /* Identify ELF */ + if (header->e_ident[EI_MAG0] != ELFMAG0 || + header->e_ident[EI_MAG1] != ELFMAG1 || + header->e_ident[EI_MAG2] != ELFMAG2 || + header->e_ident[EI_MAG3] != ELFMAG3) { + DPRINTF("Invalid header.\n"); + return EE_INVALID; + } + + /* Identify ELF compatibility */ + if (header->e_ident[EI_DATA] != ELF_DATA_ENCODING || + header->e_machine != ELF_MACHINE || + header->e_ident[EI_VERSION] != EV_CURRENT || + header->e_version != EV_CURRENT || + header->e_ident[EI_CLASS] != ELF_CLASS) { + DPRINTF("Incompatible data/version/class.\n"); + return EE_INCOMPATIBLE; + } + + if (header->e_phentsize != sizeof(elf_segment_header_t)) { + DPRINTF("e_phentsize:%d != %d\n", header->e_phentsize, + sizeof(elf_segment_header_t)); + return EE_INCOMPATIBLE; + } + + if (header->e_shentsize != sizeof(elf_section_header_t)) { + DPRINTF("e_shentsize:%d != %d\n", header->e_shentsize, + sizeof(elf_section_header_t)); + return EE_INCOMPATIBLE; + } + + /* Check if the object type is supported. */ + if (header->e_type != ET_EXEC && header->e_type != ET_DYN) { + DPRINTF("Object type %d is not supported\n", header->e_type); + return EE_UNSUPPORTED; + } + + /* Shared objects can be loaded with a bias */ + if (header->e_type == ET_DYN) + elf->bias = so_bias; + else + elf->bias = 0; + + elf->info->interp = NULL; + elf->info->dynamic = NULL; + + /* Walk through all segment headers and process them. */ + for (i = 0; i < header->e_phnum; i++) { + elf_segment_header_t segment_hdr; + + /* Seek to start of segment header */ + lseek(elf->fd, header->e_phoff + + i * sizeof(elf_segment_header_t), SEEK_SET); + + rc = my_read(elf->fd, &segment_hdr, + sizeof(elf_segment_header_t)); + if (rc < 0) { + DPRINTF("Read error.\n"); + return EE_INVALID; + } + + rc = segment_header(elf, &segment_hdr); + if (rc != EE_OK) + return rc; + } + + DPRINTF("Parse sections.\n"); + + /* Inspect all section headers and proccess them. */ + for (i = 0; i < header->e_shnum; i++) { + elf_section_header_t section_hdr; + + /* Seek to start of section header */ + lseek(elf->fd, header->e_shoff + + i * sizeof(elf_section_header_t), SEEK_SET); + + rc = my_read(elf->fd, §ion_hdr, + sizeof(elf_section_header_t)); + if (rc < 0) { + DPRINTF("Read error.\n"); + return EE_INVALID; + } + + rc = section_header(elf, §ion_hdr); + if (rc != EE_OK) + return rc; + } + + elf->info->entry = + (entry_point_t)((uint8_t *)header->e_entry + elf->bias); + + DPRINTF("Done.\n"); + + return EE_OK; +} + +/** Print error message according to error code. + * + * @param rc Return code returned by elf_load(). + * + * @return NULL terminated description of error. + */ +const char *elf_error(unsigned int rc) +{ + assert(rc < sizeof(error_codes) / sizeof(char *)); + + return error_codes[rc]; +} + +/** Process segment header. + * + * @param entry Segment header. + * + * @return EE_OK on success, error code otherwise. + */ +static int segment_header(elf_ld_t *elf, elf_segment_header_t *entry) +{ + switch (entry->p_type) { + case PT_NULL: + case PT_PHDR: + case PT_NOTE: + break; + case PT_LOAD: + return load_segment(elf, entry); + break; + case PT_INTERP: + /* Assume silently interp == "/app/dload" */ + elf->info->interp = "/app/dload"; + break; + case PT_DYNAMIC: + /* Record pointer to dynamic section into info structure */ + elf->info->dynamic = + (void *)((uint8_t *)entry->p_vaddr + elf->bias); + DPRINTF("dynamic section found at 0x%x\n", + (uintptr_t)elf->info->dynamic); + break; + case 0x70000000: + /* FIXME: MIPS reginfo */ + break; + case PT_SHLIB: +// case PT_LOPROC: +// case PT_HIPROC: + default: + DPRINTF("Segment p_type %d unknown.\n", entry->p_type); + return EE_UNSUPPORTED; + break; + } + return EE_OK; +} + +/** Load segment described by program header entry. + * + * @param elf Loader state. + * @param entry Program header entry describing segment to be loaded. + * + * @return EE_OK on success, error code otherwise. + */ +int load_segment(elf_ld_t *elf, elf_segment_header_t *entry) +{ + void *a; + int flags = 0; + uintptr_t bias; + uintptr_t base; + void *seg_ptr; + uintptr_t seg_addr; + size_t mem_sz; + int rc; + + bias = elf->bias; + + seg_addr = entry->p_vaddr + bias; + seg_ptr = (void *) seg_addr; + + DPRINTF("Load segment at addr %p, size 0x%x\n", (void *) seg_addr, + entry->p_memsz); + + if (entry->p_align > 1) { + if ((entry->p_offset % entry->p_align) != + (seg_addr % entry->p_align)) { + DPRINTF("Align check 1 failed offset%%align=%d, " + "vaddr%%align=%d\n", + entry->p_offset % entry->p_align, + seg_addr % entry->p_align + ); + return EE_INVALID; + } + } + + /* Final flags that will be set for the memory area */ + + if (entry->p_flags & PF_X) + flags |= AS_AREA_EXEC; + if (entry->p_flags & PF_W) + flags |= AS_AREA_WRITE; + if (entry->p_flags & PF_R) + flags |= AS_AREA_READ; + flags |= AS_AREA_CACHEABLE; + + base = ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE); + mem_sz = entry->p_memsz + (entry->p_vaddr - base); + + DPRINTF("Map to seg_addr=%p-%p.\n", (void *) seg_addr, + (void *) (entry->p_vaddr + bias + + ALIGN_UP(entry->p_memsz, PAGE_SIZE))); + + /* + * For the course of loading, the area needs to be readable + * and writeable. + */ + a = as_area_create((uint8_t *)base + bias, mem_sz, + AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE); + if (a == (void *)(-1)) { + DPRINTF("memory mapping failed (0x%x, %d)\n", + base+bias, mem_sz); + return EE_MEMORY; + } + + DPRINTF("as_area_create(%p, %#zx, %d) -> %p\n", + (void *) (base + bias), mem_sz, flags, (void *) a); + + /* + * Load segment data + */ + rc = lseek(elf->fd, entry->p_offset, SEEK_SET); + if (rc < 0) { + printf("seek error\n"); + return EE_INVALID; + } + +/* rc = read(fd, (void *)(entry->p_vaddr + bias), entry->p_filesz); + if (rc < 0) { printf("read error\n"); return EE_INVALID; }*/ + + /* Long reads are not possible yet. Load segment piecewise. */ + + unsigned left, now; + uint8_t *dp; + + left = entry->p_filesz; + dp = seg_ptr; + + while (left > 0) { + now = 16384; + if (now > left) now = left; + + rc = my_read(elf->fd, dp, now); + + if (rc < 0) { + DPRINTF("Read error.\n"); + return EE_INVALID; + } + + left -= now; + dp += now; + } + + /* + * The caller wants to modify the segments first. He will then + * need to set the right access mode and ensure SMC coherence. + */ + if ((elf->flags & ELDF_RW) != 0) return EE_OK; + +// printf("set area flags to %d\n", flags); + rc = as_area_change_flags(seg_ptr, flags); + if (rc != 0) { + DPRINTF("Failed to set memory area flags.\n"); + return EE_MEMORY; + } + + if (flags & AS_AREA_EXEC) { + /* Enforce SMC coherence for the segment */ + if (smc_coherence(seg_ptr, entry->p_filesz)) + return EE_MEMORY; + } + + return EE_OK; +} + +/** Process section header. + * + * @param elf Loader state. + * @param entry Segment header. + * + * @return EE_OK on success, error code otherwise. + */ +static int section_header(elf_ld_t *elf, elf_section_header_t *entry) +{ + switch (entry->sh_type) { + case SHT_PROGBITS: + if (entry->sh_flags & SHF_TLS) { + /* .tdata */ + } + break; + case SHT_NOBITS: + if (entry->sh_flags & SHF_TLS) { + /* .tbss */ + } + break; + case SHT_DYNAMIC: + /* Record pointer to dynamic section into info structure */ + elf->info->dynamic = + (void *)((uint8_t *)entry->sh_addr + elf->bias); + DPRINTF("Dynamic section found at %p.\n", + (void *) elf->info->dynamic); + break; + default: + break; + } + + return EE_OK; +} + +/** @} + */ Index: uspace/lib/c/generic/io/io.c =================================================================== --- uspace/lib/c/generic/io/io.c (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/generic/io/io.c (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -594,9 +594,10 @@ } - buf += now; + data += now; stream->buf_head += now; buf_free -= now; bytes_left -= now; total_written += now; + stream->buf_state = _bs_write; if (buf_free == 0) { @@ -606,7 +607,4 @@ } } - - if (total_written > 0) - stream->buf_state = _bs_write; if (need_flush) Index: uspace/lib/c/generic/rtld/elf_load.c =================================================================== --- uspace/lib/c/generic/rtld/elf_load.c (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../srv/loader/elf_load.c Index: uspace/lib/c/generic/rtld/module.c =================================================================== --- uspace/lib/c/generic/rtld/module.c (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/generic/rtld/module.c (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -35,10 +35,11 @@ */ +#include +#include +#include +#include #include #include #include -#include -#include -#include #include @@ -47,5 +48,4 @@ #include #include -#include /** (Eagerly) process all relocation tables in a module. @@ -93,7 +93,4 @@ module_t *module_find(const char *name) { - link_t *head = &runtime_env->modules_head; - - link_t *cur; module_t *m; const char *p, *soname; @@ -110,6 +107,5 @@ /* Traverse list of all modules. Not extremely fast, but simple */ - DPRINTF("head = %p\n", head); - for (cur = head->next; cur != head; cur = cur->next) { + list_foreach(runtime_env->modules, cur) { DPRINTF("cur = %p\n", cur); m = list_get_instance(cur, module_t, modules_link); @@ -177,5 +173,5 @@ /* Insert into the list of loaded modules */ - list_append(&m->modules_link, &runtime_env->modules_head); + list_append(&m->modules_link, &runtime_env->modules); return m; @@ -249,10 +245,7 @@ void modules_process_relocs(module_t *start) { - link_t *head = &runtime_env->modules_head; - - link_t *cur; - module_t *m; - - for (cur = head->next; cur != head; cur = cur->next) { + module_t *m; + + list_foreach(runtime_env->modules, cur) { m = list_get_instance(cur, module_t, modules_link); @@ -268,10 +261,7 @@ void modules_untag(void) { - link_t *head = &runtime_env->modules_head; - - link_t *cur; - module_t *m; - - for (cur = head->next; cur != head; cur = cur->next) { + module_t *m; + + list_foreach(runtime_env->modules, cur) { m = list_get_instance(cur, module_t, modules_link); m->bfs_tag = false; Index: uspace/lib/c/generic/rtld/rtld.c =================================================================== --- uspace/lib/c/generic/rtld/rtld.c (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/generic/rtld/rtld.c (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -44,5 +44,5 @@ { runtime_env = &rt_env_static; - list_initialize(&runtime_env->modules_head); + list_initialize(&runtime_env->modules); runtime_env->next_bias = 0x2000000; runtime_env->program = NULL; Index: uspace/lib/c/generic/rtld/symbol.c =================================================================== --- uspace/lib/c/generic/rtld/symbol.c (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/generic/rtld/symbol.c (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -38,8 +38,8 @@ #include +#include #include #include #include -#include /* @@ -118,5 +118,5 @@ module_t *m, *dm; elf_symbol_t *sym, *s; - link_t queue_head; + list_t queue; size_t i; @@ -132,7 +132,7 @@ /* Insert root (the program) into the queue and tag it */ - list_initialize(&queue_head); + list_initialize(&queue); start->bfs_tag = true; - list_append(&start->queue_link, &queue_head); + list_append(&start->queue_link, &queue); /* If the symbol is found, it will be stored in 'sym' */ @@ -140,7 +140,7 @@ /* While queue is not empty */ - while (!list_empty(&queue_head)) { + while (!list_empty(&queue)) { /* Pop first element from the queue */ - m = list_get_instance(queue_head.next, module_t, queue_link); + m = list_get_instance(list_first(&queue), module_t, queue_link); list_remove(&m->queue_link); @@ -162,5 +162,5 @@ if (dm->bfs_tag == false) { dm->bfs_tag = true; - list_append(&dm->queue_link, &queue_head); + list_append(&dm->queue_link, &queue); } } @@ -168,6 +168,6 @@ /* Empty the queue so that we leave it in a clean state */ - while (!list_empty(&queue_head)) - list_remove(queue_head.next); + while (!list_empty(&queue)) + list_remove(list_first(&queue)); if (!sym) { Index: uspace/lib/c/include/elf/elf.h =================================================================== --- uspace/lib/c/include/elf/elf.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/include/elf/elf.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 LIBC_ELF_H_ +#define LIBC_ELF_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/include/elf/elf_linux.h =================================================================== --- uspace/lib/c/include/elf/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/include/elf/elf_linux.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 LIBC_ELF_LINUX_H_ +#define LIBC_ELF_LINUX_H_ + +#include +#include + +/* + * Note types + */ +#define NT_PRSTATUS 1 + +typedef int pid_t; +typedef struct { + long tv_sec; + long tv_usec; +} linux_timeval_t; + +typedef struct { + int sig_info[3]; + short cursig; + unsigned long sigpend; + unsigned long sighold; + pid_t pid; + pid_t ppid; + pid_t pgrp; + pid_t sid; + linux_timeval_t pr_utime; + linux_timeval_t pr_stime; + linux_timeval_t pr_cutime; + linux_timeval_t pr_sid; + elf_regs_t regs; + int fpvalid; +} elf_prstatus_t; + +#endif + +/** @} + */ Index: uspace/lib/c/include/elf/elf_load.h =================================================================== --- uspace/lib/c/include/elf/elf_load.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/include/elf/elf_load.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2006 Sergey Bondari + * Copyright (c) 2008 Jiri Svoboda + * 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 ELF loader structures and public functions. + */ + +#ifndef ELF_LOAD_H_ +#define ELF_LOAD_H_ + +#include +#include +#include +#include + +/** + * ELF error return codes + */ +#define EE_OK 0 /* No error */ +#define EE_INVALID 1 /* Invalid ELF image */ +#define EE_MEMORY 2 /* Cannot allocate address space */ +#define EE_INCOMPATIBLE 3 /* ELF image is not compatible with current architecture */ +#define EE_UNSUPPORTED 4 /* Non-supported ELF (e.g. dynamic ELFs) */ +#define EE_LOADER 5 /* The image is actually a program loader. */ +#define EE_IRRECOVERABLE 6 + +typedef enum { + /** Leave all segments in RW access mode. */ + ELDF_RW = 1 +} eld_flags_t; + +/** + * Some data extracted from the headers are stored here + */ +typedef struct { + /** Entry point */ + entry_point_t entry; + + /** ELF interpreter name or NULL if statically-linked */ + const char *interp; + + /** Pointer to the dynamic section */ + void *dynamic; +} elf_info_t; + +/** + * Holds information about an ELF binary being loaded. + */ +typedef struct { + /** Filedescriptor of the file from which we are loading */ + int fd; + + /** Difference between run-time addresses and link-time addresses */ + uintptr_t bias; + + /** Flags passed to the ELF loader. */ + eld_flags_t flags; + + /** A copy of the ELF file header */ + elf_header_t *header; + + /** Store extracted info here */ + elf_info_t *info; +} elf_ld_t; + +extern const char *elf_error(unsigned int); +extern int elf_load_file(const char *, size_t, eld_flags_t, elf_info_t *); +extern void elf_create_pcb(elf_info_t *, pcb_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/rtld/elf_dyn.h =================================================================== --- uspace/lib/c/include/rtld/elf_dyn.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/include/rtld/elf_dyn.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -39,5 +39,5 @@ #include -#include +#include #include Index: uspace/lib/c/include/rtld/rtld.h =================================================================== --- uspace/lib/c/include/rtld/rtld.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/include/rtld/rtld.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -49,5 +49,5 @@ /** List of all loaded modules including rtld and the program */ - link_t modules_head; + list_t modules; /** Temporary hack to place each module at different address. */ Index: uspace/lib/c/include/rtld/symbol.h =================================================================== --- uspace/lib/c/include/rtld/symbol.h (revision d542aad09c70c494e5d38bd830bbecb69b75c6d0) +++ uspace/lib/c/include/rtld/symbol.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -36,6 +36,6 @@ #define LIBC_RTLD_SYMBOL_H_ +#include #include -#include elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod); Index: uspace/lib/c/include/typedefs.h =================================================================== --- uspace/lib/c/include/typedefs.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) +++ uspace/lib/c/include/typedefs.h (revision c936c7f9ded988d13c3729f1394182797ffa8d7e) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 + * + * This header allows including a kernel header using typedefs.h from + * libc. User-space code should use sys/types.h directly. + */ + +#ifndef LIBC_TYPEDEFS_H_ +#define LIBC_TYPEDEFS_H_ + +#include + +#endif + +/** @} + */