Changeset 522

Timestamp:

Aug 4, 2003, 4:23:22 PM (22 years ago)

Author:

bird

Message:

Better info, fixed major bug related to wldPass1.

File:

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

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

@@ -402 +402 @@
 typedef struct symSearchLibEnum_param
 {
-    /** Set if there are more undefined symbols. */
-    int         fMore;
     /** Library to search for symbols in. */
     PWLDLIB     pLib;
@@ -657 +655 @@
 static int          libTryLoadSymbolThruDictionary(PWLD pWld, PWLDLIB pLib, PWLDSYM pSym, unsigned *pcLoaded)
 {
-    //return 42;
     return libLoadUndefSymbols(pWld, pLib, pSym, pcLoaded); /* @todo implement this function! */
 }
@@ -902 +899 @@
                 }
 
+                /* update statistics */
+                if (pcLoaded)   
+                    (*pcLoaded)++;
+
                 /* if one symbol, we're done now */
                 if (pSym)
@@ -1185 +1186 @@
     pParam->cLoaded += cLoaded;
     if (rc == 42) /* more undef from the load. */
-    {
-        pParam->fMore = 1;
         rc = 0;
-    }
 
     return rc;
@@ -2042 +2040 @@
             {
                 if (!pMod->pszModName)
-                {
                     pMod->pszModName = strpool_addn(pWld->pStrMisc, u.pch + 1, *u.puch);
-                    WLDINFO(pWld, ("%s", pMod->pszModName));
-                }
+                /* Put out some /INFO stuff similar to ilink. */
+                if (pMod->pLib)
+                    WLDINFO(pWld, ("Reading @0x%08x %s(%s)", pMod->off, pMod->pLib->pszLibName, pMod->pszModName));
+                else
+                    WLDINFO(pWld, ("Reading @0x%08x %s", pMod->off, pMod->pszModName));
                 break;
             }
@@ -2353 +2353 @@
         return 8;
     }
-    WLDINFO(pWld, ("adding object %s.\n", pszName));
+    WLDINFO(pWld, ("adding object %s.", pszName));
 
     /*
@@ -2531 +2531 @@
         return 8;
     }
-    WLDINFO(pWld, ("adding deffile %s\n", pszName));
+    WLDINFO(pWld, ("**** PARSE DEFINITIONS FILE ****"));
+    WLDINFO(pWld, ("  %s", pszName));
 
     if (pWld->pDef)
@@ -2641 +2642 @@
     int     fFirstTime = 1;
 
-    WLDINFO(pWld, ("Pass 1"));
+    WLDINFO(pWld, ("**** PASS ONE ****"));
+    WLDINFO(pWld, ("**** LIBRARY SEARCH ****"));
     do
     {
         PWLDLIB     pLib;
 
+        WLDINFO(pWld, ("-- Begin Library Pass --"));
         cLoaded = fMore = 0;
         for (pLib = pWld->pLibs; pLib; pLib = pLib->pNext)
@@ -2651 +2654 @@
             int         rc;
             WLDSLEPARAM param;
-            WLDINFO(pWld, ("%s", pLib->pszLibName));
+            WLDINFO(pWld, ("  Searching %s", pLib->pszLibName));
 
             /*
@@ -2672 +2675 @@
             do
             {
-                param.fMore = FALSE;
                 param.cLoaded = 0;
                 param.pLib = pLib;
@@ -2681 +2683 @@
                     rc = libLoadUndefSymbols(pWld, pLib, NULL, &param.cLoaded);
                     if (rc == 42)
-                    {
-                        param.fMore = 1;
                         rc = 0;
-                    }
                 }
                 cLoaded += param.cLoaded;
-                if (!param.fMore && param.cLoaded)
-                    param.fMore = symHaveUndefined(pWld);
             } while (!rc && param.cLoaded > 0);