Index: libc/arch/ia32/include/psthread.h =================================================================== --- libc/arch/ia32/include/psthread.h (revision e708063fcb109c2a31c5e928ec97215959de8633) +++ libc/arch/ia32/include/psthread.h (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2006 Ondrej Palkovsky + * 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. + */ + +#ifndef __LIBC__ia32PSTHREAD_H__ +#define __LIBC__ia32PSTHREAD_H__ + +#include + +/* According to ABI the stack MUST be aligned on + * 16-byte boundary. If it is not, the va_arg calling will + * panic sooner or later + */ +#define SP_DELTA (12) + +/* We include only registers that must be preserved + * during function call + */ +typedef struct { + uint32_t sp; + uint32_t pc; + + uint32_t ebx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + + uint32_t tls; +} context_t; + +#endif Index: libc/arch/ia32/include/thread.h =================================================================== --- libc/arch/ia32/include/thread.h (revision e708063fcb109c2a31c5e928ec97215959de8633) +++ libc/arch/ia32/include/thread.h (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2006 Ondrej Palkovsky + * 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. + */ + +#ifndef __LIBC__ia32THREAD_H__ +#define __LIBC__ia32THREAD_H__ + +#include + +static inline void __tls_set(void *tls) +{ + __SYSCALL1(SYS_TLS_SET, (sysarg_t) tls); +} + +static inline void * __tls_get(void) +{ + void * retval; + + __asm__ ("movl %%gs:0, %0" : "=r"(retval)); + return retval; +} + +#endif Index: libc/arch/ia32/src/psthread.S =================================================================== --- libc/arch/ia32/src/psthread.S (revision e708063fcb109c2a31c5e928ec97215959de8633) +++ libc/arch/ia32/src/psthread.S (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -0,0 +1,82 @@ +# +# Copyright (C) 2001-2004 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 + +.global context_save +.global context_restore + + +## Save current CPU context +# +# Save CPU context to the context_t variable +# pointed by the 1st argument. Returns 1 in EAX. +# +context_save: + movl 0(%esp),%eax # the caller's return %eip + movl 4(%esp),%edx # address of the kernel_context variable to save context to + + movl %esp,0(%edx) # %esp -> ctx->sp + movl %eax,4(%edx) # %eip -> ctx->pc + movl %ebx,8(%edx) # %ebx -> ctx->ebx + movl %esi,12(%edx) # %esi -> ctx->esi + movl %edi,16(%edx) # %edi -> ctx->edi + movl %ebp,20(%edx) # %ebp -> ctx->ebp + + # Save TLS + movl %gs:0, %eax + movl %eax, 24(%edx) # tls -> ctx->tls + + xorl %eax,%eax # context_save returns 1 + incl %eax + ret + + +## Restore saved CPU context +# +# Restore CPU context from context_t variable +# pointed by the 1st argument. Returns 0 in EAX. +# +context_restore: + movl 4(%esp),%eax # address of the kernel_context variable to restore context from + movl 0(%eax),%esp # ctx->sp -> %esp + movl 4(%eax),%edx # ctx->pc -> %edx + movl 8(%eax),%ebx # ctx->ebx -> %ebx + movl 12(%eax),%esi # ctx->esi -> %esi + movl 16(%eax),%edi # ctx->edi -> %edi + movl 20(%eax),%ebp # ctx->ebp -> %ebp + + movl %edx,0(%esp) # ctx->pc -> saver's return %eip + + # Set thread local storage + movl 24(%eax), %eax # Set arg1 to TLS addr + movl $1, %edi # Syscall 1 + int $0x30 + + xorl %eax,%eax # context_restore returns 0 + ret Index: libc/arch/mips32/Makefile.inc =================================================================== --- libc/arch/mips32/Makefile.inc (revision 17242c6e5b745ef9ae07c90206932c94ce0ec40c) +++ libc/arch/mips32/Makefile.inc (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -32,5 +32,5 @@ TARGET = mipsel-linux-gnu TOOLCHAIN_DIR = /usr/local/mipsel/bin -CFLAGS += -mno-abicalls -mips3 -ftls-model=global-dynamic +CFLAGS += -mips3 -mno-abicalls ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ Index: libc/arch/mips32/_link.ld.in =================================================================== --- libc/arch/mips32/_link.ld.in (revision 17242c6e5b745ef9ae07c90206932c94ce0ec40c) +++ libc/arch/mips32/_link.ld.in (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -1,4 +1,4 @@ STARTUP(../libc/arch/ARCH/src/entry.o) -ENTRY(__entry) +ENTRY(__start) PHDRS { @@ -18,10 +18,10 @@ } :text - .got ALIGN(0x4000) : SUBALIGN(0x4000) { + .data ALIGN(0x4000) : SUBALIGN(0x4000) { + *(.data); + } :data + .got : { _gp = .; - *(.got); - } :data - .data : { - *(.data); + *(.data.rel*); } :data .sbss : { Index: libc/arch/mips32/include/thread.h =================================================================== --- libc/arch/mips32/include/thread.h (revision 17242c6e5b745ef9ae07c90206932c94ce0ec40c) +++ libc/arch/mips32/include/thread.h (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -27,7 +27,8 @@ */ +/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ + #ifndef __LIBC__mips32THREAD_H__ #define __LIBC__mips32THREAD_H__ - static inline void __tls_set(void *tls) Index: libc/arch/mips32/src/entry.s =================================================================== --- libc/arch/mips32/src/entry.s (revision 17242c6e5b745ef9ae07c90206932c94ce0ec40c) +++ libc/arch/mips32/src/entry.s (revision e708063fcb109c2a31c5e928ec97215959de8633) @@ -32,11 +32,11 @@ .section .init, "ax" -.globl __entry +.globl __start ## User-space task entry point # # -.ent __entry -__entry: +.ent __start +__start: lui $28, _gp @@ -51,3 +51,3 @@ jal __exit -.end __entry +.end __start