Changeset c4c5de5 in mainline for libc/arch/mips32

Timestamp:

2006-03-24T14:29:19Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8fe1cdb

Parents:

520492a

Message:

Completed support for TLS in GCC (modifier thread) for ia32,amd64,ia64 and mips.

Location:

libc/arch/mips32

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• include/psthread.h (modified) (1 diff)
• include/thread.h (modified) (1 diff)
• src/thread.c (added)

libc/arch/mips32/Makefile.inc

@@ -35 +35 @@
 
 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/psthread.S
+        arch/$(ARCH)/src/psthread.S \
+        arch/$(ARCH)/src/thread.c
 
 

libc/arch/mips32/_link.ld.in

@@ -22 +22 @@
                 *(.data.rel*);
         } :data
+
         .got : {
                 _gp = .;
                 *(.got);
         } :data
+
+        .tdata : {
+                _tdata_start = .;
+                *(.tdata);
+                _tdata_end = .;
+        } :data
+        .tbss : {
+                _tbss_start = .;
+                *(.tbss);
+                _tbss_end = .;
+        } :data
+
         .sbss : {
                 *(.scommon);

libc/arch/mips32/include/psthread.h

@@ -32 +32 @@
 #include <types.h>
 
+/* We define our own context_set, because we need to set
+ * the TLS pointer to the tcb+0x7000
+ *
+ * See tls_set in thread.h
+ */
+#define context_set(c, _pc, stack, size, ptls)                  \
+        (c)->pc = (sysarg_t) (_pc);                             \
+        (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA;     \
+        (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t);
+
+
 /* +16 is just for sure that the called function
  * have space to store it's arguments

libc/arch/mips32/include/thread.h

@@ -32 +32 @@
 #define __LIBC__mips32THREAD_H__
 
-static inline void __tls_set(void *tls)
+/* I did not find any specification (neither MIPS nor PowerPC), but
+ * as I found it
+ * - it uses Variant II
+ * - TCB is at Address(First TLS Block)+0x7000.
+ * - DTV is at Address(First TLS Block)+0x8000
+ * - What would happen if the TLS data was larger then 0x7000?
+ * - The linker never accesses DTV directly, has the second definition any
+ *   sense?
+ * We will make it this way:
+ * - TCB is at TP-0x7000-sizeof(tcb)
+ * - No assumption about DTV etc., but it will not have a fixed address
+ */
+#define MIPS_TP_OFFSET 0x7000
+
+typedef struct {
+        void *pst_data;
+} tcb_t;
+
+static inline void __tcb_set(tcb_t *tcb)
 {
-        __asm__ volatile ("add $27, %0, $0" : : "r"(tls)); /* Move tls to K1 */
+        void *tp = tcb;
+        tp += MIPS_TP_OFFSET + sizeof(tcb_t);
+
+        __asm__ volatile ("add $27, %0, $0" : : "r"(tp)); /* Move tls to K1 */
 }
 
-static inline void * __tls_get(void)
+static inline tcb_t * __tcb_get(void)
 {
         void * retval;
 
         __asm__ volatile("add %0, $27, $0" : "=r"(retval));
-        return retval;
+
+        return (tcb_t *)(retval - MIPS_TP_OFFSET - sizeof(tcb_t));
 }