WebSVN – HelenOS-historic – Path Comparison – / – /uspace/ Rev 1112 and /uspace/ Rev 1113

Ignore whitespace Rev 1112 → Rev 1113

 /uspace/trunk/init/init.c
 ,6 → 33,7
 #include <stdlib.h>
 #include <ns.h>
 #include <thread.h>
+#include <psthread.h>
 #include <futex.h>
 int a;
 ,11 → 253,25
     ipc_wait_for_call(&data, 0);
 }
+static int ptest(void *arg)
+{
+    printf("Pseudo thread-1\n");
+    ps_preempt();
+    printf("Pseudo thread-2\n");
+    ps_preempt();
+    printf("Pseudo thread-3\n");
+    ps_preempt();
+    printf("Pseudo thread-4\n");
+    ps_preempt();
+    printf("Pseudo finish\n");
+    return 0;
+}
 int main(int argc, char *argv[])
 {
+    pstid_t ptid;
     int tid;
     version_print();
 /*  test_printf(); */
 ,6 → 288,10
     if (futex_up(&ftx) < 0)
         printf("Futex failed.\n");
+    if ((tid = thread_create(utest, NULL, "utest") != -1)) {
+        printf("Created thread tid=%d\n", tid);
+    }
     if (futex_down(&ftx) < 0)
         printf("Futex failed.\n");
 ,6 → 307,16
     if (futex_up(&ftx) < 0)
         printf("Futex failed.\n");
+    ptid = psthread_create(ptest, NULL);
+    printf("Main thread-1\n");
+    ps_preempt();
+    printf("Main thread-2\n");
+    ps_preempt();
+    printf("main thread-3\n");
+    ps_join(ptid);
+    printf("Main exiting\n");
     printf("Main thread exiting.\n");
     return 0;
 }

/uspace/trunk/libc/include/types.h
0,0 → 1,0
#include <libarch/types.h>

 /uspace/trunk/libc/include/stdint.h
 ,7 → 30,7
 #define __LIBC__STDINT_H__
 /* Definitions of types with fixed size*/
-#include<types.h>
+#include <types.h>
 #define MAX_INT8 (0x7F)
 #define MIN_INT8 (0x80)

 /uspace/trunk/libc/include/unistd.h
 ,8 → 30,10
 #define __LIBC__UNISTD_H__
 #include <types.h>
+#include <arch/mm/page.h>
 #define NULL 0
+#define getpagesize()     (PAGE_SIZE)
 extern ssize_t write(int fd, const void * buf, size_t count);
 extern void _exit(int status);

 /uspace/trunk/libc/include/thread.h
 ,11 → 30,14
 #define __LIBC__THREAD_H__
 #include <kernel/proc/uarg.h>
+#include <libarch/thread.h>
 extern void __thread_entry(void);
-extern void thread_main(uspace_arg_t *uarg);
+extern void __thread_main(uspace_arg_t *uarg);
 extern int thread_create(void (* function)(void *arg), void *arg, char *name);
 extern void thread_exit(int status);
+void * __make_tls(void);
+void __free_tls(void *);
 #endif

 /uspace/trunk/libc/include/libc.h
 ,9 → 30,7
 #define __LIBC__LIBC_H__
 #include <types.h>
 #include <kernel/syscall/syscall.h>
-#include <kernel/arch/mm/page.h>
 #define __SYSCALL0(id) __syscall(0, 0, 0, 0, id)
 #define __SYSCALL1(id, p1) __syscall(p1, 0, 0, 0, id)
 ,8 → 38,6
 #define __SYSCALL3(id, p1, p2, p3) __syscall(p1,p2,p3, 0, id)
 #define __SYSCALL4(id, p1, p2, p3, p4) __syscall(p1,p2,p3,p4,id)
-#define getpagesize()     (PAGE_SIZE)
 extern void __main(void);
 extern void __exit(void);
 extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2,

 /uspace/trunk/libc/include/psthread.h
 ,0 → 1,67
+/*
+ * 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__PSTHREAD_H__
+#define __LIBC__PSTHREAD_H__
+#include <libarch/psthread.h>
+#include <libadt/list.h>
+#ifndef context_set
+#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);
+#endif /* context_set */
+typedef sysarg_t pstid_t;
+struct psthread_data {
+    struct psthread_data *self; /* IA32,AMD64 needs to get self address */
+    link_t list;
+    context_t ctx;
+    void *stack;
+    void *arg;
+    int (*func)(void *);
+    struct psthread_data *waiter;
+    int finished;
+    int retval;
+    int flags;
+};
+typedef struct psthread_data psthread_data_t;
+extern int context_save(context_t *c);
+extern void context_restore(context_t *c) __attribute__ ((noreturn));
+pstid_t psthread_create(int (*func)(void *), void *arg);
+int ps_preempt(void);
+int ps_join(pstid_t psthrid);
+#endif

 /uspace/trunk/libc/include/atomic.h
 ,7 → 33,7
     volatile long count;
 } atomic_t;
-#include <atomic_arch.h>
+#include <libarch/atomic.h>
 static inline void atomic_set(atomic_t *val, long i)
 {

 /uspace/trunk/libc/include/io/io.h
 ,7 → 29,7
 #ifndef __LIBC__IO_H__
 #define __LIBC__IO_IO_H__
-#include <types.h>
+#include <libarch/types.h>
 int putnchars(const char * buf, size_t count);
 int putstr(const char * str);

 /uspace/trunk/libc/include/stdarg.h
 ,8 → 29,8
 #ifndef __LIBC__STDARG_H__
 #define __LIBC__STDARG_H__
-#include<types.h>
-#include<stackarg.h>
+#include <types.h>
+#include <libarch/stackarg.h>
 #ifndef __VARARGS_DEFINED
 # define __VARARGS_DEFINED

 /uspace/trunk/libc/malloc/malloc.c
 ,7 → 536,7
 #endif /* LACKS_STDLIB_H */
 #ifdef DEBUG
 #if ABORT_ON_ASSERT_FAILURE
-#define assert(x) if(!(x)) ABORT
+#define assert(x) {if(!(x)) {printf(#x);ABORT;}}
 #else /* ABORT_ON_ASSERT_FAILURE */
 #include <assert.h>
 #endif /* ABORT_ON_ASSERT_FAILURE */

 /uspace/trunk/libc/Makefile.toolchain
 ,7 → 27,7
 #
 DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -I$(LIBC_PREFIX)/arch/$(ARCH)/include
+CFLAGS = -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
 LFLAGS = -M -N $(SOFTINT_PREFIX)/softint.a
 AFLAGS =

 /uspace/trunk/libc/generic/thread.c
 ,7 → 31,24
 #include <stdlib.h>
 #include <arch/faddr.h>
 #include <kernel/proc/uarg.h>
+#include <psthread.h>
+#include <stdio.h>
+void * __make_tls(void)
+{
+    psthread_data_t *pt;
+    pt = malloc(sizeof(psthread_data_t));
+    pt->self = pt;
+    return pt;
+}
+void __free_tls(void *tls)
+{
+    free(tls);
+}
 /** Main thread function.
  *
  * This function is called from __thread_entry() and is used
 ,11 → 58,17
  *
  * @param uarg Pointer to userspace argument structure.
  */
-void thread_main(uspace_arg_t *uarg)
+void __thread_main(uspace_arg_t *uarg)
 {
+    /* This should initialize the area according to TLS specicification */
+    __tls_set(__make_tls());
     uarg->uspace_thread_function(uarg->uspace_thread_arg);
     free(uarg->uspace_stack);
     free(uarg);
+    __free_tls(__tls_get());
     thread_exit(0);
 }

 /uspace/trunk/libc/generic/libc.c
 ,6 → 29,8
 #include <libc.h>
 #include <unistd.h>
 #include <thread.h>
+#include <malloc.h>
+#include <psthread.h>
 void _exit(int status) {
     thread_exit(status);
 ,8 → 37,11
 }
 void __main(void) {
+    __tls_set(__make_tls());
 }
 void __exit(void) {
+    free(__tls_get());
     _exit(0);
 }

 /uspace/trunk/libc/generic/psthread.c
 ,0 → 1,139
+/*
+ * 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.
+ */
+#include <libadt/list.h>
+#include <psthread.h>
+#include <malloc.h>
+#include <unistd.h>
+#include <thread.h>
+#include <stdio.h>
+static LIST_INITIALIZE(ready_list);
+/** Function to preempt to other thread without adding
+ * currently running thread to runqueue
+ */
+static void ps_exit(void)
+{
+    psthread_data_t *pt;
+    if (list_empty(&ready_list)) {
+        /* Wait on IPC queue etc... */
+        printf("Cannot exit!!!\n");
+        _exit(0);
+    }
+    pt = list_get_instance(ready_list.next, psthread_data_t, list);
+    list_remove(&pt->list);
+    context_restore(&pt->ctx);
+}
+/** Function that is called on entry to new uspace thread */
+static int psthread_main(void)
+{
+    psthread_data_t *pt = __tls_get();
+    pt->retval = pt->func(pt->arg);
+    pt->finished = 1;
+    if (pt->waiter)
+        list_append(&pt->waiter->list, &ready_list);
+    ps_exit();
+}
+/** Do a preemption of userpace threads */
+int ps_preempt(void)
+{
+    psthread_data_t *pt;
+    if (list_empty(&ready_list))
+        return 0;
+    pt = __tls_get();
+    if (! context_save(&pt->ctx))
+        return 1;
+    list_append(&pt->list, &ready_list);
+    pt = list_get_instance(ready_list.next, psthread_data_t, list);
+    list_remove(&pt->list);
+    context_restore(&pt->ctx);
+}
+/** Wait for uspace thread to finish */
+int ps_join(pstid_t psthrid)
+{
+    psthread_data_t *pt, *mypt;
+    int retval;
+    /* Handle psthrid = Kernel address -> it is wait for call */
+    pt = (psthread_data_t *) psthrid;
+    if (!pt->finished) {
+        mypt = __tls_get();
+        if (context_save(&mypt->ctx)) {
+            pt->waiter = mypt;
+            ps_exit();
+        }
+    }
+    retval = pt->retval;
+    free(pt->stack);
+    __free_tls(pt);
+    return retval;
+}
+/**
+ * Create a userspace thread
+ *
+ */
+pstid_t psthread_create(int (*func)(void *), void *arg)
+{
+    psthread_data_t *pt;
+    pt = __make_tls();
+    pt->stack = (char *) malloc(getpagesize());
+    if (!pt->stack) {
+        return 0;
+    }
+    pt->arg= arg;
+    pt->func = func;
+    pt->finished = 0;
+    pt->waiter = NULL;
+    context_save(&pt->ctx);
+    context_set(&pt->ctx, psthread_main, pt->stack, getpagesize(), pt);
+    list_append(&pt->list, &ready_list);
+    return (pstid_t )pt;
+}

 /uspace/trunk/libc/Makefile
 ,7 → 49,8
     generic/futex.c \
     generic/io/io.c \
     generic/io/print.c \
-    malloc/malloc.c
+    malloc/malloc.c \
+    generic/psthread.c
 ARCH_SOURCES += \
     arch/$(ARCH)/src/entry.s \
 ,14 → 66,17
 kerninc:
     ln -sfn ../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
+    ln -sfn ../arch/$(ARCH)/include include/libarch
+    ln -sfn ../../libipc/include include/libipc
+    ln -sfn ../../libadt/include include/libadt
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch libc.a arch/$(ARCH)/_link.ld Makefile.depend
+    -rm -f include/kernel include/arch include/libarch include/libipc include/libadt libc.a arch/$(ARCH)/_link.ld Makefile.depend
     find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
-depend:
+depend: kerninc
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

/uspace/trunk/libc/arch/ia64/include/atomic_arch.h
File deleted

 /uspace/trunk/libc/arch/ia64/include/atomic.h
 ,0 → 1,57
+/*
+ * Copyright (C) 2005 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.
+ */
+#ifndef __ia64_ATOMIC_H__
+#define __ia64_ATOMIC_H__
+/** Atomic addition.
+ *
+ * @param val Atomic value.
+ * @param imm Value to add.
+ *
+ * @return Value before addition.
+ */
+static inline long atomic_add(atomic_t *val, int imm)
+{
+    long v;
+    __asm__ volatile ("fetchadd8.rel %0 = %1, %2\n" : "=r" (v), "+m" (val->count) : "i" (imm));
+    return v;
+}
+static inline void atomic_inc(atomic_t *val) { atomic_add(val, 1); }
+static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); }
+static inline long atomic_preinc(atomic_t *val) { return atomic_add(val, 1) + 1; }
+static inline long atomic_predec(atomic_t *val) { return atomic_add(val, -1) - 1; }
+static inline long atomic_postinc(atomic_t *val) { return atomic_add(val, 1); }
+static inline long atomic_postdec(atomic_t *val) { return atomic_add(val, -1); }
+#endif

/uspace/trunk/libc/arch/ia64/src/entry.s
38,6 → 38,7
__entry:
alloc loc0 = ar.pfs, 0, 1, 2, 0
mov r1 = _gp
{ br.call.sptk.many b0 = __main }
{ br.call.sptk.many b0 = main }
{ br.call.sptk.many b0 = __exit }

 /uspace/trunk/libc/arch/ia64/src/thread_entry.s
 ,7 → 43,7
     #
     mov out0 = r8
-    { br.call.sptk.many b0 = thread_main }
+    { br.call.sptk.many b0 = __thread_main }
     #
     # Not reached.

/uspace/trunk/libc/arch/amd64/include/atomic_arch.h
File deleted

 /uspace/trunk/libc/arch/amd64/include/context_offset.h
 ,0 → 1,10
+/* This file is automatically generated by gencontext.c. */
+#define OFFSET_SP  0x0
+#define OFFSET_PC  0x8
+#define OFFSET_RBX 0x10
+#define OFFSET_RBP 0x18
+#define OFFSET_R12 0x20
+#define OFFSET_R13 0x28
+#define OFFSET_R14 0x30
+#define OFFSET_R15 0x38
+#define OFFSET_TLS 0x40

 /uspace/trunk/libc/arch/amd64/include/psthread.h
 ,0 → 1,58
+/*
+ * 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__amd64PSTHREAD_H__
+#define __LIBC__amd64PSTHREAD_H__
+#include <types.h>
+/* 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     16
+/* We include only registers that must be preserved
+ * during function call
+ */
+typedef struct {
+    uint64_t sp;
+    uint64_t pc;
+    uint64_t rbx;
+    uint64_t rbp;
+    uint64_t r12;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t tls;
+} context_t;
+#endif

 /uspace/trunk/libc/arch/amd64/include/atomic.h
 ,0 → 1,69
+/*
+ * 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.
+ */
+#ifndef __amd64_ATOMIC_H__
+#define __amd64_ATOMIC_H__
+static inline void atomic_inc(atomic_t *val) {
+    __asm__ volatile ("lock incq %0\n" : "=m" (val->count));
+}
+static inline void atomic_dec(atomic_t *val) {
+    __asm__ volatile ("lock decq %0\n" : "=m" (val->count));
+}
+static inline long atomic_postinc(atomic_t *val)
+{
+    long r;
+    __asm__ volatile (
+        "movq $1, %0\n"
+        "lock xaddq %0, %1\n"
+        : "=r" (r), "=m" (val->count)
+    );
+    return r;
+}
+static inline long atomic_postdec(atomic_t *val)
+{
+    long r;
+    __asm__ volatile (
+        "movq $-1, %0\n"
+        "lock xaddq %0, %1\n"
+        : "=r" (r), "=m" (val->count)
+    );
+    return r;
+}
+#define atomic_preinc(val) (atomic_postinc(val)+1)
+#define atomic_predec(val) (atomic_postdec(val)-1)
+#endif

 /uspace/trunk/libc/arch/amd64/include/thread.h
 ,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__amd64THREAD_H__
+#define __LIBC__amd64THREAD_H__
+#include <libc.h>
+static inline void __tls_set(void *tls)
+{
+    __SYSCALL1(SYS_TLS_SET, (sysarg_t) tls);
+}
+static inline void * __tls_get(void)
+{
+    void * retval;
+    __asm__ ("movq %%fs:0, %0" : "=r"(retval));
+    return retval;
+}
+#endif

 /uspace/trunk/libc/arch/amd64/Makefile.inc
 ,6 → 32,7
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = /usr/local/amd64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/psthread.S
 LFLAGS += -N

/uspace/trunk/libc/arch/amd64/src/entry.s
36,6 → 36,7
#
#
__entry:
call __main
call main
call __exit

/uspace/trunk/libc/arch/amd64/src/thread_entry.s
38,6 → 38,6
# RAX contains address of uarg
#
movq %rax, %rdi
call thread_main
call __thread_main

.end __thread_entry

 /uspace/trunk/libc/arch/amd64/src/psthread.S
 ,0 → 1,87
+#
+# 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
+#include <libarch/context_offset.h>
+## Save current CPU context
+#
+# Save CPU context to context_t variable
+# pointed by the 1st argument. Returns 1 in EAX.
+#
+context_save:
+    movq (%rsp), %rdx     # the caller's return %eip
+    # In %edi is passed 1st argument
+    movq %rdx, OFFSET_PC(%rdi)
+    movq %rsp, OFFSET_SP(%rdi)
+    movq %rbx, OFFSET_RBX(%rdi)
+    movq %rbp, OFFSET_RBP(%rdi)
+    movq %r12, OFFSET_R12(%rdi)
+    movq %r13, OFFSET_R13(%rdi)
+    movq %r14, OFFSET_R14(%rdi)
+    movq %r15, OFFSET_R15(%rdi)
+    # Save TLS
+    movq %fs:0, %rax
+    movq %rax, OFFSET_TLS(%rdi)
+    xorq %rax,%rax      # context_save returns 1
+    incq %rax
+    ret
+## Restore current CPU context
+#
+# Restore CPU context from context_t variable
+# pointed by the 1st argument. Returns 0 in EAX.
+#
+context_restore:
+    movq OFFSET_R15(%rdi), %r15
+    movq OFFSET_R14(%rdi), %r14
+    movq OFFSET_R13(%rdi), %r13
+    movq OFFSET_R12(%rdi), %r12
+    movq OFFSET_RBP(%rdi), %rbp
+    movq OFFSET_RBX(%rdi), %rbx
+    movq OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+    movq OFFSET_PC(%rdi), %rdx
+    movq %rdx,(%rsp)
+    # Set thread local storage
+    movq OFFSET_TLS(%rdi), %rdi   # Set arg1 to TLS addr
+    movq $1, %r8
+    syscall
+    xorq %rax,%rax      # context_restore returns 0
+    ret

/uspace/trunk/libc/arch/mips32/include/atomic_arch.h
File deleted

 /uspace/trunk/libc/arch/mips32/include/context_offset.h
 ,0 → 1,15
+/* This file is automatically generated by gencontext.c. */
+/* struct context */
+#define OFFSET_SP      0x0
+#define OFFSET_PC      0x4
+#define OFFSET_S0      0x8
+#define OFFSET_S1      0xc
+#define OFFSET_S2      0x10
+#define OFFSET_S3      0x14
+#define OFFSET_S4      0x18
+#define OFFSET_S5      0x1c
+#define OFFSET_S6      0x20
+#define OFFSET_S7      0x24
+#define OFFSET_S8      0x28
+#define OFFSET_GP      0x2c
+#define OFFSET_TLS     0x30

 /uspace/trunk/libc/arch/mips32/include/psthread.h
 ,0 → 1,53
+/*
+ * 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__mips32PSTHREAD_H__
+#define __LIBC__mips32PSTHREAD_H__
+#include <types.h>
+#define SP_DELTA    (8)
+typedef struct  {
+    uint32_t sp;
+    uint32_t pc;
+    uint32_t s0;
+    uint32_t s1;
+    uint32_t s2;
+    uint32_t s3;
+    uint32_t s4;
+    uint32_t s5;
+    uint32_t s6;
+    uint32_t s7;
+    uint32_t s8;
+    uint32_t gp;
+    uint32_t tls; /* Thread local storage(=k1) */
+} context_t;
+#endif

 /uspace/trunk/libc/arch/mips32/include/atomic.h
 ,0 → 1,67
+/*
+ * Copyright (C) 2005 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 __mips32_ATOMIC_H__
+#define __mips32_ATOMIC_H__
+#define atomic_inc(x)   ((void) atomic_add(x, 1))
+#define atomic_dec(x)   ((void) atomic_add(x, -1))
+#define atomic_postinc(x) (atomic_add(x, 1) - 1)
+#define atomic_postdec(x) (atomic_add(x, -1) + 1)
+#define atomic_preinc(x) atomic_add(x, 1)
+#define atomic_predec(x) atomic_add(x, -1)
+/* Atomic addition of immediate value.
+ *
+ * @param val Memory location to which will be the immediate value added.
+ * @param i Signed immediate that will be added to *val.
+ *
+ * @return Value after addition.
+ */
+static inline long atomic_add(atomic_t *val, int i)
+{
+    long tmp, v;
+    __asm__ volatile (
+        "1:\n"
+        "   ll %0, %1\n"
+        "   addiu %0, %0, %3\n" /* same as addi, but never traps on overflow */
+        "       move %2, %0\n"
+        "   sc %0, %1\n"
+        "   beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
+        /*  nop */      /* nop is inserted automatically by compiler */
+        : "=r" (tmp), "=m" (val->count), "=r" (v)
+        : "i" (i), "i" (0)
+        );
+    return v;
+}
+#endif

 /uspace/trunk/libc/arch/mips32/include/thread.h
 ,0 → 1,46
+/*
+ * 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__mips32THREAD_H__
+#define __LIBC__mips32THREAD_H__
+static inline void __tls_set(void *tls)
+{
+    __asm__ volatile ("add $27, %0, $0" : : "r"(tls)); /* Move tls to K1 */
+}
+static inline void * __tls_get(void)
+{
+    void * retval;
+    __asm__ volatile("add %0, $27, $0" : "=r"(retval));
+    return retval;
+}
+#endif

 /uspace/trunk/libc/arch/mips32/Makefile.inc
 ,9 → 31,10
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = /usr/local/mipsel/bin
-CFLAGS += -mno-abicalls -mips3
+CFLAGS += -mno-abicalls -mips3 -ftls-model=global-dynamic
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+    arch/$(ARCH)/src/psthread.S
 LFLAGS += -N

 /uspace/trunk/libc/arch/mips32/src/entry.s
 ,13 → 36,18
 ## User-space task entry point
 #
 #
+.ent __entry
 __entry:
     lui $28, _gp
+    # Mips o32 may store its arguments on stack, make space,
+    # so that it could work with -O0
+    addiu $sp, -16
+    jal __main
     jal main
-    nop
     jal __exit
-    nop
 .end __entry

 /uspace/trunk/libc/arch/mips32/src/thread_entry.s
 ,6 → 37,7
 ## User-space thread entry point for all but the first threads.
 #
 #
+.ent __thread_entry
 __thread_entry:
     lui $28, _gp
 ,9 → 45,13
     # v0 contains address of uarg.
     #
     add $4, $2, 0
-    jal thread_main
+    # Mips o32 may store its arguments on stack, make space
+    addiu $sp, -16
+    j __thread_main
     nop
     #
     # Not reached.
     #
+.end __thread_entry

 /uspace/trunk/libc/arch/mips32/src/psthread.S
 ,0 → 1,88
+#
+# Copyright (C) 2003-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
+.set noat
+.set noreorder
+.set nomacro
+#include <arch/asm/regname.h>
+#include <libarch/context_offset.h>
+.global context_save
+.global context_restore
+.macro CONTEXT_STORE r
+    sw $s0,OFFSET_S0(\r)
+    sw $s1,OFFSET_S1(\r)
+    sw $s2,OFFSET_S2(\r)
+    sw $s3,OFFSET_S3(\r)
+    sw $s4,OFFSET_S4(\r)
+    sw $s5,OFFSET_S5(\r)
+    sw $s6,OFFSET_S6(\r)
+    sw $s7,OFFSET_S7(\r)
+    sw $s8,OFFSET_S8(\r)
+    sw $gp,OFFSET_GP(\r)
+    sw $k1,OFFSET_TLS(\r)
+    sw $ra,OFFSET_PC(\r)
+    sw $sp,OFFSET_SP(\r)
+.endm
+.macro CONTEXT_LOAD r
+    lw $s0,OFFSET_S0(\r)
+    lw $s1,OFFSET_S1(\r)
+    lw $s2,OFFSET_S2(\r)
+    lw $s3,OFFSET_S3(\r)
+    lw $s4,OFFSET_S4(\r)
+    lw $s5,OFFSET_S5(\r)
+    lw $s6,OFFSET_S6(\r)
+    lw $s7,OFFSET_S7(\r)
+    lw $s8,OFFSET_S8(\r)
+    lw $gp,OFFSET_GP(\r)
+    lw $k1,OFFSET_TLS(\r)
+    lw $ra,OFFSET_PC(\r)
+    lw $sp,OFFSET_SP(\r)
+.endm
+context_save:
+    CONTEXT_STORE $a0
+    # context_save returns 1
+    j $ra
+    li $v0, 1
+context_restore:
+    CONTEXT_LOAD $a0
+    # context_restore returns 0
+    j $ra
+    xor $v0, $v0

/uspace/trunk/libc/arch/ia32/include/atomic_arch.h
File deleted

 /uspace/trunk/libc/arch/ia32/include/atomic.h
 ,0 → 1,69
+/*
+ * 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.
+ */
+#ifndef __ia32_ATOMIC_H__
+#define __ia32_ATOMIC_H__
+static inline void atomic_inc(atomic_t *val) {
+    __asm__ volatile ("lock incl %0\n" : "=m" (val->count));
+}
+static inline void atomic_dec(atomic_t *val) {
+    __asm__ volatile ("lock decl %0\n" : "=m" (val->count));
+}
+static inline long atomic_postinc(atomic_t *val)
+{
+    long r;
+    __asm__ volatile (
+        "movl $1, %0\n"
+        "lock xaddl %0, %1\n"
+        : "=r" (r), "=m" (val->count)
+    );
+    return r;
+}
+static inline long atomic_postdec(atomic_t *val)
+{
+    long r;
+    __asm__ volatile (
+        "movl $-1, %0\n"
+        "lock xaddl %0, %1\n"
+        : "=r" (r), "=m" (val->count)
+    );
+    return r;
+}
+#define atomic_preinc(val) (atomic_postinc(val)+1)
+#define atomic_predec(val) (atomic_postdec(val)-1)
+#endif

 /uspace/trunk/libc/arch/ia32/Makefile.inc
 ,6 → 32,7
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = /usr/local/i686/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/psthread.S
 LFLAGS += -N

 /uspace/trunk/libc/arch/ia32/src/entry.s
 ,8 → 40,9
     mov %ax, %ds
     mov %ax, %es
     mov %ax, %fs
-    mov %ax, %gs
+    # Do not set %gs, it contains descriptor that can see TLS
+    call __main
     call main
     call __exit

 /uspace/trunk/libc/arch/ia32/src/thread_entry.s
 ,14 → 38,13
     mov %dx, %ds
     mov %dx, %es
     mov %dx, %fs
-    mov %dx, %gs
+    # Do not set %gs, it contains descriptor that can see TLS
     #
     # EAX contains address of uarg.
     #
     pushl %eax
-    call thread_main
-    addl $4, %esp
+    call __thread_main
     #
     # Not reached.

 /uspace/trunk/Makefile
 ,9 → 32,9
 -include Makefile.config
 DIRS = \
+    libc \
     softint \
     softfloat \
-    libc \
     libipc \
     libadt \
     init \

Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1112 → Rev 1113