Changeset 546

Timestamp:

Aug 8, 2003, 12:26:44 AM (22 years ago)

Author:

bird

Message:

#483: Completed workaround for ilink crash.

File:

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

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

@@ -237 +237 @@
         WLDSF_EXPORT    = 0x1000,
 
-        /** Internal flag to say that we've already aliased this weak 
+        /** Internal flag to say that we've already aliased this weak
          * in the definition file.
          */
@@ -948 +948 @@
                 pWld->ppObjsAdd = &pMod->pNext;
 
-                rc = pass1ReadOMFMod(pWld, pMod, 0);
+                rc = pass1ReadOMFMod(pWld, pMod, 1);
                 if (rc)
                 {
@@ -1397 +1397 @@
     {
         /* @todo: this isn't 100% correct when we're talking case in sensitivity. */
-        unsigned uHash = symHash(psz, cch); 
+        unsigned uHash = symHash(psz, cch);
         for (pSym = pWld->Global.ap[uHash]; pSym; pSym = pSym->pHashNext)
         {
@@ -2955 +2955 @@
         "DGROUP",                       /* 9 */
     };
-#endif 
+#endif
 
     /* THEADR */
@@ -2981 +2981 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (4.1)");
+        wldErr(pWld, "Error occured while writing weak aliases. (5)");
         return -1;
     }
@@ -2996 +2996 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (4.1)");
+        wldErr(pWld, "Error occured while writing weak aliases. (6)");
         return -1;
     }
@@ -3013 +3013 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (5)");
+        wldErr(pWld, "Error occured while writing weak aliases. (7)");
         return -1;
     }
@@ -3028 +3028 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (6)");
+        wldErr(pWld, "Error occured while writing weak aliases. (8)");
         return -1;
     }
@@ -3043 +3043 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (6)");
+        wldErr(pWld, "Error occured while writing weak aliases. (9)");
         return -1;
     }
@@ -3058 +3058 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (6)");
+        wldErr(pWld, "Error occured while writing weak aliases. (10)");
         return -1;
     }
@@ -3069 +3069 @@
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (6)");
+        wldErr(pWld, "Error occured while writing weak aliases. (11)");
         return -1;
     }
@@ -3077 +3077 @@
     omf.hdr.cb = 6;
     omf.ach[0] = 9;                     /* "DGROUP" LNAME index */
-    omf.ach[1] = 0xff; 
+    omf.ach[1] = 0xff;
     omf.ach[2] = 3;                     /* "BSS32" SEGDEF index */
-    omf.ach[3] = 0xff; 
+    omf.ach[3] = 0xff;
     omf.ach[4] = 2;                     /* "DATA32" SEGDEF index */
     omf.ach[5] = 0;                     /* crc */
     if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
     {
-        wldErr(pWld, "Error occured while writing weak aliases. (6)");
+        wldErr(pWld, "Error occured while writing weak aliases. (12)");
         return -1;
     }
-#endif 
+#endif
 
     return 0;
@@ -3126 +3126 @@
         return -1;
     }
-#endif 
+#endif
 
     /* MODEND */
@@ -3182 +3182 @@
         {
             OMFREC  hdr;
-            union 
+            union
             {
                 char        ach[640];
@@ -3207 +3207 @@
 
         /* end the current object? */
-        if ((pWld->fFlags & WLDC_LINKER_LINK386) && pParam->cAliases >= 1)//32)
+        if ((pWld->fFlags & WLDC_LINKER_LINK386) && pParam->cAliases >= 32)
         {
             int rc = wldObjEnd(pWld, pParam->phFile, 32);
@@ -3214 +3214 @@
             pParam->cAliases = 0;
         }
-        
+
         /* make new object ? */
         if (!pParam->cAliases)
@@ -3343 +3343 @@
             if (fputs(szTmp, pParam->phNewFile) < 0)
                 return wldErr(pParam->pWld, "Write error.");
-            
+
             /* skip line */
             pParam->iLine++;
@@ -3520 +3520 @@
                 {
                     OMFREC  hdr;
-                    union 
+                    union
                     {
                         char        ach[256];
@@ -3532 +3532 @@
                 if (pWld->fFlags & WLDC_LINKER_LINK386)
                 {
-                    /* Write library file header. */
+                    /* Write library file header.
+                     * Link386 have trouble with too many aliases in one object. So we
+                     * generate a library of objects.
+                     */
                     memset(&omf, 0, sizeof(omf));
                     omf.hdr.chType = LIBHDR;
@@ -3549 +3552 @@
                 if (!rc)
                 {
-                    /* 
-                     * Make aliases  
+                    /*
+                     * Make aliases
                      */
                     offAlias = ftell(phFile);       /* save this to see if anything is added. */
@@ -3561 +3564 @@
                     if (!rc)
                     {
-                        /* Check if we need to fake a lot's of externals for working around an ILINK bug. */
+                        /* Check if we need to fake a lot's of externals for working around an ILINK bug.
+                         * See defect #483 for details. Short summary: an array calculation in ilink is
+                         * assuming that library objects have less EXTDEFs than the object ones. So, for
+                         * pass2 an EXTDEF array may become too short.
+                         */
                         if (pWld->cMaxObjExts < pWld->cMaxLibExts && !(pWld->fFlags & WLDC_LINKER_LINK386))
                         {
@@ -3571 +3578 @@
                             }
 
-                            /* issue a shitload of extdefs. */
+                            /* issue a lot's of extdefs. */
                             omf.hdr.chType = EXTDEF;
-                            omf.ach[0] = strlen("WEAK$ZERO");
-                            memcmp(&omf.ach[1], "WEAK$ZERO", omf.ach[0]);
-                            omf.ach[omf.ach[0] + 2] = 0;
-                            omf.hdr.cb = omf.ach[0] + 3;
-                            for (i = 0; i < pWld->cMaxLibExts; i++)
+                            omf.hdr.cb = 0;
+                            for (i = 0; i < 10; i++)
                             {
+                                omf.ach[omf.hdr.cb] = 9;                            /* string length  */
+                                memcpy(&omf.ach[omf.hdr.cb + 1], "WEAK$ZERO", 9);   /* external */
+                                omf.ach[omf.hdr.cb + 9 + 1] = 0;                    /* typeidx */
+                                omf.hdr.cb += 9 + 2;
                             }
+                            omf.ach[omf.hdr.cb++] = 0;                              /* crc */
+                            for (i = pWld->cMaxLibExts + 3; i > 0; i -= 10)
+                                if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
+                                {
+                                    wldErr(pWld, "Failed to write to '%s'.", pszObjName);
+                                    rc = -1;
+                                    break;
+                                }
                         }
 
+                        /* Did we actually write anything to the file? */
                         if (ftell(phFile) != offAlias)
                         {
-                            /* end the last object? */
+                            /* Complete last object file? */
                             if (pWld->fFlags & WLDC_LINKER_LINK386)
                             {