Changeset 2c2295ab in mainline

Timestamp:

2007-10-28T21:03:02Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8ecba18b

Parents:

941cc8b

Message:

For architectures that make use of TLS variant II (i.e. amd64, ia32 and
sparc64), fix the way TLS and TCB is allocated. Now, TLS is allocated using
memalign() with the alignment specified in _tls_alignment. Size of TLS data
itself is rounded up to be a multiple of _tls_alignment.

Location:

uspace/lib/libc

Files:

• arch/amd64/src/thread.c (modified) (3 diffs)
• arch/sparc64/src/thread.c (modified) (3 diffs)
• include/thread.h (modified) (1 diff)

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

@@ -37 +37 @@
 #include <thread.h>
 #include <malloc.h>
+#include <align.h>
 
 /** Allocate TLS & TCB for initial module threads
@@ -47 +48 @@
         tcb_t *tcb;
         
-        *data = malloc(sizeof(tcb_t) + size);
+        size = ALIGN_UP(size, &_tls_alignment);
+        *data = memalign(&_tls_alignment, sizeof(tcb_t) + size);
 
         tcb = (tcb_t *) (*data + size);
@@ -57 +59 @@
 void __free_tls_arch(tcb_t *tcb, size_t size)
 {
+        size = ALIGN_UP(size, &_tls_alignment);
         void *start = ((void *)tcb) - size;
         free(start);

uspace/lib/libc/arch/sparc64/src/thread.c

@@ -37 +37 @@
 #include <thread.h>
 #include <malloc.h>
+#include <align.h>
 
 /*
@@ -57 +58 @@
         tcb_t *tcb;
         
-        *data = malloc(sizeof(tcb_t) + size);
+        size = ALIGN_UP(size, &_tls_alignment);
+        *data = memalign(&_tls_alignment, sizeof(tcb_t) + size);
 
         tcb = (tcb_t *) (*data + size);
@@ -74 +76 @@
 void __free_tls_arch(tcb_t *tcb, size_t size)
 {
+        size = ALIGN_UP(size, &_tls_alignment);
         void *start = ((void *) tcb) - size;
         free(start);

uspace/lib/libc/include/thread.h

@@ -42 +42 @@
 typedef uint64_t thread_id_t;
 
+extern char _tls_alignment;
+
 extern void __thread_entry(void);
 extern void __thread_main(uspace_arg_t *uarg);