Changeset 488

Timestamp:

Jul 31, 2003, 4:45:07 PM (22 years ago)

Author:

bird

Message:

#483: Temporary commit (Again.).

Location:

trunk/src/emx/src/emxomf

Files:

• emxomfld.c (modified) (5 diffs, 1 prop)
• weakld.c (modified) (12 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -468 +468 @@
    */
 
-static FILE * find_objlib(char *pszfullname, const char *pszname, 
-                          const char * const *papszexts, int flibhacks)
+static FILE * find_objlib2(char *pszfullname, const char *pszname, const char * const *papszexts, int flibhacks)
 {
   const char *  psz;
@@ -544 +543 @@
             phFile = fopen (pszfullname, "rb");
 
+          if (!flibhacks && phFile)
+            return phFile;
+
           if (phFile)
             {
@@ -556 +558 @@
               } libhdr;
               #pragma pack()
-              if (!flibhacks)
-                return phFile;
               /* For .a libraries we will chech for a valid OMF library header. */
               if (memicmp(pszfullname + strlen(pszfullname) - 2, ".a", 3))
                   return phFile;
-              if (  fread(&libhdr, 1, sizeof(libhdr), phFile) == sizeof(libhdr)
+              if (   fread(&libhdr, 1, sizeof(libhdr), phFile) == sizeof(libhdr)
                   && libhdr.rec_type == LIBHDR
                   && libhdr.flags <= 1 /* ASSUME only first bit is used... */
+                  && !fseek(phFile, 0, SEEK_SET)
                   )
                 {
@@ -581 +582 @@
 
 
+/* Wrapper around find_objlib which fixes the slashes - this looks better imho. */
+
+static FILE * find_objlib(char *pszfullname, const char *pszname, const char * const *papszexts, int flibhacks)
+{
+    FILE * phFile = find_objlib2(pszfullname, pszname, papszexts, flibhacks);
+    while ((pszfullname = strchr(pszfullname, '/')) != NULL)
+        *pszfullname++ = '\\';
+    return phFile;
+}
+
+
+
 /* Weak prelinking for Method 2 Weak support. */
 
@@ -588 +601 @@
   PWLD    pwld;
 
-  pwld = wld_create (0);
+  pwld = wld_create (WLDC_VERBOSE);
   if (pwld)
     {

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

@@ -46 +46 @@
 *******************************************************************************/
 #define WLDSYM_HASH_SIZE    211
+#define OMF_MAX_REC         1024
 
 
@@ -55 +56 @@
 #include <stdlib.h>
 #include <sys/types.h>
+#include <sys/omflib.h>
 #include "defs.h"
 #include "grow.h"
 #include "weakld.h"
+
  
 /*******************************************************************************
@@ -71 +74 @@
     /** Filehandle if open */
     FILE *      phFile;
+    /** Linked list next pointer. */
+    struct wldlib * pNext;
 } WLDLIB, *PWLDLIB;
  
@@ -83 +88 @@
     /** Filehandle if open. */
     FILE *      phFile;
-
-    /** Library relation. */
+    /** Module offset into the file. */
+    off_t       off;
+    /** Library relation - not used for libraries added thru wld_add_object(). */
     PWLDLIB     pLib;
-    /** Library offset. */
-    off_t       offLib;
+    /* Linked list next pointer */
+    struct wldmod *pNext;
 } WLDMOD, *PWLDMOD;
  
@@ -108 +114 @@
     /** Symbol flags. */
     enum {
-        /* Strong symbol. */
-        WLDSF_STRONG    = 0,
-        /** Weak symbol, can become strong. */
-        WLDSF_WEAK      = 1,
-        /** Undefined symbol, can become strong. */
-        WLDSF_UNDEF     = 2,
-        /** Communal data/code, become strong. */
-        WLDSF_COMM      = 4,
-        /** Import symbol. */
-        WLDSF_IMPORT    = 8,
-        /** Exported symbol. */
-        WLDSF_EXPORT    = 16,
-
+        /** @group Symbol state 
+         * @{ */
+        /* Mask of the symbol state. */
+        WLDSF_STATEMASK = 0x000f,
+        /** Strong symbol.
+         * A strong definition exists for this symbol (PUBDEF). */
+        WLDSF_STRONG    = 0x0001,
+        /** Communal data/code. 
+         * Communal definition exists for this symbol.
+         * If a PUBDEF is found for this symbol it will become strong. */
+        WLDSF_COMM      = 0x0002,
+        /** Undefined symbol.
+         * This symbol is not yet defined anywhere. */
+        WLDSF_UNDEF     = 0x0003,
+        /** Weak external.
+         * This symbol doesn't need to be resolved as it have a default
+         * resolution. pWeakDefault is pointing to the default resolution.
+         * If an non weak EXTDEF is found in another module, it will become
+         * WLDSF_UNDEF.
+         */
+        WLDSF_WKEXT     = 0x0004,
+        /** @} */
+
+        /** Weak symbol. 
+         * This symbol doesn't need to be resolved (if WLDSF_UNDEF), or 
+         * it may be overridden by a EXTDEF with no WKEXT.
+         * If this is an weak undefined symbol (extern weak, local default)
+         * pWeakDefault Will point at it.
+         */
+        WLDSF_WEAK      = 0x0100,
+
+        /** Uncertain undefined symbol.
+         * We're still processing the module containing this and the uncertainty
+         * we're facing is that a WLDSF_UNDEF may changed to an WLDSF_WKEXT 
+         * upon encountering a WKEXT COMENT record. */
+        WLDSF_UNCERTAIN = 0x0200,
+
+
+        /** Import symbol. 
+         * This symbol is imported. */
+        WLDSF_IMPORT    = 0x0400,
+        /** Exported symbol. 
+         * This symbol is to be exported. */
+        WLDSF_EXPORT    = 0x0800,
+        /** Alias symbol.
+         * This symbol is an alias for another symbol. pAliasFor will be set. */
+        WLDSF_ALIAS     = 0x1000,
     }                   eFlags;
 
@@ -129 +169 @@
     const char*         pszImpMod;
 
+    /** Ordinal - WLDSF_IMPORT or WLDSF_EXPORT. 
+     * 0 means no ordinal. */
+    unsigned            iOrdinal;
+
+    /** Export flags */
+    struct 
+    {
+        unsigned    fResidentName : 1;  /* Put name in resident or non resident table. */
+        unsigned    fNoName : 1;        /* No name at all. */
+        unsigned    fNoData : 1;        /* ?? */
+        unsigned    cParams;            /* callgate stuff, # of words to push */
+    }                   fExport
+
     /** Symbol this is an alias for. */
     struct wldsym *     pAliasFor;
+
+    /** Weak default resolution. 
+     * If this symbol in state WLDSF_WKEXT or have to WLDSF_WEAK flag set this
+     * member indicates a default resolution for the symbol. For WLDSF_WEAK 
+     * this only make sense if the state is WLDSF_UNDEF.
+     */
+    struct wldsym *     pWeakDefault;
 
     /** Next node in the hash bucket. */
@@ -156 +216 @@
     /** Global symbols. */
     WLDSYMTAB           Global;
+
+    /** Linked list (FIFO) of objects included in the link. */
+    PWLDMOD             pObjs;
+    PWLDMOD *           ppObjsAdd;
+
+    /** Linked list (FIFO) of libraries to be searched in the link. */
+    PWLDMOD             pLibs;
+    PWLDMOD *           ppLibsAdd;
 
     /** string pool for miscellaneous string. */
@@ -163 +231 @@
  
 
+/** @group OMF stuff 
+ * @{ */
+
+/** OMF record header. */
+#pragma pack(1)
+typedef struct OMFREC
+{
+  unsigned char     chType;
+  unsigned short    cb;
+} OMFREC, *POMFREC;
+#pragma pack()
+
+
+/** OMF library header. */
+#pragma pack(1)
+typedef struct OMFLIBHDR
+{
+  unsigned char     chType;
+  unsigned short    cb;
+  unsigned long     offDict;
+  unsigned short    cDictBlocks;
+  unsigned char     fchFlags;
+} OMFLIBHDR, *POMFLIBHDR;
+#pragma pack()
+
+/** @} */
+
 
 extern void *xrealloc (void *ptr, size_t n);
 extern void *xmalloc (size_t n);
 
+static unsigned     hash(const char* pszSym, unsigned cch);
+static FILE *       modOpen(PWLDMOD pMod);
+static void         modClose(PWLDMOD pMod);
 
 
@@ -197 +295 @@
 }
 
+/**
+ * Report error in module.
+ * @param   pMod        Pointer to module to report error on.
+ * @param   pszFormat   Format string.
+ * @param   ...         Format arguments.
+ */
+static void     modError(PWLDMOD pMod, const char *pszFormat, ...)
+{
+    va_list     args;
+    if (pMod->pLib)
+        fprintf(stderr, "weakld: %s(%s) - error: ", pMod->pLib->pszLibName, pMod->pszModName);
+    else
+        fprintf(stderr, "weakld: %s - error: ", pMod->pszModName);
+
+    va_start(args, pszFormat);
+    vfprintf(stderr, pszFormat, args);
+    va_end(args);
+    if (pszFormat[strlen(pszFormat) - 1] != '\n')
+        fputc('\n', stderr);
+}
+
+
+/**
+ * Report warning in module.
+ * @param   pMod        Pointer to module to report warning on.
+ * @param   pszFormat   Format string.
+ * @param   ...         Format arguments.
+ */
+static void     modWarn(PWLDMOD pMod, const char *pszFormat, ...)
+{
+    va_list     args;
+    if (pMod->pLib)
+        fprintf(stderr, "weakld: %s(%s) - warning: ", pMod->pLib->pszLibName, pMod->pszModName);
+    else
+        fprintf(stderr, "weakld: %s - warning: ", pMod->pszModName);
+
+    va_start(args, pszFormat);
+    vfprintf(stderr, pszFormat, args);
+    va_end(args);
+    if (pszFormat[strlen(pszFormat) - 1] != '\n')
+        fputc('\n', stderr);
+}
+
+
+
+/**
+ * Opens the module (if required) file for reading.
+ *
+ * @returns Pointer to file stream.
+ * @param   pMod    Module to open.
+ */
+static FILE *   modOpen(PWLDMOD pMod)
+{
+    const char *pszFilename;
+
+    /* open the file */
+    if (!pMod->phFile)
+    {
+        if (pMod->pLib && pMod->pLib->phFile)
+            pMod->phFile = pMod->pLib->phFile;
+        else
+        {   /* fopen it */
+            if (pMod->pLib)
+            {
+                pszFilename = pMod->pLib->pszLibName;
+                pMod->phFile = pMod->pLib->phFile = fopen(pszFilename, "rb");
+            }
+            else
+            {
+                pszFilename = pMod->pszModName;
+                pMod->phFile = fopen(pszFilename, "rb");
+            }
+        }
+    }
+
+    /* Position the stream at the start of the module. */
+    if (!pMod->phFile)
+        modErrro(pMod, "failed to reopen.");
+    else
+    {
+        if (fseek(pMod->phFile, pMod->off, SEEK_SET))
+        {
+            modErrro(pMod, "failed to seek to module start (%#x).", pMod->off);
+            modClose(pMod);
+            return NULL;
+        }
+    }
+        
+    return pMod->phFile;
+}
+
+
+/**
+ * Closes the module.
+ *
+ * @param   pMod    Module to close.
+ */
+static void     modClose(PWLDMOD pMod)
+{
+    if (!pMod->phFile)
+        return;
+    if (!pMod->pLib || pMod->pLib->phFile != pMod->phFile)
+        fclose(pMod->phFile);
+    pMod->phFile = NULL;
+}
+
+
+/**
+ * Reads an OMF module from a file.
+ *
+ * This may be part of a library file so, we'll only read from THEADR to 
+ * past the first MODEND or the Pass 1 comment record.
+ * The function will return the module stream positioned after the last 
+ * record it read.
+ *
+ * @returns 0 on success.
+ * @returns non zero on failure.
+ * @param   pWld    Pointer to linker instance.
+ * @param   pMod    Pointer to module
+ */
+static unsigned     pass1ReadOMFMod(PWLD pWld, PWLDMOD pMod)
+{
+    FILE *          phFile;             /* Input file. */
+    PWLDSYM         papExts[] = NULL;   /* Pointer to an array of EXTDEFs (as they appear) */
+                                        /* We need them for the WKEXT processing. */
+    int             cExts = 0;          /* Number of Entries in papExts. */
+    int             fFirst = 1;         /* First record indicator. */
+    /* generic stuff we'll use alot with not status associated. */
+    int             cch;                
+    PWLDSYM         pSym;
+
+
+    /* open and position the file. */
+    phFile = modOpen(pMod);
+
+    /* loop till we get a MODEND */
+    for (;;)
+    {
+        OMFREC          OmfRec;             
+        unsigned char   achBuffer[OMF_MAX_REC + 8];
+        union 
+        {
+            unsigned char *     puch;
+            signed char *       pch;
+            unsigned short *    pus;
+            signed short *      ps;
+            unsigned long *     pul;
+            signed long *       pl;
+        } u;
+        /** macro for getting a OMF index out of the buffer */
+        #define OMF_GETINDEX()  (*u.puch & 0x80 ? ((*u.pch++ & 0x7f) << 8) + *u.pch++ : *u.pch++)
+        #define OMF_BYTE()      (*u.puch++)
+        #define OMF_WORD()      (*u.pus++)
+        #define OMF_MORE()      (u.puch - &achBuffer[0] < (int)OmfRec.cb - 1)
+
+        u.pv = &achBuffer[0];
+
+        /* read omf record header */
+        if (fread(&OmfRec, sizeof(OmfRec), 1, phFile) != 1)
+        {
+            modError(pMod, "read error. (offset ~= %#x).", ftell(phFile));
+            goto failure;
+        }
+        if (fFirst)
+        {   /* some extra check for the first record. */
+            fFirst = 0;
+            if (OmfRec.chType != THEADR)
+            {
+                modError(pMod, "invalid object module (offset %#x).", pMod->off);
+                goto failure;
+            }
+        }
+    
+        /* Read or skip the record. */
+        switch (OmfRec.chType)
+        {
+            /* done */
+            case MODEND: case MODEND | REC32:
+            case LIBEND: 
+                fseek(phFile, OmfRec.cb, SEEK_CUR);
+                goto done_skip;
+            /* read */
+            case EXTDEF: case EXTDEF | REC32: 
+            case PUBDEF: case PUBDEF | REC32: 
+            case ALIAS:  case ALIAS  | REC32:
+            case COMDEF: case COMDEF | REC32: 
+            case COMDAT: case COMDAT | REC32: 
+            case COMENT: case COMENT | REC32: 
+            case LIBHDR: 
+                break;
+            /* skip */
+            default:
+                fseek(phFile, OmfRec.cb, SEEK_CUR);
+                continue;
+        }
+        if (fread(achBuffer, OmfRec.cb, 1, phFile) != 1)
+        {
+            modError(pMod, "read error. (offset ~= %#x)", ftell(phFile));
+            goto failure;             
+        }
+
+        /* Switch on type. */
+        switch (OmfRec.chType)
+        {
+            case COMENT: case COMENT | REC32: 
+                switch (*++u.pch)
+                {
+                    case CLASS_PASS:
+                         goto done_noskip;
+                    case CLASS_WKEXT:
+                    {   /* This is a bit tricky, we need to have an indexable array 
+                         * of the extdefs for this module. In addition we'll need to 
+                         * make sure we don't mark an EXTDEF from another module as
+                         * weak. 
+                         */
+                        while (OMF_MORE())
+                        {
+                            int iWeak = OMF_GETINDEX();
+                            int iDefault = OMF_GETINDEX();
+                            if (   iWeak     >= cExts 
+                                || iDefault  >= cExts
+                                || !papExts[iWeak]
+                                || !papExts[iDefault])
+                                modError(pMod, "Invalid WKEXT record.");
+                            if (papExts[iWeak]->eFlags & WLDSF_UNCERTAIN)
+                            {
+                                papExts[iWeak]->eFlags = (papExts[iWeak]->eFlags & ~WLDSF_STATEMASK) | WLDSF_WKEXT;
+                                papExts[iWeak]->pWeakDefault = papExts[iDefault];
+                            }
+                            else if (   (papExts[iWeak]->eFlags & WLDSF_STATEMASK) == WLDSF_WKEXT
+                                     &&  papExts[iWeak]->pWeakDefault != papExts[iDefault])
+                                modWarn(pMod, "WKEXT '%s' allready declared with '%s' and not '%s' as default.", 
+                                        papExts[iWeak]->pszName, papExts[iWeak]->pWeakDefault->pszName, papExts[iDefault]->pszName);
+                        }
+                        break;
+                    }
+                    
+                    case CLASS_OMFEXT:
+                    {
+                        switch (OMF_BYTE())
+                        {   /*
+                             * Import definition.
+                             */
+                            case OMFEXT_IMPDEF:
+                            {
+                                int fOrd = OMF_BYTE();
+                                cch = OMF_BYTE();
+                                pSym = symNew(pWld, WLDSF_STRONG | WLDSF_IMPORT, u.pch, cch);
+                                if (!pSym) goto failure;
+                                u.pch += cch;
+                                cch = OMF_BYTE();
+                                pSym->pszImpMod = strpool_addn(pWld->pStrMisc, u.pch, cch);
+                                u.pch += cch;
+                                if (fOrd)
+                                    pSym->iOrdinal = OMF_WORD();
+                                break;
+                            }
+
+                            /* 
+                             * Export definition.
+                             */
+                            case OMFEXT_EXPDEF:
+                            {
+                                int fOrd = *u.pch & 1;
+                                break;
+                            }
+                        }
+
+                    }
+
+                }
+                break;
+
+            case EXTDEF: case EXTDEF | REC32:
+            {
+
+                break;
+            }
+
+            case PUBDEF: case PUBDEF | REC32: 
+            {
+                break;
+            }
+
+            case ALIAS: case ALIAS | REC32:
+            {
+                break;
+            }
+
+            case COMDEF: case COMDEF | REC32: 
+            {
+                break;
+            }
+
+            case COMDAT: case COMDAT | REC32: 
+            {
+                break;
+            }
+
+            case LIBHDR:
+                modError(pMod, "invalid object module (LIBHDR).");
+                goto failure;
+            default:
+                fprintf(stderr, "we shall not be here!!\n");
+                asm ("int $3");
+                break;
+        }
+
+        #undef OMF_GETINDEX
+    }
+
+done_skip:
+    /* Skip to end of record */
+    fseek(phFile, OmfRec.cb, SEEK_CUR);
+
+done_noskip:
+    /* Make all the EXTDEFs uncertain. */
+    for (i = 0; i < cExts; i++)
+        papExts[i]->eFlags &= ~WLDSF_UNCERTAIN;
+
+    return 0;
+
+failure:
+    if (papExts)
+        free(papExts);
+    return -1;
+}
+
 
 
@@ -225 +651 @@
     pWld->fFlags = fFlags;
     pWld->pStrMisc = strpool_init();
+    pWld->ppLibsAdd = &pWld->pObjs;
+    pWld->ppObjsAdd = &pWld->pLibs;
 
     /* done */
@@ -271 +699 @@
 int     wld_add_object(PWLD pWld, FILE *phFile, const char *pszName)
 {
+    OMFREC  OmfRec = {0,0};
+    int     rc = 0;
     if (!phFile)
         phFile = fopen(pszName, "rb");
@@ -279 +709 @@
     }
     if (pWld->fFlags & WLDC_VERBOSE)
-        fprintf(stderr, "weakld: info: adding object %s\n", pszName);
-
-    /* @todo process it! */
-
-    return 0;
+        fprintf(stderr, "weakld: info: adding object %s.\n", pszName);
+
+    /*
+     * An object module is either a object or a library.
+     * In anycase all the modules it contains is to be added to the link.
+     */
+    fread(&OmfRec, sizeof(OmfRec), 1, phFile);
+    if (OmfRec.chType == THEADR)
+    {
+        /* Single Object */
+        PWLDMOD pMod = xmalloc(sizeof(*pMod));
+        memset(pMod, 0, sizeof(*pMod));
+        pMod->pszModName = strpool_add(pWld->pStrMisc, pszName);
+        pMod->phFile = phFile;
+        *pWld->ppObjsAdd = pMod;
+        pWld->ppObjsAdd = &pMod->pNext;
+        rc = pass1ReadOMFMod(pWld, pMod);
+    }
+    else if (OmfRec.chType == LIBHDR)
+    {
+        /* Library of object modules */
+        while (OmfRec.chType != LIBEND && OmfRec.chType != (LIBEND | REC32))
+        {
+            if (OmfRec.chType == THEADR || OmfRec.chType == (THEADR | REC32))
+            {
+                PWLDMOD     pMod = xmalloc(sizeof(*pMod));
+                memset(pMod, 0, sizeof(*pMod));
+                pMod->pszModName = strpool_add(pWld->pStrMisc, pszName);
+                pMod->phFile = phFile;
+                pMod->off = ftell(phFile) - sizeof(OmfRec);
+                *pWld->ppObjsAdd = pMod;
+                pWld->ppObjsAdd = &pMod->pNext;
+                if (pWld->fFlags & WLDC_VERBOSE)
+                {
+                    char            achModName[256];
+                    unsigned char   cchModName;
+                    cchModName = fgetc(phFile);
+                    achModName[fread(achModName, 1, cchModName, phFile)] = '\0';
+                    fprintf(stderr, "weakld: info: adding library member '%s'.\n", achModName);
+                }
+                rc = pass1ReadOMFMod(pWld, pMod);
+                if (rc)
+                    break;
+            }
+            else
+            {
+                /* skip to the net record */
+                fseek(phFile, OmfRec.cb, SEEK_CUR);
+            }
+
+            /* read next record */
+            fread(&OmfRec, sizeof(OmfRec), 1, phFile);
+        }
+    }
+    else
+    {
+        fprintf(stderr, "weakld: invalid object file '%s'.\n", pszName);
+        rc = -1;
+    }
+
+    return rc;
 }