Index: uspace/lib/c/arch/abs32le/Makefile.inc =================================================================== --- uspace/lib/c/arch/abs32le/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/abs32le/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.c \ + arch/$(UARCH)/src/entryjmp.c \ arch/$(UARCH)/src/thread_entry.c \ arch/$(UARCH)/src/fibril.c \ Index: uspace/lib/c/arch/abs32le/src/entryjmp.c =================================================================== --- uspace/lib/c/arch/abs32le/src/entryjmp.c (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/abs32le/src/entryjmp.c (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,43 @@ +/* + * 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. + */ + +/** @file + */ + +#include +#include + +/** Jump to program entry point. */ +void entry_point_jmp(void *entry_point, void *pcb) +{ + while (true); +} + +/** + * @} + */ Index: uspace/lib/c/arch/amd64/Makefile.inc =================================================================== --- uspace/lib/c/arch/amd64/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/amd64/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.S \ Index: uspace/lib/c/arch/amd64/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/amd64/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/amd64/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,43 @@ +# +# 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. +# + +.globl entry_point_jmp + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# %rdi contains entry_point +# %rsi contains pcb +# +# Jump to program entry point +entry_point_jmp: + # pcb must be passed in %rdi, use %rdx as a scratch register + mov %rdi, %rdx + mov %rsi, %rdi + + # jump to entry point + jmp %rdx Index: uspace/lib/c/arch/arm32/Makefile.inc =================================================================== --- uspace/lib/c/arch/arm32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/arm32/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -30,4 +30,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.c \ Index: uspace/lib/c/arch/arm32/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/arm32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/arm32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,42 @@ +# +# 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. +# + +.globl entry_point_jmp + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# r0 contains entry_point +# r1 contains pcb +# +# Jump to program entry point +entry_point_jmp: + # load ras_page address to r2 + ldr r2, =ras_page + ldr r2, [r2] + # pcb is passed to the entry point in r1 (where it already is) + mov r15, r0 Index: uspace/lib/c/arch/ia32/Makefile.inc =================================================================== --- uspace/lib/c/arch/ia32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/ia32/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.S \ Index: uspace/lib/c/arch/ia32/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/ia32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/ia32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,49 @@ +# +# 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. +# + +.globl entry_point_jmp + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# Jump to program entry point +entry_point_jmp: + # Use standard ia32 prologue not to confuse anybody + push %ebp + movl %esp, %ebp + + # %eax := entry_point + movl 0x8(%ebp), %eax + + # %edi := pcb + # pcb is passed to the entry point in %edi + mov 0xc(%ebp), %edi + + # Save a tiny bit of stack space + pop %ebp + + jmp *%eax Index: uspace/lib/c/arch/ia64/Makefile.inc =================================================================== --- uspace/lib/c/arch/ia64/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/ia64/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.S \ Index: uspace/lib/c/arch/ia64/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/ia64/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/ia64/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,43 @@ +# +# 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. +# + +.text +.globl entry_point_jmp + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# in0 (r32) contains entry_point +# in1 (r33) contains pcb +# +# Jump to program entry point +entry_point_jmp: + # Pass pcb to the entry point in r2 + + mov b6 = r32 + mov r2 = r33 ;; + br b6 ;; Index: uspace/lib/c/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/mips32/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.c \ Index: uspace/lib/c/arch/mips32/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/mips32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/mips32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,49 @@ +# +# 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. +# + +.text +.section .text +.global entry_point_jmp +.set noreorder + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# $a0 (=$4) contains entry_point +# $a1 (=$5) contains pcb +# +# Jump to program entry point +.ent entry_point_jmp +entry_point_jmp: + # tmp := entry_point + move $25, $a0 + + # Pass pcb to the entry point in $a0 + move $a0, $a1 + jr $25 + nop +.end Index: uspace/lib/c/arch/mips32eb/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips32eb/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/mips32eb/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.c \ Index: uspace/lib/c/arch/ppc32/Makefile.inc =================================================================== --- uspace/lib/c/arch/ppc32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/ppc32/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/syscall.c \ Index: uspace/lib/c/arch/ppc32/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/ppc32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/ppc32/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,40 @@ +# +# 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. +# + +.globl entry_point_jmp + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# %r3 contains entry_point +# %r4 contains pcb +# +# Jump to program entry point +entry_point_jmp: + mtctr %r3 + mr %r6, %r4 # Pass pcb to the entry point in %r6 + bctr Index: uspace/lib/c/arch/sparc64/Makefile.inc =================================================================== --- uspace/lib/c/arch/sparc64/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/lib/c/arch/sparc64/Makefile.inc (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -29,4 +29,5 @@ ARCH_SOURCES = \ arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ arch/$(UARCH)/src/thread_entry.s \ arch/$(UARCH)/src/fibril.S \ Index: uspace/lib/c/arch/sparc64/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/sparc64/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/arch/sparc64/src/entryjmp.s (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,42 @@ +# +# 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. +# + +.globl entry_point_jmp + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# %o0 contains entry_point +# %o1 contains pcb +# +# Jump to program entry point +entry_point_jmp: + # Pass pcb pointer to entry point in %o1. As it is already + # there, no action is needed. + call %o0 + nop + # fixme: use branch instead of call Index: uspace/lib/c/include/entry_point.h =================================================================== --- uspace/lib/c/include/entry_point.h (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) +++ uspace/lib/c/include/entry_point.h (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -0,0 +1,44 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ENTRY_POINT_H_ +#define LIBC_ENTRY_POINT_H_ + +/* Defined in arch/ARCH/src/entryjmp.[c|s] */ +void entry_point_jmp(void *, void *); + +#endif + +/** @} + */ Index: uspace/srv/loader/Makefile =================================================================== --- uspace/srv/loader/Makefile (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/srv/loader/Makefile (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -36,5 +36,4 @@ -include $(COMMON_MAKEFILE) -include $(CONFIG_MAKEFILE) --include arch/$(UARCH)/Makefile.inc LINKER_SCRIPT = arch/$(UARCH)/_link.ld Index: pace/srv/loader/arch/abs32le/Makefile.inc =================================================================== --- uspace/srv/loader/arch/abs32le/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/abs32le.c Index: pace/srv/loader/arch/abs32le/abs32le.c =================================================================== --- uspace/srv/loader/arch/abs32le/abs32le.c (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,42 +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. - */ - -/** @file - */ - -#include -#include "arch.h" - -void program_run(void *entry_point, void *pcb) -{ - while (true); -} - -/** - * @} - */ Index: pace/srv/loader/arch/amd64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/amd64/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/amd64.s Index: pace/srv/loader/arch/amd64/amd64.s =================================================================== --- uspace/srv/loader/arch/amd64/amd64.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,43 +1,0 @@ -# -# 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. -# - -.globl program_run - -## void program_run(void *entry_point, void *pcb); -# -# %rdi contains entry_point -# %rsi contains pcb -# -# Jump to a program entry point -program_run: - # pcb must be passed in %rdi, use %rdx as a scratch register - mov %rdi, %rdx - mov %rsi, %rdi - - # jump to entry point - jmp %rdx Index: pace/srv/loader/arch/arm32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/arm32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/arm32.s Index: pace/srv/loader/arch/arm32/arm32.s =================================================================== --- uspace/srv/loader/arch/arm32/arm32.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,42 +1,0 @@ -# -# 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. -# - -.globl program_run - -## void program_run(void *entry_point, void *pcb); -# -# r0 contains entry_point -# r1 contains pcb -# -# Jump to a program entry point -program_run: - # load ras_page address to r2 - ldr r2, =ras_page - ldr r2, [r2] - # pcb is passed to the entry point in r1 (where it already is) - mov r15, r0 Index: pace/srv/loader/arch/ia32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ia32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/ia32.s Index: pace/srv/loader/arch/ia32/ia32.s =================================================================== --- uspace/srv/loader/arch/ia32/ia32.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,49 +1,0 @@ -# -# 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. -# - -.globl program_run - -## void program_run(void *entry_point, void *pcb); -# -# Jump to a program entry point -program_run: - # Use standard ia32 prologue not to confuse anybody - push %ebp - movl %esp, %ebp - - # %eax := entry_point - movl 0x8(%ebp), %eax - - # %edi := pcb - # pcb is passed to the entry point in %edi - mov 0xc(%ebp), %edi - - # Save a tiny bit of stack space - pop %ebp - - jmp *%eax Index: pace/srv/loader/arch/ia64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ia64/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,30 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/ia64.s -AFLAGS += -xexplicit Index: pace/srv/loader/arch/ia64/ia64.s =================================================================== --- uspace/srv/loader/arch/ia64/ia64.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,43 +1,0 @@ -# -# 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. -# - -.text -.globl program_run - -## void program_run(void *entry_point, void *pcb); -# -# in0 (r32) contains entry_point -# in1 (r33) contains pcb -# -# Jump to a program entry point -program_run: - # Pass pcb to the entry point in r2 - - mov b6 = r32 - mov r2 = r33 ;; - br b6 ;; Index: pace/srv/loader/arch/mips32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/mips32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/mips32.s Index: pace/srv/loader/arch/mips32/mips32.s =================================================================== --- uspace/srv/loader/arch/mips32/mips32.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,49 +1,0 @@ -# -# 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. -# - -.text -.section .text -.global program_run -.set noreorder - -## void program_run(void *entry_point, void *pcb); -# -# $a0 (=$4) contains entry_point -# $a1 (=$5) contains pcb -# -# Jump to a program entry point -.ent program_run -program_run: - # tmp := entry_point - move $25, $a0 - - # Pass pcb to the entry point in $a0 - move $a0, $a1 - jr $25 - nop -.end Index: pace/srv/loader/arch/ppc32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ppc32/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/ppc32.s Index: pace/srv/loader/arch/ppc32/ppc32.s =================================================================== --- uspace/srv/loader/arch/ppc32/ppc32.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,40 +1,0 @@ -# -# 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. -# - -.globl program_run - -## void program_run(void *entry_point, void *pcb); -# -# %r3 contains entry_point -# %r4 contains pcb -# -# Jump to a program entry point -program_run: - mtctr %r3 - mr %r6, %r4 # Pass pcb to the entry point in %r6 - bctr Index: pace/srv/loader/arch/sparc64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/sparc64/Makefile.inc (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,29 +1,0 @@ -# -# 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. -# - -ARCH_SOURCES = arch/$(UARCH)/sparc64.s Index: pace/srv/loader/arch/sparc64/sparc64.s =================================================================== --- uspace/srv/loader/arch/sparc64/sparc64.s (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,42 +1,0 @@ -# -# 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. -# - -.globl program_run - -## void program_run(void *entry_point, void *pcb); -# -# %o0 contains entry_point -# %o1 contains pcb -# -# Jump to a program entry point -program_run: - # Pass pcb pointer to entry point in %o1. As it is already - # there, no action is needed. - call %o0 - nop - # fixme: use branch instead of call Index: uspace/srv/loader/elf_load.c =================================================================== --- uspace/srv/loader/elf_load.c (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ uspace/srv/loader/elf_load.c (revision bae7bdce0a7ec22e0c314f46b0603c9c28fd6337) @@ -2,5 +2,5 @@ * Copyright (c) 2006 Sergey Bondari * Copyright (c) 2006 Jakub Jermar - * Copyright (c) 2008 Jiri Svoboda + * Copyright (c) 2011 Jiri Svoboda * All rights reserved. * @@ -53,8 +53,8 @@ #include #include +#include #include "elf.h" #include "elf_load.h" -#include "arch.h" #define DPRINTF(...) @@ -136,5 +136,5 @@ void elf_run(elf_info_t *info, pcb_t *pcb) { - program_run(info->entry, pcb); + entry_point_jmp(info->entry, pcb); /* not reached */ Index: pace/srv/loader/include/arch.h =================================================================== --- uspace/srv/loader/include/arch.h (revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * 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 fs - * @{ - */ -/** @file - * @brief - */ - -#ifndef LOADER_ARCH_H_ -#define LOADER_ARCH_H_ - -extern void program_run(void *entry_point, void *pcb); - -#endif - -/** - * @} - */