Changeset 488 for trunk/src

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 (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... */
+
                   )
                 {
@@ -581 +582 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 /* Weak prelinking for Method 2 Weak support. */
 
@@ -588 +601 @@
   PWLD    pwld;
 
-  pwld = wld_create (0);
+  pwld = wld_create ();
   if (pwld)
     {

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

@@ -46 +46 @@
 *******************************************************************************/
 #define WLDSYM_HASH_SIZE    211
+
 
 
@@ -55 +56 @@
 #include <stdlib.h>
 #include <sys/types.h>
+
 #include "defs.h"
 #include "grow.h"
 #include "weakld.h"
+
  
 /*******************************************************************************
@@ -71 +74 @@
     /** Filehandle if open */
     FILE *      phFile;
+
+
 } 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;
+    /* */
+    ;
 } 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;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
     /** Symbol this is an alias for. */
     struct wldsym *     pAliasFor;
+
+
+
+
+
+
+
 
     /** Next node in the hash bucket. */
@@ -156 +216 @@
     /** Global symbols. */
     WLDSYMTAB           Global;
+
+
+
+
+
+
+
+
 
     /** string pool for miscellaneous string. */
@@ -163 +231 @@
  
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 extern void *xrealloc (void *ptr, size_t n);
 extern void *xmalloc (size_t n);
 
+
+
+
 
 
@@ -197 +295 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -225 +651 @@
     pWld->fFlags = fFlags;
     pWld->pStrMisc = strpool_init();
+
+
 
     /* done */
@@ -271 +699 @@
 int     wld_add_object(PWLD pWld, FILE *phFile, const char *pszName)
 {
+
+
     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;
 }