Changeset 2615

Timestamp:

10/22/12 01:52:34 (7 months ago)

Author:

kaiwang27

Message:

Build a linked list for resolved symbols. Field "lsb->lsb_ref" points
to the symbol that the current symbol resolves to. Field
"lsb->lsb_prev" points to the symbol that resolves to the current
symbol.

Location:

trunk/ld

Files:

• ld_symbols.c (modified) (10 diffs)
• ld_symbols.h (modified) (1 diff)

trunk/ld/ld_symbols.c

@@ -60 +60 @@
 static struct ld_symbol *_find_symbol_from_input(struct ld_symbol *tbl,
     char *name);
+static void _update_import_export(struct ld *ld, struct ld_symbol *lsb);
 static void _update_symbol(struct ld *ld, struct ld_symbol *lsb);
 static void _add_version_name(struct ld *ld, struct ld_input *li, int ndx,
@@ -70 +71 @@
     Elf *e, Elf_Scn *versym, Elf_Scn *verneed, Elf_Scn *verdef);
 
-#define _add_symbol(tbl, s) \
-        HASH_ADD_KEYPTR(hh, (tbl), (s)->lsb_longname, \
-            strlen((s)->lsb_longname), (s))
+#define _add_symbol(tbl, s) do {                                \
+        HASH_ADD_KEYPTR(hh, (tbl), (s)->lsb_longname,           \
+            strlen((s)->lsb_longname), (s));                    \
+        _update_import_export(ld, (s));                         \
+        } while (0)
 #define _add_symbol_to_input(tbl, s) \
         HASH_ADD_KEYPTR(hhi, (tbl), (s)->lsb_name, strlen((s)->lsb_name), (s))
-#define _remove_symbol(tbl, s) HASH_DEL((tbl), (s))
+#define _remove_symbol(tbl, s) do {                             \
+        HASH_DEL((tbl), (s));                                   \
+        _update_import_export(ld, (s));                         \
+        } while (0)
+#define _resolve_symbol(_s, s) do {                             \
+        assert((_s) != (s));                                    \
+        if ((s)->lsb_prev != NULL) {                            \
+                (s)->lsb_prev->lsb_ref = (_s);                  \
+                (_s)->lsb_prev = (s)->lsb_prev;                 \
+        }                                                       \
+        (s)->lsb_prev = (_s);                                   \
+        (_s)->lsb_ref = (s);                                    \
+        } while (0)
 
 void
@@ -402 +417 @@
 }
 
+static void
+_update_import_export(struct ld *ld, struct ld_symbol *lsb)
+{
+
+        (void) ld;
+        (void) lsb;
+}
+
 static int
 _resolve_multidef_symbol(struct ld *ld, struct ld_symbol *lsb,
@@ -411 +434 @@
         else if (lsb->lsb_input != NULL &&
             lsb->lsb_input->li_type == LIT_DSO) {
-                lsb->lsb_ref = _lsb;
+                _resolve_symbol(lsb, _lsb);
                 return (-1);
         } else if (_lsb->lsb_input != NULL &&
             _lsb->lsb_input->li_type == LIT_DSO) {
-                _lsb->lsb_ref = lsb;
+                _resolve_symbol(_lsb, lsb);
                 _remove_symbol(ld->ld_symtab_def, _lsb);
         } else
@@ -442 +465 @@
                     (_lsb = _find_symbol(ld->ld_symtab_common, name)) !=
                     NULL) {
-                        lsb->lsb_ref = _lsb;
+                        _resolve_symbol(lsb, _lsb);
                         return;
                 }
@@ -459 +482 @@
                  */
                 if ((_lsb = _find_symbol(ld->ld_symtab_def, name)) != NULL) {
-                        lsb->lsb_ref = _lsb;
+                        _resolve_symbol(lsb, _lsb);
                         return;
                 }
@@ -469 +492 @@
                  */
                 if ((_lsb = _find_symbol(ld->ld_symtab_undef, name)) != NULL) {
-                        _lsb->lsb_ref = lsb;
+                        _resolve_symbol(_lsb, lsb);
                         _remove_symbol(ld->ld_symtab_undef, _lsb);
                 }
@@ -481 +504 @@
                     NULL) {
                         if (lsb->lsb_size > _lsb->lsb_size) {
-                                _lsb->lsb_ref = lsb;
+                                _resolve_symbol(_lsb, lsb);
                                 _remove_symbol(ld->ld_symtab_common, _lsb);
                         } else {
-                                lsb->lsb_ref = _lsb;
+                                _resolve_symbol(lsb, _lsb);
                                 return;
                         }
@@ -520 +543 @@
                  */
                 if ((_lsb = _find_symbol(ld->ld_symtab_undef, name)) != NULL) {
-                        _lsb->lsb_ref = lsb;
+                        _resolve_symbol(_lsb, lsb);
                         _remove_symbol(ld->ld_symtab_undef, _lsb);
                 }
                 if (lsb->lsb_default &&
                     (_lsb = _find_symbol(ld->ld_symtab_undef, sn)) != NULL) {
-                        _lsb->lsb_ref = lsb;
+                        _resolve_symbol(_lsb, lsb);
                         _remove_symbol(ld->ld_symtab_undef, _lsb);
                 }
@@ -538 +561 @@
                 if ((_lsb = _find_symbol(ld->ld_symtab_common, name)) !=
                     NULL) {
-                        _lsb->lsb_ref = lsb;
+                        _resolve_symbol(_lsb, lsb);
                         _remove_symbol(ld->ld_symtab_common, _lsb);
                 }
                 if (lsb->lsb_default &&
                     (_lsb = _find_symbol(ld->ld_symtab_common, sn)) != NULL) {
-                        _lsb->lsb_ref = lsb;
+                        _resolve_symbol(_lsb, lsb);
                         _remove_symbol(ld->ld_symtab_common, _lsb);
                 }

trunk/ld/ld_symbols.h

@@ -41 +41 @@
         unsigned char lsb_provide;      /* provide symbol */
         unsigned char lsb_provide_refed; /* provide symbol is referenced */
-        struct ld_symbol *lsb_ref;      /* resolved symbol reference */
+        struct ld_symbol *lsb_prev;     /* symbol resolved by this symbol */
+        struct ld_symbol *lsb_ref;      /* this symbol resolves to ... */
         struct ld_input *lsb_input;     /* containing input object */
         UT_hash_handle hh;              /* hash handle */