Changeset 3667 for trunk/emx/src/emxomf/emxomfld.c

Timestamp:

Sep 18, 2010, 3:06:59 AM (15 years ago)

Author:

bird

Message:

emxomfld/weakld: working on AR and ELF support.

File:

• trunk/emx/src/emxomf/emxomfld.c (modified) (12 diffs)

trunk/emx/src/emxomf/emxomfld.c

@@ -37 +37 @@
 #include <alloca.h>
 #include <sys/omflib.h>
+#include <sys/elf.h>
+#include <ar.h>
 #include "defs.h"
 #include "weakld.h"
@@ -51 +53 @@
 } name_list;
 
+/* OMF record header. */
+#pragma pack(1)
+typedef struct omf_rec_hdr
+{
+    byte type;
+    word len;
+} omf_rec_hdr;
+#pragma pack()
 
 /* Whether or not linker tracing is enabled. */
@@ -504 +514 @@
 
 /**
+ * Reports archive parsing error.
+ * @returns 0.
+ * @param   pszError    The parsing error.
+ */
+static int bad_arch(const char *pszError)
+{
+    fprintf(stderr, "emxomfld: failed parsing archive: %s\n", pszError);
+    return 0;
+}
+
+/** 
+ * Validates a numeric ar_hdr field.
+ *
+ * These are supposed to be padded with spaces, however, emximp seems to be 
+ * using null terminators as well (ar_mode for instance). 
+ *
+ * @returns 1 if valid, 0 if invalid.
+ * @param   pachField       The field.
+ * @param   cchField        The field length.
+ * @param   uBase           10 for decimal, 8 for octal.
+ * @param   pszName         The field name.
+ */
+static int is_arch_num_field_valid(char const *pachField, size_t cchField, unsigned uBase, const char *pszName)
+{
+    while (cchField > 0)
+    {
+        unsigned ch = *pachField;
+        if (ch - '0' >= uBase)
+        {
+            if (ch == ' ' || !ch)
+                break;
+            return bad_arch(pszName);
+        }
+        cchField--;
+        pachField++;
+    }
+
+    while (cchField > 0)
+    {
+        char ch = *pachField;
+        if (ch != ' ' && ch)
+            return bad_arch(pszName);
+        cchField--;
+        pachField++;
+    }
+    
+    return 1;
+}
+
+/**
+ * Checks the name field to see if there is a BSD style variable sized name
+ * field following the header.
+ 
+ * @returns 0 if none, length if something.
+ * @param   pArHdr          The archive header.
+ */
+static unsigned arch_hdr_get_ext_name_len(struct ar_hdr *pArHdr)
+{
+    unsigned cchExtName = 0;
+    if (!memcmp(&pArHdr->ar_name[0], AR_EFMT1, sizeof(AR_EFMT1) - 1))
+    {
+        int         cch = sizeof(pArHdr->ar_name) - sizeof(AR_EFMT1) - 1;
+        const char *pch = &pArHdr->ar_name[sizeof(AR_EFMT1) - 1];
+        while (cch-- > 0)
+        {
+            unsigned uDig = (unsigned char)*pch++ - '0';
+            if (uDig > 10)
+                break;
+            cchExtName *= 10;
+            cchExtName += uDig;
+        }
+    }
+    return cchExtName;
+}
+
+/**
+ * Converts the size field of the header into something we can use.
+ * @returns ar_size as off_t.
+ * @param   pArHdr          The archive header.
+ */
+static off_t arch_hdr_get_size(struct ar_hdr *pArHdr)
+{
+    off_t       cb  = 0;
+    int         cch = sizeof(pArHdr->ar_size);
+    const char *pch = &pArHdr->ar_size[0];
+    while (cch-- > 0)
+    {
+        unsigned uDig = (unsigned char)*pch++ - '0';
+        if (uDig > 10)
+            break;
+        cb *= 10;
+        cb += uDig;
+    }
+    return cb;
+}
+
+/**
+ * Matches @a pszName with the name in the archive header.
+ *
+ * @returns 1 if matches, 0 if not.
+ * @param   pArHdr          The archive header.
+ * @param   pszName         The name to match it with.
+ */
+static int arch_hdr_match_name(struct ar_hdr *pArHdr, const char *pszName)
+{
+    size_t      cch = sizeof(pArHdr->ar_name);
+    const char *pch = &pArHdr->ar_name[0];
+    while (cch > 0)
+    {
+        if (*pszName != *pch)
+        {
+            if (*pszName)
+                return 0;
+            break;
+        }
+        cch--;
+        pszName++;
+        pch++;
+    }
+    
+    while (cch-- > 0)
+    {
+        char ch = *pch++;
+        if (ch != ' ' && ch)
+            return 0;
+    }
+    
+    return 1;
+}
+
+/**
+ * Checks if the stream @a pFile is an archive only containing ELF and OMF 
+ * files.
+ *
+ * @returns 1 if so, 0 if not.
+ * @param   pFile   The file stream to check.  The caller rewinds the stream.
+ */
+static int check_arch_library_with_omf_and_or_elf(FILE *pFile)
+{
+    union 
+    {
+        char            achMagic[SARMAG];
+        struct ar_hdr   ArHdr;
+        Elf32_Ehdr      Elfhdr;
+        omf_rec_hdr     OmfHdr;
+        /*struct exec     AoutHdr;*/
+    } uBuf;
+    off_t offArchive;
+
+    /*
+     * Read+reverify the magic.
+     */
+    if (fread(&uBuf.achMagic[0], SARMAG, 1, pFile) != 1)
+        return 0;
+    if (memcmp(&uBuf.achMagic[0], ARMAG, SARMAG) != 0)
+        return 0;
+
+    /*
+     * Process the archive, file by file.
+     */
+    offArchive = SARMAG;
+    while (!feof(pFile))
+    {
+        off_t   cbFile;
+        off_t   offNext;
+        size_t  cbRead;
+        int     cchExtraName;
+
+        /* read + verify the archive header */
+        cbRead = fread(&uBuf.ArHdr, 1, sizeof(uBuf.ArHdr), pFile);
+        if (cbRead != sizeof(uBuf.ArHdr))
+            return cbRead == 0 && feof(pFile) ? 1 : bad_arch("fread");
+        offArchive += sizeof(uBuf.ArHdr);
+
+        if (memcmp(uBuf.ArHdr.ar_fmag, ARFMAG, sizeof(uBuf.ArHdr.ar_fmag)))
+            return bad_arch("ar_fmag");
+        if (   !is_arch_num_field_valid(uBuf.ArHdr.ar_date, sizeof(uBuf.ArHdr.ar_date), 10, "ar_date")
+            || !is_arch_num_field_valid(uBuf.ArHdr.ar_uid,  sizeof(uBuf.ArHdr.ar_uid),  10, "ar_uid")
+            || !is_arch_num_field_valid(uBuf.ArHdr.ar_gid,  sizeof(uBuf.ArHdr.ar_gid),  10, "ar_gid")
+            || !is_arch_num_field_valid(uBuf.ArHdr.ar_mode, sizeof(uBuf.ArHdr.ar_mode),  8, "ar_mode")
+            || !is_arch_num_field_valid(uBuf.ArHdr.ar_size, sizeof(uBuf.ArHdr.ar_size), 10, "ar_size") )
+            return 0; /* bitched already */
+        
+        cbFile  = arch_hdr_get_size(&uBuf.ArHdr);
+        offNext = offArchive + cbFile;
+        offNext += offNext & 1;         /* make even */
+
+        /* skip the extended name field if present (BSD). */
+        cchExtraName = arch_hdr_get_ext_name_len(&uBuf.ArHdr);
+        /*fprintf(stderr, "%#06x '%.16s' offNext=%#x cb=%#x ext=%d\n", (unsigned)offArchive, &uBuf.ArHdr.ar_name[0], (unsigned)offNext, (unsigned)cbFile, cchExtraName);*/
+        if (cchExtraName)
+        {
+            cbFile     -= cchExtraName;
+            offArchive += cchExtraName;
+            if (fseek(pFile, offArchive, SEEK_SET))
+                return bad_arch("fseek-ext-name");
+        }
+
+        /* ignore the archive symbol table. */
+        if (   !arch_hdr_match_name(&uBuf.ArHdr, "__.SYMDEF")
+            && !arch_hdr_match_name(&uBuf.ArHdr, "/")
+            && !arch_hdr_match_name(&uBuf.ArHdr, "ARFILENAMES/")
+            && !arch_hdr_match_name(&uBuf.ArHdr, "//"))
+        {            
+            cbRead = sizeof(uBuf);
+            if (cbRead > cbFile)
+            {
+                cbRead = cbFile;
+                memset(&uBuf, 0, sizeof(uBuf));
+            }
+            if (fread(&uBuf, 1, cbRead, pFile) != cbRead)
+                return bad_arch("fread-member-hdr");
+
+            if (   (   uBuf.OmfHdr.len >= sizeof(uBuf.OmfHdr)
+                    && cbRead > sizeof(sizeof(uBuf.OmfHdr)) )
+                    && (   uBuf.OmfHdr.type == THEADR 
+                        /*|| uBuf.OmfHdr.type == LIBADR - doubt wlink can handle this */)
+                || IS_ELF(uBuf.Elfhdr) )
+            { 
+                /* nothing */ 
+                /*fprintf(stderr, IS_ELF(uBuf.Elfhdr) ? "ELF\n" : "OMF\n");*/
+            }
+            else
+            {
+                /*fprintf(stderr, "not omf or elf\n");*/
+                return 0;
+            }
+        }
+        /*else
+            fprintf(stderr, "skip archive symbol table\n");*/
+        
+        /* advance to the next file */
+        if (fseek(pFile, offNext, SEEK_SET))
+            return bad_arch("fseek-next");
+        offArchive = offNext;
+    }
+
+    return 1;            
+}
+
+/**
  * Checks if the stream phFile is an OMF library.
  *
@@ -546 +797 @@
  * @param   phFile  Filestream to check.
  */
-static int check_omf(FILE *phFile)
+static int check_omf_or_elf(FILE *phFile)
 {
 #pragma pack(1)
-    struct
-    {
-        byte rec_type;
-        word rec_len;
-    } omfhdr;
+    union
+    {
+        struct
+        {
+            byte rec_type;
+            word rec_len;
+        }    omfhdr;
+        byte elfmagic[4];
+        char arch[7];
+    } u;
 #pragma pack()
-    if (    fread(&omfhdr, 1, sizeof(omfhdr), phFile) == sizeof (omfhdr)
-        &&  omfhdr.rec_type == THEADR
-        &&  omfhdr.rec_len >= sizeof(omfhdr)
-        &&  !fseek(phFile, 0, SEEK_SET)
-       )
+    size_t cbRead = fread(&u.omfhdr, 1, sizeof(u), phFile);
+    if (fseek(phFile, 0, SEEK_SET))
+        return 0;
+
+    /* OMF object or library? */
+    if (   cbRead >= sizeof(u.omfhdr)   
+        && u.omfhdr.rec_type == THEADR
+        && u.omfhdr.rec_len >= sizeof(u.omfhdr) )
         return 1;
-
-    return !fseek(phFile, 0, SEEK_SET)
-        && check_omf_library(phFile);
+    if (   cbRead >= sizeof(u.omfhdr)
+        && u.omfhdr.rec_type == LIBHDR)
+        return check_omf_library(phFile);
+    
+    /* ELF object? */
+    if (   u.elfmagic[0] == ELFMAG0
+        && u.elfmagic[1] == ELFMAG1
+        && u.elfmagic[2] == ELFMAG2
+        && u.elfmagic[3] == ELFMAG3)
+        return 1;
+
+    /* AR archive with OMF and/or ELF content? */
+    if (   cbRead >= sizeof("!<arch>") - 1
+        && !memcmp(u.arch, "!<arch>", sizeof(u.arch)))
+    {
+        int rc = check_arch_library_with_omf_and_or_elf(phFile);
+        if (fseek(phFile, 0, SEEK_SET))
+            rc = 0;
+        return rc;
+    }
+
+    /* Not anything we know */
+    return 0;
 }
 
@@ -637 +916 @@
 
     /* We need to apply _realrealpath to the tmpdir, so resolve that once and for all. */
-    if (!s_szTmp[0]) 
+    if (!s_szTmp[0])
     {
         const char *    pszTmp = getenv("TMP");
@@ -863 +1142 @@
      */
     if (    autoconvert_flag
-        &&  !check_omf(phFile))
+        &&  !check_omf_or_elf(phFile))
         phFile = aout_to_omf(phFile, pszFullname, FALSE);
 
@@ -1006 +1285 @@
                         if (check_lx_dll(phFile))
                             phFile = lx_to_omf(phFile, pszFullname);
-                        else if (!check_omf(phFile))
+                        else if (!check_omf_or_elf(phFile))
                             phFile = aout_to_omf(phFile, pszFullname, TRUE);
                     }
@@ -1367 +1646 @@
       case _MD_STUB:
         if (!stmt->stub.none)
-          fprintf (response_file, "OPTION STUB='%s'\n", stmt->stub.name);
+          {
+            fprintf (response_file, "OPTION STUB='%s'\n", stmt->stub.name);
+            *(int*)(arg) = 0; /*need_stub*/
+          }
         else
           fprintf (stderr, "emxomfld: warning: \"STUB NONE\" is not supported by wlink. ignoring\n");
@@ -2085 +2367 @@
     {
       unsigned uPMType = 0;
+      int need_stub = 1;
 
       open_response_file ();
@@ -2275 +2558 @@
         fprintf (response_file, "OPTION OFFSET=%s\n", base);
 
-      /* the stub */
-
-      _execname(&execname[0], sizeof(execname));
-      strcpy (_getname (&execname[0]), "os2stub.bin");
-      if (!stat (execname, &s))
-        fprintf (response_file, "OPTION STUB='%s'\n", execname);
-
       /* Add the /INFORMATION option if the -i or -t option was given.  This is
          for debugging. */
@@ -2305 +2581 @@
 
       /* Translate the essentials of the module definition file into wlink lingo. */
+      
       if (def_fname)
         {
@@ -2314 +2591 @@
             }
           _md_next_token (pMd);
-          _md_parse (pMd, def_2_watcom, NULL);
+          _md_parse (pMd, def_2_watcom, &need_stub);
           _md_close (pMd);
         }
+      
+      /* the stub */
+
+      if (need_stub)
+        {
+          _execname(&execname[0], sizeof(execname));
+          strcpy (_getname (&execname[0]), "os2stub.bin");
+          if (!stat (execname, &s))
+            fprintf (response_file, "OPTION STUB='%s'\n", execname);
+        }
+
     }