Changeset 61

Timestamp:

Apr 29, 2003, 6:26:33 PM (22 years ago)

Author:

bird

Message:

• emxbind sets heap size to 0 when making a DLL (same as if you would use -h0). This solves a real big problem with all DLLs made from a.out having a very large heap segment (32Mb) and eating up virtual address space.
• fixed emxbind to use hash tables instead of linear search when exporting DLL symbols. This allows for a huge speedup when building large DLLs from a.out object files.
• exports by names without ordinals goes into resident names table rather than into non-resident names table. This is the behaviour of LINK386.
• emxbind now honors properly the NONAME keyword in .def files
• disabled emxbind warnings about a DLL entry being exported more than once. LINK386 does not emit any warnings about this, so why emxbind should do? Still if you use the -v option, this warning is back.

Location:

trunk/src/emx/src/emxbind

Files:

• cmd.c (modified) (1 diff, 1 prop)
• emxbind.c (modified) (3 diffs, 1 prop)
• emxbind.h (modified) (2 diffs, 1 prop)
• exec.c (modified) (1 diff, 1 prop)
• export.c (modified) (6 diffs, 1 prop)
• fixup.c (modified) (2 diffs, 1 prop)
• map.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/emxbind/cmd.c

@@ -47 +47 @@
       relocatable = TRUE;
       stack_size = 0;
+      heap_size = 0;
     }
 }

trunk/src/emx/src/emxbind/emxbind.c

@@ -172 +172 @@
 
       exp.ord = stmt->export.ordinal;
-      exp.resident = (stmt->export.flags & _MDEP_RESIDENTNAME) ? TRUE : FALSE;
+      exp.resident = (!exp.ord || (stmt->export.flags & _MDEP_RESIDENTNAME)) ? TRUE : FALSE;
       exp.entryname = xstrdup (stmt->export.entryname);
+      exp.flags = stmt->export.flags;
       if (stmt->export.internalname[0] != 0)
         exp.internalname = xstrdup (stmt->export.internalname);
@@ -325 +326 @@
     error ("file name missing");
   else
-    {
       strcpy (dst, def);
-      if (ext != NULL)
-        _remext (dst);
-    }
-  if (ext != NULL)
-    _defext (dst, ext);
+  if (ext)
+  {
+    char *curext = _getext2 (dst);
+    if (curext && *curext == '.')
+      curext++;
+    if (strcmp (curext, ext))
+    {
+      if (strlen (dst) > FNAME_SIZE - 5)
+        error ("file name too long");
+      strcat (dst, ".");
+      strcat (dst, ext);
+    }
+    }
 }
 
@@ -433 +441 @@
 
   opterr = FALSE;
-  optswchar = "-";
+//optswchar = "-";
 
   /* No command option has been seen yet. */

trunk/src/emx/src/emxbind/emxbind.h

@@ -149 +149 @@
   dword offset;
   int object;
+  int flags;
 };
 
@@ -529 +530 @@
 
 void build_sym_hash_table (void);
+struct nlist *find_symbol (const char *name, int underscore);
 void sort_fixup (void);
 void create_fixup (const struct fixup *fp, int neg);

trunk/src/emx/src/emxbind/exec.c

@@ -167 +167 @@
 {
   if (os2_bind_h.text_base != TEXT_BASE
-      || os2_bind_h.text_end != TEXT_BASE + a_in_h.text_size
+      || round_page (os2_bind_h.text_end) != TEXT_BASE + round_page (a_in_h.text_size)
       || os2_bind_h.data_base != data_base)
     return FALSE;

trunk/src/emx/src/emxbind/export.c

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+#include <sys/moddef.h>
 #include "defs.h"
 #include "emxbind.h"
@@ -47 +48 @@
       if (stricmp (exp->entryname, export_data[i].entryname) == 0)
         error ("export multiply defined: %s", exp->entryname);
-      if (strcmp (exp->internalname, export_data[i].internalname) == 0)
+      if ((verbosity >= 2) &&
+          (strcmp (exp->internalname, export_data[i].internalname) == 0))
         printf ("emxbind: %s multiply exported (warning)\n",
                 exp->internalname);
@@ -84 +86 @@
 }
 
+#if 0
 
 /* Find the symbol NAME in the a.out symbol table of the input
@@ -123 +126 @@
 }
 
+#endif
 
 /* Compare two entries of an int array for qsort().  This function is
@@ -195 +199 @@
           export_data[i].object = OBJ_TEXT;
           break;
+        case N_BSS:
         case N_DATA:
           export_data[i].offset = nl->value - obj_data.virt_base;
@@ -231 +236 @@
     {
       exp = &export_data[i];
+      if (!(exp->flags & _MDEP_NONAME))
       entry_name ((exp->resident ? &resnames : &nonresnames),
                   exp->entryname, exp->ord);

trunk/src/emx/src/emxbind/fixup.c

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+#include <alloca.h>
 #include "defs.h"
 #include "emxbind.h"
@@ -99 +100 @@
       sym_hash_table[hash] = i;
     }
+}
+
+
+/* Find the symbol NAME in the a.out symbol table of the input
+   executable.  If UNDERSCORE is true, an underscore is prepended to
+   NAME.  If the symbol is found, find_symbol() returns a pointer to
+   the symbol table entry.  Otherwise, NULL is returned. */
+
+struct nlist *find_symbol (const char *name, int underscore)
+{
+  int j, len;
+  const char *name1 = name;
+
+  len = strlen (name);
+  if (underscore)
+  {
+    name1 = alloca (len + 2);
+    ((char *)name1)[0] = '_';
+    memcpy (((char *)name1) + 1, name, len + 1);
+  }
+
+  for (j = sym_hash_table[sym_hash (name1)]; j != -1;
+       j = sym_hash_next[j])
+    {
+      const char *name2 = sym_image[j].string + str_image;
+
+      if (memcmp (name1, name2, len) == 0)
+      {
+        int t = sym_image[j].type & ~N_EXT;
+        if (t == N_TEXT || t == N_DATA || t == N_BSS)
+          return sym_image+j;
+      }
+    }
+
+  return NULL;
 }
 

trunk/src/emx/src/emxbind/map.c

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+#include <alloca.h>
 #include "defs.h"
 #include "emxbind.h"