Changeset fa23560 in mainline for uspace/lib/libc/arch/amd64

Timestamp:

2007-10-30T22:54:11Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4d21cf8

Parents:

b2a0f6dd

Message:

Unify implementations of TLS variant I and variant II alloc_tls() and
free_tls_arch().

Location:

uspace/lib/libc/arch/amd64

Files:

• Makefile.inc (modified) (1 diff)
• include/thread.h (modified) (1 diff)
• include/tls.h (added)
• src/tls.c (moved) (moved from uspace/lib/libc/arch/amd64/src/thread.c ) (1 diff)

uspace/lib/libc/arch/amd64/Makefile.inc

@@ -35 +35 @@
 ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
                 arch/$(ARCH)/src/fibril.S \
-                arch/$(ARCH)/src/thread.c
+                arch/$(ARCH)/src/tls.c
 
 LFLAGS += -N

uspace/lib/libc/arch/amd64/include/thread.h

@@ -36 +36 @@
 #define LIBC_amd64_THREAD_H_
 
-#include <libc.h>
-
-typedef struct {
-        void *self;
-        void *fibril_data;
-} tcb_t;
-
-static inline void __tcb_set(tcb_t *tcb)
-{
-        __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb);
-}
-
-static inline tcb_t * __tcb_get(void)
-{
-        void * retval;
-
-        asm ("movq %%fs:0, %0" : "=r"(retval));
-        return retval;
-}
-
 #endif
 

uspace/lib/libc/arch/amd64/src/tls.c

@@ -35 +35 @@
  */
 
-#include <thread.h>
-#include <malloc.h>
-#include <align.h>
+#include <tls.h>
+#include <sys/types.h>
 
-/** Allocate TLS & TCB for initial module threads
- *
- * @param data Start of data section
- * @return pointer to tcb_t structure
- */
 tcb_t * __alloc_tls(void **data, size_t size)
 {
-        tcb_t *tcb;
-        
-        size = ALIGN_UP(size, &_tls_alignment);
-        *data = memalign(&_tls_alignment, sizeof(tcb_t) + size);
-
-        tcb = (tcb_t *) (*data + size);
-        tcb->self = tcb;
-
-        return tcb;
+        return tls_alloc_variant_2(data, size);
 }
 
 void __free_tls_arch(tcb_t *tcb, size_t size)
 {
-        size = ALIGN_UP(size, &_tls_alignment);
-        void *start = ((void *)tcb) - size;
-        free(start);
+        tls_free_variant_2(tcb, size);
 }