Changeset 1098

Timestamp:

Jan 28, 2004, 5:28:02 PM (22 years ago)

Author:

bird

Message:

#861: Fixed selfrefering alias issue. Improved the unresolved external reporting. Free symbols upon linker destruction.

File:

• trunk/src/emx/src/emxomf/weakld.c (modified) (13 diffs, 1 prop)

trunk/src/emx/src/emxomf/weakld.c

@@ -246 +246 @@
     PWLDMOD             pMod;
 
+    /** Array of modules refering this symbol. */
+    PWLDMOD *           paReferers;
+
+    /** Number of modules in the array. */
+    unsigned            cReferers;
+
     /** Per type data union */
     union type_data
@@ -436 +442 @@
 static int          symSearchLibEnum(PWLD pWld, PWLDSYM pSym, void *pvUser);
 static inline unsigned symHash(const char* pszSym, unsigned cch);
-#ifdef WLD_ENABLED_DBG
+static const char * symGetDescr(PWLDSYM pSym);
 static void         symDbg(PWLDSYM pSym, const char *pszMsg);
-#endif
 static PWLDSYM      symAdd(PWLD pWld, PWLDMOD pMod, unsigned fFlags, const char *pachName, int cchName, PWLDSYMACTION peAction);
 static PWLDSYM      symAddImport(PWLD pWld, PWLDMOD pMod, int fLibSearch,
@@ -1348 +1353 @@
 
     if (pMod)
-        modErr(pMod, "Unresolved symbol '%s'.", pSym->pszName);
+        modErr(pMod, "Unresolved symbol (%s) '%s'.", symGetDescr(pSym), pSym->pszName);
     else
-        wldErr(pWld, "Unresolved symbol '%s'.", pSym->pszName);
+        wldErr(pWld, "Unresolved symbol (%s) '%s'.", symGetDescr(pSym), pSym->pszName);
+    if (pSym->cReferers)
+    {
+        int     i;
+        wldInfo("The symbol is referenced by:\n");
+        for (i = 0; i < pSym->cReferers; i++)
+        {
+            pMod = pSym->paReferers[i];
+            if (pMod->pLib)
+                fprintf(stderr, "    %s(%s)\n", pMod->pLib->pszLibName, pMod->pszModName);
+            else
+                fprintf(stderr, "    %s\n", pMod->pszModName);
+        }
+    }
     return 0;
 }
@@ -1411 +1429 @@
 
 
-
-
-
-
-
-#ifdef WLD_ENABLED_DBG
+/**
+ * Makes a description of the symbol.
+ *
+ * @returns Pointer to static string buffer.
+ * @param   pSym    Symbol to describe.
+ */
+static const char *symGetDescr(PWLDSYM pSym)
+{
+    static char szDesc[256];
+    char *psz = &szDesc[0];
+
+    switch (pSym->fFlags & WLDSF_TYPEMASK)
+    {
+        case WLDSF_PUBLIC:  psz += sprintf(psz, "PUBLIC"); break;
+        case WLDSF_COMM:    psz += sprintf(psz, "COMM"); break;
+        case WLDSF_IMPORT:  psz += sprintf(psz, "IMPORT"); break;
+        case WLDSF_UNDEF:   psz += sprintf(psz, "UNDEF"); break;
+        case WLDSF_WKEXT:   psz += sprintf(psz, "WKEXT"); break;
+        default:            psz += sprintf(psz, "!!!internal error!!! "); asm("int $3"); break;
+    }
+    if (pSym->fFlags & WLDSF_WEAK)
+        psz += sprintf(psz, " WEAK");
+    if (pSym->fFlags & WLDSF_ALIAS)
+        psz += sprintf(psz, " ALIAS");
+    if (pSym->fFlags & WLDSF_EXPORT)
+        psz += sprintf(psz, " EXPORT");
+    if (pSym->fFlags & WLDSF_UNCERTAIN)
+        psz += sprintf(psz, " UNCERTAIN");
+
+    return &szDesc[0];
+}
+
+
+
+
 /**
  * Symbol debug output.
@@ -1429 +1476 @@
         fprintf(stderr, "weakld: dbg:");
     if (pSym)
-    {
-        fprintf(stderr, " '%s'", pSym->pszName);
-        switch (pSym->fFlags & WLDSF_TYPEMASK)
-        {
-            case WLDSF_PUBLIC:  fprintf(stderr, " PUBLIC"); break;
-            case WLDSF_COMM:    fprintf(stderr, " COMM"); break;
-            case WLDSF_IMPORT:  fprintf(stderr, " IMPORT"); break;
-            case WLDSF_UNDEF:   fprintf(stderr, " UNDEF"); break;
-            case WLDSF_WKEXT:   fprintf(stderr, " WKEXT"); break;
-            default:            fprintf(stderr, " !!!internal error!!!"); asm("int $3"); break;
-        }
-        if (pSym->fFlags & WLDSF_WEAK)
-            fprintf(stderr, " WEAK");
-        if (pSym->fFlags & WLDSF_ALIAS)
-            fprintf(stderr, " ALIAS");
-        if (pSym->fFlags & WLDSF_EXPORT)
-            fprintf(stderr, " ALIAS");
-        if (pSym->fFlags & WLDSF_UNCERTAIN)
-            fprintf(stderr, " UNCERTAIN");
-    }
+        fprintf(stderr, " '%s' %s", pSym->pszName, symGetDescr(pSym));
     else
         fprintf(stderr, " <Symbol is NULL>");
     fprintf(stderr, "\n");
 }
-#endif
-
 
 /**
@@ -1553 +1579 @@
         pSym->fFlags = fFlags;
         pSym->pszName = pszName;
-        if (SYM_IS_DEFINED(pSym->fFlags))
-            pSym->pMod = pMod;
         if (cchNameWeak)
         {
@@ -1688 +1712 @@
             wldInfo("fFlags new 0x%04x  fFlags old 0x%04x.", fFlags, pSym->fFlags);
             pSym = NULL;
+        }
+
+        /*
+         * Maintain the module pointer and referers.
+         */
+        if (pSym)
+        {
+            if (SYM_IS_DEFINED(pSym->fFlags))
+                pSym->pMod = pMod;
+            else
+            {
+                int i;
+                for (i = 0; i < pSym->cReferers; i++)
+                    if (pSym->paReferers[i] == pMod)
+                        break;
+                if (i >= pSym->cReferers)
+                {
+                    if (!(pSym->cReferers % 64))
+                        pSym->paReferers = xrealloc(pSym->paReferers, sizeof(pSym->paReferers[0]) * (pSym->cReferers + 64));
+                    pSym->paReferers[pSym->cReferers++] = pMod;
+                }
+            }
         }
     }
@@ -1861 +1907 @@
         PWLDSYM     pSymAlias;
 
+        pSym->fFlags |= WLDSF_EXPORT;
+
         /*
          * Add internal name.
@@ -1875 +1923 @@
         else
         {
-            if (pSym->pAliasFor != pSymAlias)
+            if (pSym != pSymAlias)
             {
                 pSym->fFlags |= WLDSF_ALIAS;
@@ -1982 +2030 @@
             {
                 modErr(pMod, "Aliased symbol apparently existed already (upgraded - internal error?).");
+                symDbg(pSym, "Processing");
+                symDbg(pSym->pAliasFor, "Alias");
                 pSym = NULL;
             }
@@ -2500 +2550 @@
     PWLDMOD     pObj;
     PWLDLIB     pLib;
+    unsigned    uHash;
 
     if (!pWld)
@@ -2529 +2580 @@
         pLib = pLib->pNext;
         free(pv);
+    }
+
+    /* free symbols */
+    for (uHash = 0; uHash < sizeof(pWld->Global.ap) / sizeof(pWld->Global.ap[0]); uHash++)
+    {
+        PWLDSYM     pSym = pWld->Global.ap[uHash];
+        while (pSym)
+        {
+            PWLDSYM pNext = pSym->pHashNext;
+            if (pSym->paReferers)
+                free(pSym->paReferers);
+            free(pSym);
+            pSym = pNext;
+        }
     }
 
@@ -3307 +3372 @@
                 return 0;               /* .ignore it. good idea? */
             }
+
+            WLDDBG2(("wldGenerateDefCallback: '%s', '%s'", pSymExp->pszName, pSymInt ? pSymInt->pszName : "<the-same-name>"));
 
             /* Skip it all if neither of the symbols are weak. */