Changeset 541

Timestamp:

Aug 6, 2003, 9:47:24 PM (22 years ago)

Author:

bird

Message:

bugfixing...

Location:

trunk/src/emx/src/emxomf

Files:

• emxomf.c (modified) (4 diffs, 1 prop)
• emxomfld.c (modified) (11 diffs, 1 prop)
• weakld.c (modified) (24 diffs, 1 prop)
• weakld.h (modified) (2 diffs, 1 prop)

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

@@ -1337 +1337 @@
                 || (sym_ptr[i].n_type >= N_WEAKU && sym_ptr[i].n_type <= N_WEAKB) )
               {
-                if ((sym_ptr[i].n_type & N_EXT) && out_lib != NULL)
+                /* for weaksymbols we may have to decorate the name */
+                if (   !weak_list_filename
+                    && sym_ptr[i].n_type >= N_WEAKU && sym_ptr[i].n_type <= N_WEAKB )
+                    name = weak_process_name(&sym_ptr[i], name, szName, sizeof(szName));
+
+                if (    out_lib != NULL
+                    &&  (   (   (sym_ptr[i].n_type & N_EXT) 
+                             && sym_ptr[i].n_type != N_WEAKB
+                             && sym_ptr[i].n_type != N_WEAKU)
+                         ||  sym_ptr[i].n_type == N_WEAKT 
+                         ||  sym_ptr[i].n_type == N_WEAKD ) )
                   {
                     pub_name = name;
@@ -1346 +1356 @@
                       error (lib_errmsg);
                   }
-
-                /* for weaksymbols we may have to decorate the name */
-                if (   !weak_list_filename
-                    && sym_ptr[i].n_type >= N_WEAKU && sym_ptr[i].n_type <= N_WEAKB )
-                    name = weak_process_name(&sym_ptr[i], name, szName, sizeof(szName));
 
                 if (started && !fits (strlen (name) + 6))
@@ -3678 +3683 @@
                       calculated_page_size <<= 1;
                 }
-              if (1)
-                printf("calculated page size %d\n", calculated_page_size);
             }
 
@@ -3890 +3893 @@
   opt_o = NULL; opt_O = NULL;
   opterr = FALSE;
+
+  tmp = getenv("EMXOMFLD_TYPE");
+  if (tmp && !stricmp(tmp, "LINK386"))
+      hll_version = 3;
 
   /* Parse the command line options. */

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

@@ -640 +640 @@
   if (opt_t)
       fFlags |= WLDC_VERBOSE;
+  if (!stricmp(linker_type, "LINK386"))
+      fFlags |= WLDC_LINKER_LINK386;
+
   for (pOpt = options; pOpt; pOpt = pOpt->next)
     if (    !strnicmp(pOpt->name, "/NOE", 4)
@@ -668 +671 @@
   if (opt_t)
     fprintf(stderr, "*** Invoking weak prelinker with flags %x.\n", fFlags);
-  pwld = wldCreate (fFlags);
+  pwld = WLDCreate (fFlags);
   if (pwld)
     {
@@ -679 +682 @@
         {
           phfile = fopen (def_fname, "r");
-          rc = wldAddDefFile (pwld, phfile, def_fname);
+          rc = WLDAddDefFile (pwld, phfile, def_fname);
         }
 
@@ -687 +690 @@
           static const char * objexts[] = { ".obj", ".o", NULL };
           phfile = find_objlib (szname, pcur->name, objexts, TRUE);
-          rc = wldAddObject (pwld, phfile, szname);
+          rc = WLDAddObject (pwld, phfile, szname);
         }
 
@@ -695 +698 @@
           static const char * libexts[] = { ".lib", ".a", NULL };
           phfile = find_objlib (szname, pcur->name, libexts, TRUE);
-          rc = wldAddLibrary (pwld, phfile, szname);
+          rc = WLDAddLibrary (pwld, phfile, szname);
           free(pcur->name);
           pcur->name = xstrdup(szname);
@@ -703 +706 @@
       if (!rc)
         {
-          rc = wldPass1 (pwld);
+          rc = WLDPass1 (pwld);
           /* ignore unresolved externals for now. */
           if (rc == 42)
@@ -714 +717 @@
       /* generate weak aliases. */
       if (!rc)
-        rc = wldGenerateWeakAliases (pwld, weakobj_fname, weakdef_fname);
+        rc = WLDGenerateWeakAliases (pwld, weakobj_fname, weakdef_fname);
       if (!rc && weakobj_fname[0])
         add_name_list (&add_obj_fnames, weakobj_fname);
       if (!rc && weakdef_fname[0])
-        strcpy (def_fname, weakdef_fname);
+        def_fname = weakdef_fname;
 
       /* cleanup the linker */
-      wldDestroy (pwld);
+      WLDDestroy (pwld);
       
       /* last words */
@@ -1089 +1092 @@
     }
 
-  /* Build the environment for LINK386. */
+  /* Build the environment for the linker. */
 
   make_env ();
-
-  /* Do the weak prelinking unless GCC_WEAKSYMS are set.
-     Important that this is done after make_env(). */
-
-  if (!getenv("GCC_WEAKSYMS"))
-      weak_prelink ();
-  else
-    {
-      /* apply library hack */
-      name_list *pcur;
-      for (pcur = lib_fnames; !rc && pcur; pcur = pcur->next)
-        {
-          static const char * libexts[] = { ".lib", ".a", NULL };
-          char szname[_MAX_PATH];
-          FILE *phfile = find_objlib (szname, pcur->name, libexts, TRUE);
-          if (!phfile)
-            continue;
-          free(pcur->name);
-          pcur->name = xstrdup(szname);
-          fclose(phfile);
-        }
-
-    }
 
   /* EMXOMFLD_TYPE contains VAC365, VAC308 or LINK386 if set. If non of these 
@@ -1139 +1119 @@
 
 
+
+  /* Do the weak prelinking unless GCC_WEAKSYMS are set.
+     Important that this is done after make_env(). */
+
+  if (!getenv("GCC_WEAKSYMS"))
+      weak_prelink ();
+  else
+    {
+      /* apply library hacks */
+      name_list *pcur;
+      for (pcur = lib_fnames; !rc && pcur; pcur = pcur->next)
+        {
+          static const char * libexts[] = { ".lib", ".a", NULL };
+          char szname[_MAX_PATH];
+          FILE *phfile = find_objlib (szname, pcur->name, libexts, TRUE);
+          if (!phfile)
+            continue;
+          free(pcur->name);
+          pcur->name = xstrdup(szname);
+          fclose(phfile);
+        }
+
+    }
 
   /* Start building the linker command line.  We can use a response
@@ -1201 +1204 @@
       if (map_flag)
         put_arg ("/map", FALSE, FALSE);  
-
-      /* VAC365: check if we have os2stub.bin. */
-      if (!stricmp (linker_type, "VAC365"))
-        {
-          struct stat s;
-          _execname(&execname[0], sizeof(execname));
-          strcpy(_getname(&execname[0]), "os2stub.bin");
-
-          if (!stat (execname, &s))
-            {
-              sprintf (tmp, "/STUB:%s", &execname[0]);
-              put_arg (tmp, FALSE, FALSE);
-            }
-        }
     }
   put_arg ("/nol", FALSE, FALSE);
@@ -1220 +1209 @@
   put_arg ("/noi", FALSE, FALSE);
   put_arg ("/packc", FALSE, FALSE);
+
+  
+  /* VAC365: check if we have os2stub.bin. 
+     We must to this after the above stuff else /nol might end up in the 
+     response file and we'll get the component output. */
+
+  if (!stricmp (linker_type, "VAC365"))
+    {
+      struct stat s;
+      _execname(&execname[0], sizeof(execname));
+      strcpy(_getname(&execname[0]), "os2stub.bin");
+
+      if (!stat (execname, &s))
+        {
+          sprintf (tmp, "/STUB:%s", &execname[0]);
+          put_arg (tmp, FALSE, FALSE);
+        }
+    }
 
   /* Add the /INFORMATION option if the -i or -t option was given.  This is

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

@@ -1369 +1369 @@
     int         cch = *pachPascalString;
     const char *psz = pachPascalString + 1;
+    const char *pszWeak;
     int (*pfn)(const char *, const char *, size_t) = (pWld->fFlags & WLDC_CASE_INSENSITIVE) ? strnicmp : strncmp;
 
+    /* look for weak suffix */
+    for (pszWeak = psz + cch - 1; pszWeak > psz; pszWeak--)
+        if (    pszWeak[0] == '$'
+            &&  pszWeak[1] == 'w'
+            &&  pszWeak[2] == '$')
+        {
+            cch = pszWeak - psz;
+            break;
+        }
+
+    /* compare */
     if (pSym)
         return !pfn(pSym->pszName, psz, cch) && !pSym->pszName[cch];
     else
     {
-#if 1   /* hashed */
-        unsigned uHash = symHash(psz, cch);
+        /* @todo: this isn't 100% correct when we're talking case in sensitivity. */
+        unsigned uHash = symHash(psz, cch); 
         for (pSym = pWld->Global.ap[uHash]; pSym; pSym = pSym->pHashNext)
         {
@@ -1385 +1397 @@
             }
         }
-#else
-        /* raw */
-        int i;
-        for (i = 0; i < sizeof(pWld->Global.ap) / sizeof(pWld->Global.ap[0]); i++)
-        {
-            for (pSym = pWld->Global.ap[i]; pSym; pSym = pSym->pHashNext);
-            {
-                if ((pSym->fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == WLDSF_UNDEF)
-                {
-                    if (!pfn(pSym->pszName, psz, cch) && !pSym->pszName[cch])
-                        return 1;
-                }
-            }
-        }
-#endif
     }
     return 0;
@@ -1455 +1452 @@
  * Actually if the symbol exists we'll perform any required symbol 'merger' and
  * either fail due to symbol errors or return the 'merged' one.
- *
- * We'll simply return existing symbol when:
- *      1. adding a UNDEF where a PUBLIC, COMM, !WEAK UNDEF or IMPORT exists.
- *      2. adding a WKEXT where a PUBLIC or COMM exists.
- *      3. adding a WKEXT where a UNDEF which isn't UNCERTAIN exists.
- *      4. adding a COMM where a !WEAK COMM exists.
- *      5. adding a WEAK PUBLIC or WEAK COMM where a PUBLIC or COMM exists.
- *      6. adding a WEAK UNDEF where WEAK UNDEF exists.
- *
- * We'll warn and return existing symbol when:
- *      1. adding a IMPORT LIBSEARCH where a PUBLIC or COMM exists.
- *
- * We'll return upgraded existing symbol when:
- *      1. adding a PUBLIC, COMM or IMPORT where a UNDEF or WKEXT exists.
- *      2. adding a !WEAK PUBLIC or !WEAK COMM where a WEAK PUBLIC or WEAK COMM exists.
- *      3. adding a !WEAK UNDEF where a WEAK UNDEF exists.
- *      4. adding a UNDEF where a WKEXT exists.
- *
- * We'll warn and upgraded existing symbol when:
- *      1. adding a PUBLIC or COMM where a IMPORT LIBSEARCH exists.
- *
- * The rest is failures.
- *
- * There migth be errors in the algorithm. Like adding the same import twice
- * shouldn't harm anybody, but it's unlikely and it requires quite some extra parameters.
- * Also the caller must resolve any conflicting exports (which normally only yields
- * warnings anyway it seems).
  *
  * @returns Pointer to symbold.
@@ -1496 +1466 @@
  * @param   pflAction   What we actually did.
  *                      WLDSA_NEW, WLDSA_UP, WLDSA_OLD, WLDSA_ERR.
+ * @sketch
+ *
+ * We'll simply return existing symbol when:
+ *      1. adding a UNDEF where a PUBLIC, COMM, !WEAK UNDEF or IMPORT exists.
+ *      2. adding a WKEXT where a PUBLIC or COMM exists.
+ *      3. adding a WKEXT where a UNDEF which isn't UNCERTAIN exists.
+ *      4. adding a COMM where a !WEAK COMM exists.
+ *      5. adding a WEAK PUBLIC or WEAK COMM where a PUBLIC or COMM exists.
+ *      6. adding a WEAK UNDEF where WEAK UNDEF exists.
+ *
+ * We'll warn and return existing symbol when:
+ *      1. adding a IMPORT LIBSEARCH where a PUBLIC or COMM exists.
+ *
+ * We'll return upgraded existing symbol when:
+ *      1. adding a PUBLIC, COMM or IMPORT where a UNDEF or WKEXT exists.
+ *      2. adding a !WEAK PUBLIC or !WEAK COMM where a WEAK PUBLIC or WEAK COMM exists.
+ *      3. adding a !WEAK UNDEF where a WEAK UNDEF exists.
+ *      4. adding a UNDEF where a WKEXT exists.
+ *      5. adding a IMPORT where a WEAK exists.
+ *
+ * We'll warn and upgraded existing symbol when:
+ *      1. adding a PUBLIC or COMM where a IMPORT LIBSEARCH exists.
+ *
+ * The rest is failures.
+ *
+ * There migth be errors in the algorithm. Like adding the same import twice
+ * shouldn't harm anybody, but it's unlikely and it requires quite some extra parameters.
+ * Also the caller must resolve any conflicting exports (which normally only yields
+ * warnings anyway it seems).
+ *
  */
 static PWLDSYM      symAdd(PWLD pWld, PWLDMOD pMod, unsigned fFlags, const char *pachName, int cchName, PWLDSYMACTION peAction)
@@ -1611 +1611 @@
          *      3. adding a !WEAK UNDEF where a WEAK UNDEF exists.
          *      4. adding a UNDEF where a WKEXT exists.
+         *      5. adding a IMPORT where a WEAK exists.
          */
         else
@@ -1625 +1626 @@
                 (fFlags & WLDSF_TYPEMASK) == WLDSF_UNDEF
             &&  (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_WKEXT
+            ) || ( /* 5 */
+                (fFlags & WLDSF_TYPEMASK) == WLDSF_IMPORT
+            &&  (pSym->fFlags & WLDSF_WEAK) == WLDSF_WEAK
             ))
         {
@@ -2442 +2446 @@
  * @param   fFlags  Linker flags as defined by enum wld_create_flags.
  */
-PWLD    wldCreate(unsigned fFlags)
+PWLD    WLDCreate(unsigned fFlags)
 {
     PWLD    pWld = xmalloc(sizeof(*pWld));
@@ -2466 +2470 @@
  * @param   pWld    Linker instance to destroy.
  */
-int     wldDestroy(PWLD pWld)
+int     WLDDestroy(PWLD pWld)
 {
     PWLDMOD     pObj;
@@ -2524 +2528 @@
  *          or wld_generate_weaklib()!
  */
-int     wldAddObject(PWLD pWld, FILE *phFile, const char *pszName)
+int     WLDAddObject(PWLD pWld, FILE *phFile, const char *pszName)
 {
     OMFREC  OmfRec = {0,0};
@@ -2614 +2618 @@
  *                  On failure, we'll update the structures rc member.
  */
-static int wldDefCallback(struct _md *pMD, const _md_stmt *pStmt, _md_token eToken, void *pvArg)
+static int      wldDefCallback(struct _md *pMD, const _md_stmt *pStmt, _md_token eToken, void *pvArg)
 {
     unsigned        fFlags;
@@ -2706 +2710 @@
  *          or wld_generate_weaklib()!
  */
-int     wldAddDefFile(PWLD pWld, FILE *phFile, const char *pszName)
+int     WLDAddDefFile(PWLD pWld, FILE *phFile, const char *pszName)
 {
     struct _md *    pMD;
@@ -2767 +2771 @@
  * @author  Don't call wld_add_library after wld_generate_weaklib()!
  */
-int     wldAddLibrary(PWLD pWld, FILE *phFile, const char *pszName)
+int     WLDAddLibrary(PWLD pWld, FILE *phFile, const char *pszName)
 {
     PWLDLIB     pLib;
@@ -2823 +2827 @@
  * @param   pWld    Linker Instance.
  */
-int     wldPass1(PWLD pWld)
+int     WLDPass1(PWLD pWld)
 {
     int     fMore;
@@ -2894 +2898 @@
 
 
+/** Parameter structure for wldGenerateObjEnum(). */
 typedef struct wldGenerateObjEnum_param
 {
@@ -2902 +2907 @@
 } WLDGOEPARAM, *PWLDGOEPARAM;
 
-#define GENERATE_LIBRARY
 
 /**
@@ -2914 +2918 @@
  * @param   pvUser  Pointer to a FILE stream.
  */
-static int wldGenerateObjEnum(PWLD pWld, PWLDSYM pSym, void *pvUser)
+static int      wldGenerateObjEnum(PWLD pWld, PWLDSYM pSym, void *pvUser)
 {
     if (pSym->pszWeakName)
@@ -2947 +2951 @@
         }
 
-        #ifdef GENERATE_LIBRARY
         /* end the current object? */
-        if (pParam->cAliases > 32)
+        if ((pWld->fFlags & WLDC_LINKER_LINK386) && pParam->cAliases > 1)//32)
         {
             off_t   off; 
@@ -2965 +2968 @@
         
         /* make new object ? */
-        if (!pParam->cAliases)
+        if ((pWld->fFlags & WLDC_LINKER_LINK386) && !pParam->cAliases)
         {
             omf.hdr.chType = THEADR;
@@ -2978 +2981 @@
             }
         }
-        #endif 
+        
 
         /* Alias record */
@@ -3033 +3036 @@
  *  copied to the new file.
  */
-static int wldGenerateDefCallback(struct _md *pMD, const _md_stmt *pStmt, _md_token eToken, void *pvArg)
+static int      wldGenerateDefCallback(struct _md *pMD, const _md_stmt *pStmt, _md_token eToken, void *pvArg)
 {
     PWLDGDCPARAM     pParam = (PWLDGDCPARAM)pvArg;
@@ -3171 +3174 @@
  *                      This is an empty string if changes was required!
  */
-int     wldGenerateWeakAliases(PWLD pWld, char *pszObjName, char *pszDefName)
+int     WLDGenerateWeakAliases(PWLD pWld, char *pszObjName, char *pszDefName)
 {
     FILE *      phFile;
@@ -3252 +3255 @@
     if (!rc && pszObjName)
     {
-        #ifdef GENERATE_LIBRARY
-        rc = wldTempFile(pWld, pszObjName, "wk", ".lib");
-        #else
-        rc = wldTempFile(pWld, pszObjName, "wk", ".obj");
-        #endif 
+        rc = wldTempFile(pWld, pszObjName, "wk", (pWld->fFlags & WLDC_LINKER_LINK386) ? ".lib" : ".obj");
         if (!rc)
         {
@@ -3262 +3261 @@
 
             /* open it */
-            phFile = fopen(pszObjName, "wr");
+            phFile = fopen(pszObjName, "wb");
             if (phFile)
             {
@@ -3279 +3278 @@
                 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 
+                if (pWld->fFlags & WLDC_LINKER_LINK386)
+                {
+                    /* 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 = 1;
+                }
+                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 */
+                }
                 fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile);
 

trunk/src/emx/src/emxomf/weakld.h

@@ -43 +43 @@
     /** Case in-sensitive symbol resolution. */
     WLDC_CASE_INSENSITIVE = 4,
+    /** The linker is link386. */
+    WLDC_LINKER_LINK386 = 0x1000,
 };
 
@@ -51 +53 @@
 /** @group Weak LD - Public methods.
  * @{ */
-PWLD    wldCreate(unsigned fFlags);
-int     wldAddObject(PWLD pWld, FILE *phFile, const char *pszName);
-int     wldAddDefFile(PWLD pWld, FILE *phFile, const char *pszName);
-int     wldAddLibrary(PWLD pWld, FILE *phFile, const char *pszName);
-int     wldPass1(PWLD pWld);
-int     wldGenerateWeakAliases(PWLD pwld, char *pszObjName, char *pszDefName);
-int     wldDestroy(PWLD pWld);
+PWLD    WLDCreate(unsigned fFlags);
+int     WLDAddObject(PWLD pWld, FILE *phFile, const char *pszName);
+int     WLDAddDefFile(PWLD pWld, FILE *phFile, const char *pszName);
+int     WLDAddLibrary(PWLD pWld, FILE *phFile, const char *pszName);
+int     WLDPass1(PWLD pWld);
+int     WLDGenerateWeakAliases(PWLD pwld, char *pszObjName, char *pszDefName);
+int     WLDDestroy(PWLD pWld);
 /** @} */