Changeset e175d69 in mainline for uspace/lib/c/arch/ia32/src

Timestamp:

2011-05-01T13:08:18Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

042fbe0

Parents:

a41577e (diff), e515a827 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge dynamic linking support (ia32-only, off by default). Very limited TLS
support. Executables which use TLS should set STATIC_ONLY = y in Makefile.

Location:

uspace/lib/c/arch/ia32/src

Files:

• rtld/dynamic.c (added)
• rtld/reloc.c (added)
• syscall.S (modified) (3 diffs)
• tls.c (modified) (2 diffs)

uspace/lib/c/arch/ia32/src/syscall.S

@@ -32 +32 @@
 __syscall_fast_func:
         .long __syscall_slow
+        .size __syscall_fast_func, . - __syscall_fast_func
 
 .text
@@ -71 +72 @@
  */
 .global __syscall_fast
+        .type __syscall_fast, @function
+
 __syscall_fast:
         pushl %ebx
@@ -95 +98 @@
         popl %ebx
         ret
+
+        .size __syscall_fast, . - __syscall_fast

uspace/lib/c/arch/ia32/src/tls.c

@@ -37 +37 @@
 #include <tls.h>
 #include <sys/types.h>
+#include <align.h>
 
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -48 +49 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti);
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti)
+{
+        size_t tls_size;
+        uint8_t *tls;
+
+        /* Calculate size of TLS block */
+        tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment);
+
+        /* The TLS block is just before TCB */
+        tls = (uint8_t *)__tcb_get() - tls_size;
+
+        return tls + ti->ti_offset;
+}
+
 /** @}
  */