Changeset fa23560 in mainline for uspace/lib/libc/arch/arm32/include/tls.h

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().

File:

• uspace/lib/libc/arch/arm32/include/tls.h (moved) (moved from uspace/lib/libc/arch/sparc64/src/thread.c ) (2 diffs)

uspace/lib/libc/arch/arm32/include/tls.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2007 Pavel Jancik
+ * Copyright (c) 2007 Michal Kebrt
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup libcsparc64 sparc64
- * @ingroup lc
+/** @addtogroup libcarm32
  * @{
  */
 /** @file
- *
  */
 
-#include <thread.h>
-#include <malloc.h>
-#include <align.h>
+#ifndef LIBC_arm32_TLS_H_
+#define LIBC_arm32_TLS_H_
 
-/*
- * sparc64 uses thread-local storage data structures, variant II, as described
- * in:
- *      Drepper U.: ELF Handling For Thread-Local Storage, 2005
+#include <sys/types.h>
+
+#define CONFIG_TLS_VARIANT_1
+
+/** Offsets for accessing __thread variables are shifted 8 bytes higher. */
+#define ARM_TP_OFFSET  (-8)
+
+/** TCB (Thread Control Block) struct. 
+ *
+ *  TLS starts just after this struct.
  */
+typedef struct {
+        /** Fibril data. */
+        void *fibril_data;
+} tcb_t;
 
-/** Allocate TLS variant II data structures for a thread.
+
+/** Sets TLS address to the r9 register.
  *
- * Only static model is supported.
- *
- * @param data Pointer to pointer to thread local data. This is actually an
- *      output argument.
- * @param size Size of thread local data.
- * @return Pointer to TCB structure.
+ *  @param tcb          TCB (TLS starts behind)
  */
-tcb_t * __alloc_tls(void **data, size_t size)
+static inline void __tcb_set(tcb_t *tcb)
 {
-        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;
+        void *tls = (void *) tcb;
+        tls += sizeof(tcb_t) + ARM_TP_OFFSET;
+        asm volatile (
+                "mov r9, %0"
+                :
+                : "r" (tls)
+        );
 }
 
-/** Free TLS variant II data structures of a thread.
+
+/** Returns TCB address.
  *
- * Only static model is supported.
+ * @return              TCB address (starts before TLS which address is stored
+ *                      in r9 register).
+ */
+static inline tcb_t *__tcb_get(void)
+{
+        void *ret;
+        asm volatile (
+                "mov %0, r9"
+                : "=r"(ret)
+        );
+        return (tcb_t *) (ret - ARM_TP_OFFSET - sizeof(tcb_t));
+}
+
+
+/** Returns TLS address stored.
  *
- * @param tcb Pointer to TCB structure.
- * @param size Size of thread local data.
+ *  Implemented in assembly.
+ *
+ *  @return             TLS address stored in r9 register
  */
-void __free_tls_arch(tcb_t *tcb, size_t size)
-{
-        size = ALIGN_UP(size, &_tls_alignment);
-        void *start = ((void *) tcb) - size;
-        free(start);
-}
+extern uintptr_t __aeabi_read_tp(void);
+
+#endif
 
 /** @}