Changeset 6b781c0 in mainline for uspace/libc/arch/arm32/include/thread.h

Timestamp:

2007-06-08T15:02:49Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c03ee1c

Parents:

3ee8a075

Message:

Merge arm32 into trunk.

File:

• uspace/libc/arch/arm32/include/thread.h (modified) (3 diffs)

uspace/libc/arch/arm32/include/thread.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2007 Pavel Jancik, Michal Kebrt
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcia64        
+/** @addtogroup libcarm32
  * @{
  */
 /** @file
+ *  @brief Uspace threads and TLS.
  */
 
@@ -38 +39 @@
 #include <unistd.h>
 
+/** Stack initial size. */
 #define THREAD_INITIAL_STACK_PAGES_NO 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 {
+        /** psthread data. */
         void *pst_data;
-        /* TODO */
 } tcb_t;
 
+
+/** Sets TLS address to the r9 register.
+ *
+ *  @param tcb TCB (TLS starts behind)
+ */
 static inline void __tcb_set(tcb_t *tcb)
 {
-        /* TODO */
+        void *tls = (void *)tcb;
+        tls += sizeof(tcb_t) + ARM_TP_OFFSET;
+        asm volatile (
+                "mov r9, %0"
+                :
+                : "r"(tls)
+        );
 }
 
+
+/** Returns TCB address.
+ *
+ * @return TCB address (starts before TLS which address is stored in r9 register).
+ */
 static inline tcb_t *__tcb_get(void)
 {
-        /* TODO */
-        return NULL;
+        void *ret;
+        asm volatile (
+                "mov %0, r9"
+                : "=r"(ret)
+        );
+        return (tcb_t *)(ret - ARM_TP_OFFSET - sizeof(tcb_t));
 }
+
+
+/** Returns TLS address stored.
+ *
+ *  Implemented in assembly.
+ *
+ *  @return TLS address stored in r9 register
+ */
+extern uintptr_t __aeabi_read_tp(void);
 
 #endif