#include <elf.h>
#include <limits.h>
+#include <sys/mman.h>
+#include <string.h>
#include "pthread_impl.h"
#include "libc.h"
#include "atomic.h"
void *__copy_tls(unsigned char *mem)
{
- mem += -size & (4*sizeof(size_t)-1);
- mem += ((uintptr_t)image - (uintptr_t)mem) & (align-1);
+ pthread_t td;
+ if (!image) return mem;
+ void **dtv = (void *)mem;
+ dtv[0] = (void *)1;
+#ifdef TLS_ABOVE_TP
+ mem += sizeof(void *) * 2;
+ mem += -((uintptr_t)mem + sizeof(struct pthread)) & (align-1);
+ td = (pthread_t)mem;
+ mem += sizeof(struct pthread);
+#else
+ mem += libc.tls_size - sizeof(struct pthread);
+ mem -= (uintptr_t)mem & (align-1);
+ td = (pthread_t)mem;
+ td->dtv = dtv;
+ mem -= size;
+#endif
+ dtv[1] = mem;
memcpy(mem, image, len);
- return mem + size;
+ return td;
+}
+
+void *__tls_get_addr(size_t *v)
+{
+ return (char *)__pthread_self()->dtv[1]+v[1];
}
static void *simple(void *p)
{
*(void **)p = p;
- return __set_thread_area(p) ? 0 : p;
+ return __set_thread_area(TP_ADJ(p)) ? 0 : p;
}
weak_alias(simple, __install_initial_tls);
typedef Elf64_Phdr Phdr;
#endif
-#define AUX_CNT 6
-
-void __init_tls(size_t *auxv)
+void __init_tls(size_t *aux)
{
- size_t i, aux[AUX_CNT] = { 0 };
unsigned char *p, *mem;
- size_t n, d;
+ size_t n;
Phdr *phdr, *tls_phdr=0;
size_t base = 0;
- for (; auxv[0]; auxv+=2) if (auxv[0]<AUX_CNT) aux[auxv[0]] = auxv[1];
- p = (void *)aux[AT_PHDR];
- for (p=(void *)aux[AT_PHDR]; aux[AT_PHNUM]--; p+=aux[AT_PHENT]) {
+ libc.tls_size = sizeof(struct pthread);
+
+ for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
phdr = (void *)p;
if (phdr->p_type == PT_PHDR)
base = aux[AT_PHDR] - phdr->p_vaddr;
}
if (!tls_phdr) return;
- libc.tls_size = size+align+8*sizeof(size_t)+sizeof(struct pthread);
-
image = (void *)(base + tls_phdr->p_vaddr);
len = tls_phdr->p_filesz;
size = tls_phdr->p_memsz;
align = tls_phdr->p_align;
+
+ size += (-size - (uintptr_t)image) & (align-1);
+ if (align < 4*sizeof(size_t)) align = 4*sizeof(size_t);
+
+ libc.tls_size = 2*sizeof(void *)+size+align+sizeof(struct pthread);
+
mem = __mmap(0, libc.tls_size, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- if (mem == MAP_FAILED) a_crash();
-
if (!__install_initial_tls(__copy_tls(mem))) a_crash();
}
#else