Changeset 540

Timestamp:

Aug 6, 2003, 3:07:18 PM (22 years ago)

Author:

bird

Message:

Working!!!.

File:

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

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

@@ -119 +119 @@
 } OMFLIBHDR, *POMFLIBHDR;
 #pragma pack()
+
+/** OMF library header - for combining with OMFREC. */
+#pragma pack(1)
+typedef struct OMFLIBHDRX
+{
+  unsigned long     offDict;
+  unsigned short    cDictBlocks;
+  unsigned char     fchFlags;
+} OMFLIBHDRX, *POMFLIBHDRX;
+#pragma pack()
+
 /** @} */
 
@@ -226 +237 @@
         WLDSF_EXPORT    = 0x1000,
 
+        /** Internal flag to say that we've already aliased this weak 
+         * in the definition file.
+         */
+        WLDSF_WEAKALIASDONE = 0x8000,
     }                   fFlags;
 
@@ -2879 +2894 @@
 
 
+typedef struct wldGenerateObjEnum_param
+{
+    /** Output file stream */
+    FILE *      phFile;
+    /** Number of aliases in current object. (0 means first) */
+    unsigned    cAliases;
+} WLDGOEPARAM, *PWLDGOEPARAM;
+
+#define GENERATE_LIBRARY
+
 /**
  * Symbol enumeration callback function of wld_generate_weakobj().
@@ -2889 +2914 @@
  * @param   pvUser  Pointer to a FILE stream.
  */
-static int weakobjEnum(PWLD pWld, PWLDSYM pSym, void *pvUser)
+static int wldGenerateObjEnum(PWLD pWld, PWLDSYM pSym, void *pvUser)
 {
     if (pSym->pszWeakName)
     {
-        int     cch = strlen(pSym->pszWeakName);
-        int     cchAlias = strlen(pSym->pszName);
-        unsigned char uch;
-        OMFREC  hdr;
+        PWLDGOEPARAM    pParam = (PWLDGOEPARAM)pvUser;
+        #pragma pack(1)
+        struct omfstuff
+        {
+            OMFREC  hdr;
+            union 
+            {
+                char        ach[640];
+                OMFLIBHDRX  libhdr;
+            };
+        } omf;
+        #pragma pack()
+        int             cch = strlen(pSym->pszWeakName);
+        int             cchAlias = strlen(pSym->pszName);
 
         WLDINFO(pWld, ("using weak %s for %s", pSym->pszWeakName, pSym->pszName));
@@ -2912 +2947 @@
         }
 
-        /* write header */
-        hdr.chType = ALIAS;
-        hdr.cb = cchAlias + cch + 3;
-        if (fwrite(&hdr, sizeof(hdr), 1, (FILE*)pvUser) != 1)
-        {
-            wldErr(pWld, "Error occured while writing weak aliases. (1)");
+        #ifdef GENERATE_LIBRARY
+        /* end the current object? */
+        if (pParam->cAliases > 32)
+        {
+            off_t   off; 
+            omf.hdr.chType = MODEND;
+            omf.hdr.cb = 2;                 
+            memset(&omf.ach[0], 0, sizeof(omf.ach));
+            off = (ftell(pParam->phFile) + omf.hdr.cb + sizeof(OMFREC)) % 32;
+            if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC) + (off ? 32 - off : 0), 1, pParam->phFile) != 1)
+            {
+                wldErr(pWld, "Error occured while writing weak aliases. (2)");
+                return -1;
+            }
+            pParam->cAliases = 0;
+        }
+        
+        /* make new object ? */
+        if (!pParam->cAliases)
+        {
+            omf.hdr.chType = THEADR;
+            omf.hdr.cb = 2 + strlen("weakalias.obj");
+            omf.ach[0] = omf.hdr.cb - 2;
+            memcpy(&omf.ach[1], "weakalias.obj", omf.hdr.cb - 2);
+            omf.ach[cch + 1] = 0;
+            if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, pParam->phFile) != 1)
+            {
+                wldErr(pWld, "Error occured while writing weak aliases. (2)");
+                return -1;
+            }
+        }
+        #endif 
+
+        /* Alias record */
+        omf.hdr.chType = ALIAS;
+        omf.hdr.cb = cchAlias + cch + 3;
+        omf.ach[0] = cchAlias;
+        memcpy(&omf.ach[1], pSym->pszName, cchAlias);           /* alias */
+        omf.ach[cchAlias + 1] = cch;
+        memcpy(&omf.ach[cchAlias + 2], pSym->pszWeakName, cch); /* subtitute */
+        omf.ach[cchAlias + cch + 2] = 0; /* crc */
+        if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, pParam->phFile) != 1)
+        {
+            wldErr(pWld, "Error occured while writing weak aliases. (2)");
             return -1;
         }
-
-        /* write alias string */
-        uch = cchAlias;
-        if (    fwrite(&uch, sizeof(uch), 1, (FILE*)pvUser) != 1
-            ||  fwrite(pSym->pszName, cchAlias, 1, (FILE*)pvUser) != 1
-                )
-
-        {
-            wldErr(pWld, "Error occured while writing weak aliases (2).");
-            return -1;
-        }
-
-        /* write substitute string */
-        uch = cch;
-        if (    fwrite(&uch, sizeof(uch), 1, (FILE*)pvUser) != 1
-            ||  fwrite(pSym->pszWeakName, cch, 1, (FILE*)pvUser) != 1
-                )
-
-        {
-            wldErr(pWld, "Error occured while writing weak aliases (3).");
-            return -1;
-        }
-
-        /* write substitute CRC */
-        uch = 0;
-        if (fwrite(&uch, sizeof(uch), 1, (FILE*)pvUser) != 1)
-
-        {
-            wldErr(pWld, "Error occured while writing weak aliases (4).");
-            return -1;
-        }
+        pParam->cAliases++;
     }
     return 0;
@@ -2956 +2999 @@
 
 
-/** Parameter structure for wlddefCallback (module definition parser callback). */
-typedef struct wlddefCallback_param
+/** Parameter structure for wldGenerateDefCallback (module definition parser callback). */
+typedef struct wldGenerateDefCallback_param
 {
     /** Linker Instance. */
@@ -2967 +3010 @@
     /** Our current linenumber index. */
     unsigned    iLine;
-} WLDDCPARAM, *PWLDDCPARAM;
+} WLDGDCPARAM, *PWLDGDCPARAM;
 
 /**
@@ -2977 +3020 @@
  * @param   pStmt   Statement we're processing.
  * @param   eToken  Token we're processing.
- * @param   pvArg   Pointer to a WLDDCPARAM structure.
+ * @param   pvArg   Pointer to a WLDGDCPARAM structure.
  * @sketch
  *
@@ -2990 +3033 @@
  *  copied to the new file.
  */
-static int wlddefCallback(struct _md *pMD, const _md_stmt *pStmt, _md_token eToken, void *pvArg)
-{
-    PWLDDCPARAM     pParam = (PWLDDCPARAM)pvArg;
+static int wldGenerateDefCallback(struct _md *pMD, const _md_stmt *pStmt, _md_token eToken, void *pvArg)
+{
+    PWLDGDCPARAM     pParam = (PWLDGDCPARAM)pvArg;
 
     switch (eToken)
@@ -3038 +3081 @@
                 cch = sprintf(szTmp, "  \"%s\" = \"%s\"", pStmt->export.entryname, pSymInt->pszWeakName);
             else
+            {
                 cch = sprintf(szTmp, "  \"%s\" = \"%s\"", pStmt->export.entryname, pSymExp->pszWeakName);
+                pSymExp->fFlags |= WLDSF_WEAKALIASDONE;
+            }
             if (pStmt->export.flags & _MDEP_ORDINAL)
                 cch += sprintf(&szTmp[cch], " @%d", pStmt->export.ordinal);
@@ -3131 +3177 @@
 
     /* zero returns */
-    *pszObjName = '\0';
+    if (pszObjName)
+        *pszObjName = '\0';
     if (pszDefName)
         *pszDefName = '\0';
 
     /*
-     * Generate the object file
+     * Do the definition file.
      */
-    rc = wldTempFile(pWld, pszObjName, "wk", ".obj");
-    if (rc)
-        return wldErr(pWld, "Failed to generate temporary object file for weak aliases.");
-    WLDINFO(pWld, ("Generating object file '%s' for weak aliases.", pszObjName));
-
-    /* open it */
-    phFile = fopen(pszObjName, "wr");
-    if (phFile)
-    {
-        #pragma pack(1)
-        struct omfstuff
-        {
-            OMFREC  hdr;
-            char ach[256];
-        } omf;
-        #pragma pack()
-        int     cch;
-        off_t   offAlias;
-
-        /* Write object file header. */
-        cch = strlen("wk.obj");
-        omf.hdr.chType = THEADR;
-        omf.hdr.cb = cch + 2;           /* name + crc */
-        omf.ach[0] = cch;           /* module name */
-        memcpy(&omf.ach[1], "wk.obj", cch);
-        omf.ach[1+cch] = 0;         /* crc */
-        fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile);
-        /* todo: link386 doesn't like if there are too many alias in one module btw. */
-
-
-        /* Make aliases  */
-        offAlias = ftell(phFile);       /* save this to see if anything is added. */
-        rc = symEnum(pWld, &pWld->Global,
-                     WLDSF_WEAK, WLDSF_WEAK,
-                     weakobjEnum, phFile);
-        if (rc || ftell(phFile) == offAlias)
-        {
-            if (!rc)
-                WLDINFO(pWld, ("No weak alias needed, deleting file."));
-            fclose(phFile);
-            remove(pszObjName);
-            *pszObjName = '\0';
-        }
-        else
-        {
-           /* write end of module */
-           omf.hdr.chType = MODEND;
-           omf.hdr.cb = 2;
-           omf.ach[0] = omf.ach[1] = 0;
-           if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) == 1)
-               fclose(phFile);
-           else
-           {
-               wldErr(pWld, "Failed to write to '%s'.", pszObjName);
-               rc = -1;
-               fclose(phFile);
-               remove(pszObjName);
-               *pszObjName = '\0';
-           }
-        }
-    }
-    else
-    {
-        wldErr(pWld, "Failed to open '%s' for writing.", pszObjName);
-        *pszObjName = '\0';
-    }
-
-
-    /*
-     * Do the definition file.
-     *      We don't need to do this if the above code failed or
-     *      didn't issue any aliases.
-     */
-    if (!rc && pWld->pDef && pszDefName && pszObjName[0])
+    if (pWld->pDef && pszDefName)
     {
         rc = wldTempFile(pWld, pszDefName, "wk", ".def");
@@ -3230 +3204 @@
                     if (pMD)
                     {
-                        WLDDCPARAM  param;
+                        WLDGDCPARAM  param;
                         param.pWld = pWld;
                         param.phOrgFile = phOrgFile;
@@ -3238 +3212 @@
                         /* parse it */
                         _md_next_token(pMD);
-                        rc = _md_parse(pMD, wlddefCallback, &param);
+                        rc = _md_parse(pMD, wldGenerateDefCallback, &param);
                         _md_close(pMD);
 
@@ -3262 +3236 @@
         }
         else
-            rc = wldErr(pWld, "Failed to generate temporary definition file for weak aliases.");
+            wldErr(pWld, "Failed to generate temporary definition file for weak aliases.");
     }
 
@@ -3271 +3245 @@
         *pszDefName = '\0';
     }
+
+
+    /*
+     * Generate the object file
+     */
+    if (!rc && pszObjName)
+    {
+        #ifdef GENERATE_LIBRARY
+        rc = wldTempFile(pWld, pszObjName, "wk", ".lib");
+        #else
+        rc = wldTempFile(pWld, pszObjName, "wk", ".obj");
+        #endif 
+        if (!rc)
+        {
+            WLDINFO(pWld, ("Generating object file '%s' for weak aliases.", pszObjName));
+
+            /* open it */
+            phFile = fopen(pszObjName, "wr");
+            if (phFile)
+            {
+                WLDGOEPARAM     param;
+                #pragma pack(1)
+                struct omfstuff
+                {
+                    OMFREC  hdr;
+                    union 
+                    {
+                        char        ach[256];
+                        OMFLIBHDRX  libhdr;
+                    };
+                }               omf;
+                #pragma pack()
+                off_t           offAlias;
+
+                #ifdef GENERATE_LIBRARY
+                /* Write library file header. */
+                memset(&omf, 0, sizeof(omf));
+                omf.hdr.chType = LIBHDR;
+                omf.hdr.cb = 32 - 3;
+                omf.libhdr.offDict = 0;
+                omf.libhdr.cDictBlocks = 0;
+                omf.libhdr.fchFlags = 0;
+                
+                #else
+                /* Write object file header. */
+                /* todo: link386 doesn't like if there are too many alias in one module btw. */
+                int cch = strlen("wk.obj");
+                omf.hdr.chType = THEADR;
+                omf.hdr.cb = cch + 2;           /* name + crc */
+                omf.ach[0] = cch;           /* module name */
+                memcpy(&omf.ach[1], "wk.obj", cch);
+                omf.ach[1+cch] = 0;         /* crc */
+                #endif 
+                fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile);
+
+
+                /* Make aliases  */
+                offAlias = ftell(phFile);       /* save this to see if anything is added. */
+                param.phFile = phFile;
+                param.cAliases = 0;
+                rc = symEnum(pWld, &pWld->Global,
+                             WLDSF_WEAK, WLDSF_WEAK | WLDSF_WEAKALIASDONE,
+                             wldGenerateObjEnum, &param);
+                if (!rc)
+                {
+                    if (ftell(phFile) != offAlias)
+                    {
+                        #ifdef GENERATE_LIBRARY
+                        /* end the last object? */
+                        if (param.cAliases )
+                        {   
+                            off_t   off;
+                            omf.hdr.chType = MODEND;
+                            omf.hdr.cb = 2;                 
+                            memset(&omf.ach[0], 0, sizeof(omf.ach));
+                            off = (ftell(phFile) + omf.hdr.cb + sizeof(OMFREC)) % 32;
+                            if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC) + (off ? 32 - off : 0), 1, phFile) != 1)
+                            {
+                                wldErr(pWld, "Error occured while writing weak aliases. (2)");
+                                return -1;
+                            }
+                        }
+
+                        /* write end of library */
+                        memset(&omf, 0, sizeof(omf));
+                        omf.hdr.chType = LIBEND;
+                        omf.hdr.cb = 32 - 3;
+                        #else
+                        /* write end of module */
+                        omf.hdr.chType = MODEND;
+                        omf.hdr.cb = 2;
+                        omf.ach[0] = omf.ach[1] = 0;
+                        #endif 
+                        if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
+                        {
+                            wldErr(pWld, "Failed to write to '%s'.", pszObjName);
+                            rc = -1;
+                        }
+                        fclose(phFile);
+                    }
+                    else
+                    {
+                        WLDINFO(pWld, ("No weak alias needed, deleting file."));
+                        fclose(phFile);
+                        remove(pszObjName);
+                        *pszObjName = '\0';
+                    }
+                }
+                else
+                    fclose(phFile);
+            }
+            else
+            {
+                wldErr(pWld, "Failed to open '%s' for writing.", pszObjName);
+                *pszObjName = '\0';
+            }
+        }
+        else
+            wldErr(pWld, "Failed to generate temporary object file for weak aliases.");
+    }
+
+    /* cleanup */
     if (rc && pszObjName && *pszObjName)
     {