Changeset d2bb25e7 in mainline for uspace/lib/c/arch/ia32

Timestamp:

2016-05-17T22:51:37Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9c07c3d

Parents:

e2f26002

Message:

Use DTVs. symbol_get_addr() should not implicitly read current thread pointer.

Location:

uspace/lib/c/arch/ia32

Files:

• include/libarch/tls.h (modified) (1 diff)
• src/rtld/reloc.c (modified) (2 diffs)
• src/tls.c (modified) (1 diff)

uspace/lib/c/arch/ia32/include/libarch/tls.h

@@ -43 +43 @@
         void *self;
         void *fibril_data;
+        void **dtv;
 } tcb_t;
 

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -101 +101 @@
                         sym_def = symbol_def_find(str_tab + sym->st_name,
                             m, ssf_none, &dest);
-//                      DPRINTF("dest name: '%s'\n", dest->dyn.soname);
+                        DPRINTF("dest name: '%s'\n", dest->dyn.soname);
 //                      DPRINTF("dest bias: 0x%x\n", dest->bias);
                         if (sym_def) {
                                 sym_addr = (uint32_t)
-                                    symbol_get_addr(sym_def, dest);
+                                    symbol_get_addr(sym_def, dest, NULL);
 //                              DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
                         } else {
@@ -154 +154 @@
                         if (sym_def) {
                                 sym_addr = (uint32_t)
-                                    symbol_get_addr(sym_def, dest);
+                                    symbol_get_addr(sym_def, dest, NULL);
                         } else {
                                 printf("Source definition of '%s' not found.\n",

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

@@ -73 +73 @@
 #ifdef CONFIG_RTLD
         if (runtime_env != NULL) {
-                return rtld_tls_get_addr(runtime_env, ti->ti_module,
-                    ti->ti_offset);
+                return rtld_tls_get_addr(runtime_env, __tcb_get(),
+                    ti->ti_module, ti->ti_offset);
         }
 #endif