Index: uspace/lib/c/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips32/Makefile.inc (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ uspace/lib/c/arch/mips32/Makefile.inc (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -28,7 +28,7 @@ ARCH_SOURCES = \ - arch/$(UARCH)/src/entry.s \ - arch/$(UARCH)/src/entryjmp.s \ - arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/entry.S \ + arch/$(UARCH)/src/entryjmp.S \ + arch/$(UARCH)/src/thread_entry.S \ arch/$(UARCH)/src/syscall.c \ arch/$(UARCH)/src/fibril.S \ Index: uspace/lib/c/arch/mips32/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips32/include/fibril.h (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ uspace/lib/c/arch/mips32/include/fibril.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -38,20 +38,21 @@ #include +#include +#include -/* We define our own context_set, because we need to set - * the TLS pointer to the tcb+0x7000 +#define SP_DELTA (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + +/* + * We define our own context_set, because we need to set + * the TLS pointer to the tcb + 0x7000 * * See tls_set in thread.h */ -#define context_set(c, _pc, stack, size, ptls) \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); - - -/* +16 is just for sure that the called function - * have space to store it's arguments - */ -#define SP_DELTA (8+16) +#define context_set(c, _pc, stack, size, ptls) \ + do { \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); \ + } while (0) typedef struct { Index: uspace/lib/c/arch/mips32/include/stack.h =================================================================== --- uspace/lib/c/arch/mips32/include/stack.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips32/include/stack.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,1 @@ +../../../../../../kernel/arch/mips32/include/stack.h Index: uspace/lib/c/arch/mips32/src/entry.S =================================================================== --- uspace/lib/c/arch/mips32/src/entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips32/src/entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2005 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. +# + +#include + +.text +.section .init, "ax" + +.global __entry + +.set noreorder +.option pic2 + +## User-space task entry point +# +# $a0 ($4) contains the PCB pointer +# +.ent __entry +__entry: + .frame $sp, ABI_STACK_FRAME, $ra + .cpload $t9 + + # Allocate the stack frame. + addiu $sp, -ABI_STACK_FRAME + + # Allow PIC code + .cprestore 16 + + # Pass pcb_ptr to __main() as the first argument. It is already + # in $a0. As the first argument is passed in $a0, no operation + # is needed. + + jal __main + nop + + # + # Not reached. + # + addiu $sp, ABI_STACK_FRAME +.end __entry Index: uspace/lib/c/arch/mips32/src/entry.s =================================================================== --- uspace/lib/c/arch/mips32/src/entry.s (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ (revision ) @@ -1,59 +1,0 @@ -# -# Copyright (c) 2005 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. -# - -.text -.section .init, "ax" - -.global __entry - -.set noreorder -.option pic2 - -## User-space task entry point -# -# $a0 ($4) contains the PCB pointer -# -.ent __entry -__entry: - .frame $sp, 32, $31 - .cpload $25 - - # Mips o32 may store its arguments on stack, make space (16 bytes), - # so that it could work with -O0 - # Make space additional 16 bytes for the stack frame - - addiu $sp, -32 - .cprestore 16 # Allow PIC code - - # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already - # in $a0. As the first argument is passed in $a0, no operation - # is needed. - - jal __main - nop -.end Index: uspace/lib/c/arch/mips32/src/entryjmp.S =================================================================== --- uspace/lib/c/arch/mips32/src/entryjmp.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips32/src/entryjmp.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,53 @@ +# +# 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. +# + +#include + +.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 $t9, $a0 + + # Pass pcb to the entry point in $a0 + move $a0, $a1 + + jr $t9 + addiu $sp, -ABI_STACK_FRAME + addiu $sp, ABI_STACK_FRAME +.end entry_point_jmp Index: uspace/lib/c/arch/mips32/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/mips32/src/entryjmp.s (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ (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 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/mips32/src/thread_entry.S =================================================================== --- uspace/lib/c/arch/mips32/src/thread_entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips32/src/thread_entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2006 Jakub Jermar +# 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. +# + +#include + +.text + +.set noat +.set noreorder +.option pic2 + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +.ent __thread_entry +__thread_entry: + .frame $sp, ABI_STACK_FRAME, $ra + .cpload $t9 + + # + # v0 contains address of uarg. + # + add $a0, $v0, 0 + + # Allocate the stack frame. + addiu $sp, -ABI_STACK_FRAME + + # Allow PIC code + .cprestore 16 + + jal __thread_main + nop + + # + # Not reached. + # + addiu $sp, ABI_STACK_FRAME +.end __thread_entry Index: uspace/lib/c/arch/mips32/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/mips32/src/thread_entry.s (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ (revision ) @@ -1,59 +1,0 @@ -# -# Copyright (c) 2006 Jakub Jermar -# 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 - -.set noat -.set noreorder -.option pic2 - -.globl __thread_entry - -## User-space thread entry point for all but the first threads. -# -# -.ent __thread_entry -__thread_entry: - .frame $sp, 32, $31 - .cpload $25 - - # - # v0 contains address of uarg. - # - add $4, $2, 0 - # Mips o32 may store its arguments on stack, make space - addiu $sp, -32 - .cprestore 16 - - jal __thread_main - nop - - # - # Not reached. - # -.end __thread_entry Index: uspace/lib/c/arch/mips32eb/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips32eb/Makefile.inc (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ uspace/lib/c/arch/mips32eb/Makefile.inc (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -28,7 +28,7 @@ ARCH_SOURCES = \ - arch/$(UARCH)/src/entry.s \ - arch/$(UARCH)/src/entryjmp.s \ - arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/entry.S \ + arch/$(UARCH)/src/entryjmp.S \ + arch/$(UARCH)/src/thread_entry.S \ arch/$(UARCH)/src/syscall.c \ arch/$(UARCH)/src/fibril.S \ Index: uspace/lib/c/arch/mips32eb/include/stack.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/stack.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips32eb/include/stack.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,1 @@ +../../mips32/include/stack.h Index: uspace/lib/c/arch/mips64/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips64/Makefile.inc (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ uspace/lib/c/arch/mips64/Makefile.inc (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -28,7 +28,7 @@ ARCH_SOURCES = \ - arch/$(UARCH)/src/entry.s \ - arch/$(UARCH)/src/entryjmp.s \ - arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/entry.S \ + arch/$(UARCH)/src/entryjmp.S \ + arch/$(UARCH)/src/thread_entry.S \ arch/$(UARCH)/src/syscall.c \ arch/$(UARCH)/src/fibril.S \ Index: uspace/lib/c/arch/mips64/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips64/include/fibril.h (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ uspace/lib/c/arch/mips64/include/fibril.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -38,19 +38,21 @@ #include +#include +#include -/* We define our own context_set, because we need to set - * the TLS pointer to the tcb+0x7000 +#define SP_DELTA (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + +/* + * We define our own context_set, because we need to set + * the TLS pointer to the tcb + 0x7000 * * See tls_set in thread.h */ #define context_set(c, _pc, stack, size, ptls) \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); - -/* +16 is just for sure that the called function - * have space to store it's arguments - */ -#define SP_DELTA (8 + 16) + do { \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); \ + } while (0) typedef struct { Index: uspace/lib/c/arch/mips64/include/stack.h =================================================================== --- uspace/lib/c/arch/mips64/include/stack.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips64/include/stack.h (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,1 @@ +../../../../../../kernel/arch/mips64/include/stack.h Index: uspace/lib/c/arch/mips64/src/entry.S =================================================================== --- uspace/lib/c/arch/mips64/src/entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips64/src/entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2005 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. +# + +#include + +.text +.section .init, "ax" + +.global __entry + +.set noreorder +.option pic2 + +## User-space task entry point +# +# $a0 ($4) contains the PCB pointer +# +.ent __entry +__entry: + .frame $sp, ABI_STACK_FRAME, $ra + .cpload $t9 + + # Allocate the stack frame. + addiu $sp, -ABI_STACK_FRAME + + # Allow PIC code + .cprestore 16 + + # Pass pcb_ptr to __main() as the first argument. It is already + # in $a0. As the first argument is passed in $a0, no operation + # is needed. + + jal __main + nop + + # + # Not reached. + # + addiu $sp, ABI_STACK_FRAME +.end __entry Index: uspace/lib/c/arch/mips64/src/entry.s =================================================================== --- uspace/lib/c/arch/mips64/src/entry.s (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ (revision ) @@ -1,57 +1,0 @@ -# -# Copyright (c) 2005 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. -# - -.text -.section .init, "ax" - -.global __entry - -.set noreorder -.option pic2 - -## User-space task entry point -# -# $a0 ($4) contains the PCB pointer -# -.ent __entry -__entry: - .frame $sp, 32, $31 - .cpload $25 - - # FIXME: Reflect exactly ABI specs here - - addiu $sp, -32 - .cprestore 16 # Allow PIC code - - # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already - # in $a0. As the first argument is passed in $a0, no operation - # is needed. - - jal __main - nop -.end Index: uspace/lib/c/arch/mips64/src/entryjmp.S =================================================================== --- uspace/lib/c/arch/mips64/src/entryjmp.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips64/src/entryjmp.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,53 @@ +# +# 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. +# + +#include + +.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 $t9, $a0 + + # Pass pcb to the entry point in $a0 + move $a0, $a1 + + jr $t9 + addiu $sp, -ABI_STACK_FRAME + addiu $sp, ABI_STACK_FRAME +.end entry_point_jmp Index: uspace/lib/c/arch/mips64/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/mips64/src/entryjmp.s (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ (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 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/mips64/src/thread_entry.S =================================================================== --- uspace/lib/c/arch/mips64/src/thread_entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) +++ uspace/lib/c/arch/mips64/src/thread_entry.S (revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2006 Jakub Jermar +# 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. +# + +#include + +.text + +.set noat +.set noreorder +.option pic2 + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +.ent __thread_entry +__thread_entry: + .frame $sp, ABI_STACK_FRAME, $ra + .cpload $t9 + + # + # v0 contains address of uarg. + # + add $a0, $v0, 0 + + # Allocate the stack frame. + addiu $sp, -ABI_STACK_FRAME + + # Allow PIC code + .cprestore 16 + + jal __thread_main + nop + + # + # Not reached. + # + addiu $sp, ABI_STACK_FRAME +.end __thread_entry Index: uspace/lib/c/arch/mips64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/mips64/src/thread_entry.s (revision df366b5ec3a07d87ff1fbc8071a841d390590f64) +++ (revision ) @@ -1,59 +1,0 @@ -# -# Copyright (c) 2006 Jakub Jermar -# 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 - -.set noat -.set noreorder -.option pic2 - -.globl __thread_entry - -## User-space thread entry point for all but the first threads. -# -# -.ent __thread_entry -__thread_entry: - .frame $sp, 32, $31 - .cpload $25 - - # - # v0 contains address of uarg. - # - add $4, $2, 0 - - addiu $sp, -32 - .cprestore 16 - - jal __thread_main - nop - - # - # Not reached. - # -.end __thread_entry