Changeset 9c07c3d in mainline

Timestamp:

2016-05-19T06:45:09Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

97696ab

Parents:

d2bb25e7

Message:

Create TLS blocks for non-initial modules when needed.

File:

• uspace/lib/c/generic/rtld/rtld.c (modified) (1 diff)

uspace/lib/c/generic/rtld/rtld.c

@@ -221 +221 @@
     unsigned long offset)
 {
-        if (DTV_GN(tcb->dtv) < mod_id || tcb->dtv[mod_id] == NULL) {
-                printf("Module is not initial. aborting.\n");
-                abort();
+        module_t *m;
+        size_t dtv_len;
+        void *tls_block;
+
+        dtv_len = DTV_GN(tcb->dtv);
+        if (dtv_len < mod_id) {
+                /* Vector is short */
+
+                tcb->dtv = realloc(tcb->dtv, (1 + mod_id) * sizeof(void *));
+                /* XXX This can fail if OOM */
+                assert(tcb->dtv != NULL);
+                /* Zero out new part of vector */
+                memset(tcb->dtv + (1 + dtv_len), 0, (mod_id - dtv_len) *
+                    sizeof(void *));
+        }
+
+        if (tcb->dtv[mod_id] == NULL) {
+                /* TLS block is not allocated */
+
+                m = module_by_id(rtld, mod_id);
+                assert(m != NULL);
+                /* Should not be initial module, those have TLS pre-allocated */
+                assert(!link_used(&m->imodules_link));
+
+                tls_block = malloc(m->tdata_size + m->tbss_size);
+                /* XXX This can fail if OOM */
+                assert(tls_block != NULL);
+
+                /* Copy tdata */
+                memcpy(tls_block, m->tdata, m->tdata_size);
+                /* Zero out tbss */
+                memset(tls_block + m->tdata_size, 0, m->tbss_size);
+
+                tcb->dtv[mod_id] = tls_block;
         }