Changeset 634e020 in mainline

Timestamp:

2016-04-28T18:25:29Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5035ba05

Parents:

9182e86f

Message:

When in doubt, keep re-reading the specs again and again.

Location:

uspace/lib/c

Files:

• generic/rtld/module.c (modified) (1 diff)
• include/rtld/dynamic.h (modified) (2 diffs)

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

@@ -62 +62 @@
         module_process_pre_arch(m);
 
-        if (m->dyn.plt_rel == DT_REL) {
-                DPRINTF("table type DT_REL\n");
-                if (m->dyn.rel != NULL) {
-                        DPRINTF("non-empty\n");
-                        rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
-                }
-                /* FIXME: this seems wrong */
-                if (m->dyn.jmp_rel != NULL) {
-                DPRINTF("table type jmp-rel\n");
-                        DPRINTF("non-empty\n");
+        /* jmp_rel table */
+        if (m->dyn.jmp_rel != NULL) {
+                DPRINTF("jmp_rel table\n");
+                if (m->dyn.plt_rel == DT_REL) {
+                        DPRINTF("jmp_rel table type DT_REL\n");
                         rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
-                }
-        } else { /* (m->dyn.plt_rel == DT_RELA) */
-                DPRINTF("table type DT_RELA\n");
-                if (m->dyn.rela != NULL) {
-                        DPRINTF("non-empty\n");
-                        rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
-                }
+                } else {
+                        assert(m->dyn.plt_rel == DT_RELA);
+                        DPRINTF("jmp_rel table type DT_RELA\n");
+                        rela_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
+                }
+        }
+
+        /* rel table */
+        if (m->dyn.rel != NULL) {
+                DPRINTF("rel table\n");
+                rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+        }
+
+        /* rela table */
+        if (m->dyn.rela != NULL) {
+                DPRINTF("rela table\n");
+                rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
         }
 

uspace/lib/c/include/rtld/dynamic.h

@@ -48 +48 @@
  */
 typedef struct dyn_info {
-        /** Type of relocations used for the PLT, either DT_REL or DT_RELA */
-        int plt_rel;
-
         /** Relocation table without explicit addends */
         void *rel;
@@ -64 +61 @@
         void *jmp_rel;
         size_t plt_rel_sz;
+        /** Type of relocations used for the PLT, either DT_REL or DT_RELA */
+        int plt_rel;
 
         /** Pointer to PLT/GOT (processor-specific) */