Changeset 144

Timestamp:

May 15, 2003, 4:25:00 PM (22 years ago)

Author:

zap

Message:

Removed EMX.DLL dependency and EMXL.EXE dependency.

Location:

trunk/src/emx/src/emxbind

Files:

• cmd.c (modified) (7 diffs, 1 prop)
• emxbind.c (modified) (15 diffs, 1 prop)
• emxbind.h (modified) (10 diffs, 1 prop)
• emxbind.smak (modified) (1 diff, 1 prop)
• exec.c (modified) (15 diffs, 1 prop)
• fixup.c (modified) (2 diffs, 1 prop)
• list.c (deleted)

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

@@ -27 +27 @@
 
 
-/* Alter the emx options of a bound executable. */
-
-static void alter (void)
-{
-  set_options ();
-  my_seek (&inp_file, patch_pos);
-  my_write (&dos_bind_h, sizeof (dos_bind_h), &inp_file);
-  my_seek (&inp_file, a_in_pos + a_in_data);
-  my_write (&os2_bind_h, sizeof (os2_bind_h), &inp_file);
-}
-
-
 /* Perform initializations for the bind operation. */
 
@@ -64 +52 @@
 
 
-/* Show the emx options of a bound executable. */
-
-static void show (void)
-{
-  if (dos_bind_h.options[0] != 0)
-    printf ("emx options for MS-DOS: %s\n", (char *)dos_bind_h.options);
-  if (os2_bind_h.options[0] != 0)
-    printf ("emx options for OS/2:   %s\n", (char *)os2_bind_h.options);
-}
-
-
 /* Strip the symbols from a bound executable. */
 
@@ -96 +73 @@
 
 
-/* Update emxl.exe or emx.exe in a bound executable. */
-
-static void update (void)
-{
-  long size, i;
-  byte *buf;
-
-  read_os2_header ();
-  set_exe_header ();
-  i = (inp_os2_pos & 0xfff) - (os2_hdr_pos & 0xfff);
-  if (i != 0)
-    {
-      if (i < 0)
-        i += 0x1000;
-      os2_hdr_pos += i; fill2 += i;
-    }
-  out_h2.new_lo = LOWORD (os2_hdr_pos);
-  out_h2.new_hi = HIWORD (os2_hdr_pos);
-  size = my_size (&inp_file) - inp_os2_pos - sizeof (os2_h);
-  a_out_pos = a_in_pos - inp_os2_pos + os2_hdr_pos;
-  os2_h.enum_offset += os2_hdr_pos - inp_os2_pos;
-  if (os2_h.nonresname_size != 0)
-    os2_h.nonresname_offset += os2_hdr_pos - inp_os2_pos;
-  dos_bind_h.hdr_loc_lo = LOWORD (a_out_pos);
-  dos_bind_h.hdr_loc_hi = HIWORD (a_out_pos);
-  os2_bind_h.heap_off += os2_hdr_pos - inp_os2_pos;
-  memmove (dos_bind_h.hdr, emx_bind_h.hdr, sizeof (dos_bind_h.hdr));
-  buf = xmalloc (size);
-  my_seek (&inp_file, inp_os2_pos + sizeof (os2_h));
-  my_read (buf, size, &inp_file);
-  my_change (&out_file, &inp_file);
-  write_header ();
-  my_write (&os2_h, sizeof (os2_h), &out_file);
-  my_write (buf, size, &out_file);
-  my_trunc (&out_file);
-  write_bind_header ();
-}
-
-
-/* Extract the a.out subfile of a bound executable. */
-
-static void extract (void)
-{
-  long hdr_loc, size;
-
-  hdr_loc = COMBINE (dos_bind_h.hdr_loc_lo, dos_bind_h.hdr_loc_hi);
-  size = my_size (&inp_file) - hdr_loc;
-  my_seek (&inp_file, hdr_loc);
-  copy (&inp_file, size);
-}
-
-
 void cmd (int mode)
 {
   switch (mode)
     {
-    case 'a':
-
-      /* Alter emxbind options. */
-
-      check_bound ();
-      alter ();
-      break;
-
     case 'b':
 
@@ -166 +83 @@
       init_bind ();
       init_os2_header ();
-      read_emx ();
+      read_stub ();
       read_a_out_header ();
       if (opt_c != NULL)
@@ -176 +93 @@
       set_exe_header ();
       set_os2_header ();
-      set_dos_bind_header ();
       write_header ();
       write_res ();
       copy_a_out ();
       write_nonres ();
-      write_bind_header ();
       if (opt_m != NULL)
         write_map (opt_m);
@@ -190 +105 @@
       /* Set the OS/2 application type. */
 
-      check_bound ();
       exe_type ();
-      break;
-
-#if LIST_OPT
-    case 'L':
-
-      /* List the headers. */
-
-      check_bound ();
-      list ();
-      break;
-#endif
-    case 'i':
-
-      /* Show the emxbind options. */
-
-      check_bound ();
-      show ();
       break;
 
@@ -215 +112 @@
       /* Strip symbols. */
 
-      check_bound ();
       strip_symbols ();
-      break;
-
-    case 'u':
-
-      /* Update emxl.exe or emx.exe in a bound executable. */
-
-      read_emx ();
-
-      /* Call check_bound() *after* read_emx() as it needs dos_bind_h! */
-
-      check_bound ();
-      update ();
-      break;
-
-    case 'x':
-
-      /* Extract the a.out file of a bound executable. */
-
-      check_bound ();
-      extract ();
       break;
 

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

@@ -42 +42 @@
                      "Copyright (c) 1991-1997 by Eberhard Mattes";
 
-/* These strings contain the valid option letters of the DOS and OS/2
-   versions of emx, respectively.  Depending on the string in which an
-   option is found, the option is put into the DOS or OS/2 emxbind
-   header.  Option letters which don't appear in any of the strings
-   are invalid. */
-
-static char *valid_dos_options = "CLRZacdehopqst";
-static char *valid_os2_options = "EKchnqtx";
-
-/* File names of various files.  inp_fname holds the name of the input
-   executable, emx_fname the name of the emxl.exe or emx.exe file, and
+/* File names of various files.  inp_fname holds the name of the
+   input executable, stub_fname the name of the DOS stub file and
    def_fname the name of the module definition file (-d option). */
 
 static char inp_fname[FNAME_SIZE];
-static char emx_fname[FNAME_SIZE];
+static char stub_fname[FNAME_SIZE];
 static char def_fname[FNAME_SIZE];
 
@@ -65 +56 @@
 static char **gargv;
 
-/* Automatically locate emxl.exe if this flag is true.  Otherwise, use
-   the path name given on the command line. */
-
-static int auto_emxl = FALSE;
-
-/* The file name given by the STUB statement. */
-
-static char *stub_fname = NULL;
-
 
 /* Give the user a short reminder about how to call this program. */
@@ -81 +63 @@
   puts (title);
   puts ("\nUsage:");
-  puts ("  emxbind [-b] [<options>] <emx>[.exe] <input> [<output>[.exe]] [<emx_opt>]");
-  puts ("  emxbind [-b] [<options>] [-o <output>[.exe]] <input> [<emx_opt>]");
-  puts ("  emxbind -u [<options>] <emx>[.exe] <input>[.exe]");
+  puts ("  emxbind [-b] [<options>] <stub>[.exe] <input> [<output>[.exe]]");
+  puts ("  emxbind [-b] [<options>] [-o <output>[.exe]] <input>");
   puts ("  emxbind -e [<options>] <input>[.exe]");
   puts ("  emxbind -s [<options>] <input>[.exe]");
-  puts ("  emxbind -x [<options>] <input>[.exe] <output>");
-  puts ("  emxbind -i [<options>] <input>[.exe]");
-  puts ("  emxbind -a [<options>] <input>[.exe] [<emx_opt>]");
-#if LIST_OPT
-  puts ("  emxbind -L [<options>] <input>[.exe]");
-#endif
   puts ("\nCommands:");
   puts ("  -b          bind .exe (default)");
-  puts ("  -u          update emx in .exe");
   puts ("  -e          set OS/2 .exe flags: -f, -p or -w");
   puts ("  -s          strip symbols");
-  puts ("  -x          extract a.out");
-  puts ("  -i          show options");
-  puts ("  -a          alter options");
-#if LIST_OPT
-  puts ("  -L          list headers");
-#endif
   puts ("\nOptions:");
   puts ("  -f          application type: full screen (-b and -e)");
@@ -110 +78 @@
   puts ("  -v          be verbose");
   puts ("  -s          strip symbols (-b only)");
-  puts ("  -C          use old method for creating preloaded executables");
   puts ("  -c[<core>]  add data from core dump file (-b only)");
   puts ("  -d[<def>]   read module definition file (-b only)");
-  puts ("  -E<dll>     use <dll> instead of emx.dll (-b only)");
   puts ("  -h<size>    set heap size for OS/2 (-b only)");
   puts ("  -k<size>    set stack size for OS/2 (-b only)");
@@ -270 +236 @@
 
       if (!stmt->stub.none)
-        stub_fname = xstrdup (stmt->stub.name);
+        _strncpy (stub_fname, stmt->stub.name, sizeof (stub_fname));
       break;
 
@@ -343 +309 @@
 
 
-/* Scan the remaining command line arguments as emx options and store
-   them to options_for_dos and options_for_os2. */
-
-static void emx_options (void)
-{
-  char c;
-  int dos_flag, os2_flag;
-  int i, index_dos, index_os2;
-  char *array_dos[100];
-  char *array_os2[100];
-
-  /* Collect the options in array_dos and array_os2. */
-
-  index_dos = index_os2 = 0;
-  while (optind < gargc)
-    {
-      if (gargv[optind][0] != '-')
-        error ("emx option expected");
-      c = gargv[optind][1];
-      dos_flag = (strchr (valid_dos_options, c) != NULL);
-      os2_flag = (strchr (valid_os2_options, c) != NULL);
-      if (!dos_flag && !os2_flag)
-        {
-          if (verbosity > 0) puts (title);
-          error ("invalid emx option: %s", gargv[optind]);
-        }
-      if (dos_flag)
-        {
-          for (i = 0; i < index_dos; ++i)
-            if (memcmp (array_dos[i], gargv[optind],
-                        gargv[optind][1] == 'R' ? 3 : 2) == 0)
-              break;
-          if (i >= index_dos)
-            i = index_dos++;
-          array_dos[i] = gargv[optind];
-        }
-      if (os2_flag)
-        {
-          for (i = 0; i < index_os2; ++i)
-            if (memcmp (array_os2[i], gargv[optind], 2) == 0)
-              break;
-          if (i >= index_os2)
-            i = index_os2++;
-          array_os2[i] = gargv[optind];
-        }
-      ++optind;
-    }
-
-  /* Concatenate the options for DOS. */
-
-  options_for_dos[0] = 0;
-  for (i = 0; i < index_dos; ++i)
-    {
-      if (strlen (options_for_dos) + strlen (array_dos[i])
-          > sizeof (options_for_dos) - 3)
-        {
-          if (verbosity > 0) puts (title);
-          error ("too many emx options for MS-DOS");
-        }
-      if (options_for_dos[0] != 0)
-        strcat (options_for_dos, " ");
-      strcat (options_for_dos, array_dos[i]);
-    }
-
-  /* Concatenate the options for OS/2. */
-
-  options_for_os2[0] = 0;
-  for (i = 0; i < index_os2; ++i)
-    {
-      if (strlen (options_for_os2) + strlen (array_os2[i])
-          > sizeof (options_for_os2) - 3)
-        {
-          if (verbosity > 0) puts (title);
-          error ("too many emx options for OS/2");
-        }
-      if (options_for_os2[0] != 0)
-        strcat (options_for_os2, " ");
-      strcat (options_for_os2, array_os2[i]);
-    }
-}
-
-
 /* Parse the command line. */
 
@@ -450 +334 @@
 
   while ((c = getopt (gargc, gargv,
-                      "abc::Cd::eE:fh:ik:lLm:o:pqr:suvwx")) != -1)
+                      "bc::d::fh:k:m:o:pqr:svw")) != -1)
     {
       switch (c)
         {
         case 's':
-          if (mode == 'b')
-            {
-              opt_s = TRUE;
-              break;
-            }
-          /*NOBREAK*/
-        case 'a':
+          /* -s after -b selects 'strip on bind' mode.
+             -s without -b selects the 'strip in a executable' mode */
+          if (mode == 'b')
+          {
+            opt_s = TRUE;
+            break;
+          }
         case 'b':
         case 'e':
-#if LIST_OPT
-        case 'L':
-#endif
-        case 'i':
-        case 'u':
-        case 'x':
           if (mode != 0)
             error ("multiple commands specified");
@@ -479 +357 @@
           opt_c = (optarg != NULL ? optarg : "");
           break;
-        case 'C':
-          old_heap = TRUE;
-          break;
         case 'd':
           if (opt_d != NULL)
@@ -487 +362 @@
           opt_d = (optarg != NULL ? optarg : "");
           break;
-        case 'E':
-          if (emx_dll != NULL)
-            error ("multiple -E options");
-          emx_dll = optarg;
-          break;
         case 'f':
           opt_f = TRUE;
@@ -567 +437 @@
     opt_c = "core";
 
+  /* Set the default path to the DOS stub */
+  _execname (stub_fname, sizeof (stub_fname));
+  strcpy (_getname (stub_fname), "os2stub.bin");
+
   /* If the -E option is not given and the name is not given by the
      EMXBIND_DLL environment variable, "emx.dll" will be used. */
 
-  if (emx_dll == NULL)
-    emx_dll = getenv ("EMXBIND_DLL");
-  if (emx_dll == NULL)
-    emx_dll = "emx";
-
   /* Parse the rest of the command line, depending on the command
      option. */
 
   switch (mode)
-    {
-    case 'a':
-      file_name (inp_fname, "exe", NULL);
-      emx_options ();
-      break;
-
+  {
     case 'b':
       if (gargc - optind <= 1 || gargv[optind+1][0] == '-')
-        auto_emxl = TRUE;
+        ;
       else if (opt_o != NULL)
         error ("Too many file names specified");
       else
-        file_name (emx_fname, "exe", NULL);
+        file_name (stub_fname, "exe", NULL);
       file_name (inp_fname, NULL, NULL);
       if (opt_d != NULL)
@@ -605 +469 @@
           read_def_file ();
         }
-      if (auto_emxl)
-        {
-          if (stub_fname != NULL)
-            {
-              if (_path (emx_fname, stub_fname) != 0)
-                _strncpy (emx_fname, stub_fname, sizeof (emx_fname));
-              auto_emxl = FALSE;
-            }
-          else
-            {
-              strcpy (emx_fname, "\\emx\\bin\\emxl.exe");
-              if (!my_readable (emx_fname))
-                if (_path (emx_fname, "emxl.exe") != 0)
-                  strcpy (emx_fname, "emxl.exe");
-              auto_emxl = TRUE;
-            }
-        }
       file_name (out_fname, (dll_flag ? "dll" : "exe"),
                  (opt_o != NULL ? opt_o : inp_fname));
       if (_fncmp (inp_fname, out_fname) == 0)
         error ("The input and output files have the same name");
-      emx_options ();
       break;
 
     case 'e':
-    case 'L':
-    case 'i':
     case 's':
       file_name (inp_fname, "exe", NULL);
       break;
-
-    case 'u':
-      file_name (emx_fname, "exe", NULL);
-      file_name (inp_fname, "exe", NULL);
-      break;
-
-    case 'x':
-      file_name (inp_fname, "exe", NULL);
-      file_name (out_fname, NULL, NULL);
-      if (_fncmp (inp_fname, out_fname) == 0)
-        error ("The input and output files have the same name");
-      break;
-    }
+  }
 
   /* Complain if there are any unprocessed arguments left. */
@@ -670 +502 @@
   switch (mode)
     {
-    case 'a':
-    case 'e':
-    case 's':
-      my_open (&inp_file, inp_fname, open_read_write);
-      break;
     case 'b':
       my_open (&inp_file, inp_fname, open_read);
-      my_open (&emx_file, emx_fname, open_read);
+      my_open (&stub_file, stub_fname, open_read);
       if (opt_c != NULL)
         my_open (&core_file, opt_c, open_read);
@@ -684 +511 @@
       my_open (&out_file, out_fname, create_write);
       break;
-    case 'L':
-    case 'i':
-      my_open (&inp_file, inp_fname, open_read);
-      break;
-    case 'u':
+    case 'e':
+    case 's':
       my_open (&inp_file, inp_fname, open_read_write);
-      my_open (&emx_file, emx_fname, open_read);
-      break;
-    case 'x':
-      my_open (&inp_file, inp_fname, open_read);
-      my_open (&out_file, out_fname, create_write);
       break;
     }
@@ -706 +525 @@
   my_close (&out_file);
   my_close (&inp_file);
-  my_close (&emx_file);
+  my_close (&stub_file);
   my_close (&core_file);
   my_close (&res_file);
@@ -732 +551 @@
      path name of emxl.exe. */
 
-  if (verbosity >= 2 && auto_emxl)
-    printf ("Loader program for DOS: %s\n", emx_fname);
+  if (verbosity >= 2)
+    printf ("Loader program for DOS: %s\n", stub_fname);
 
   /* Open the files. */

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

@@ -31 +31 @@
 /* By default, don't implement the -L option (for listing the headers
    of an EXE file). */
-
-#if !defined (LIST_OPT)
-#define LIST_OPT FALSE
-#endif
 
 /* This is the version number. */
@@ -173 +169 @@
 EXTERN int verbosity INIT (1);
 
-/* The name of an emx.dll replacement (set by the -E option) or NULL
-   (for emx.dll). */
-
-EXTERN char *emx_dll INIT (NULL);
-
 /* The OS/2 heap size, in bytes.  The default value is 32 MB.  The
    heap size can be changed with the -h option. */
@@ -223 +214 @@
 EXTERN int opt_w INIT (FALSE);
 
-/* If this flag is set, create an `empty' heap object and let emx.dll
-   load the heap pages at run-time (that's what previous versions of
-   emxbind did for historical reasons; now that's used only for
-   creating EXE files for testing emx.dll or for saving memory if
-   MEMMAN=COMMIT is in effect).  Otherwise, create a heap object which
-   contains the data pages of the core dump file.  Of course, all this
-   applies only if the -c option is given.  This flag is set by the -C
-   option. */
-
-EXTERN int old_heap INIT (FALSE);
-
 /* The module name. */
 
@@ -278 +258 @@
 EXTERN struct file out_file INIT ({FALSE});
 
-/* File structure for emxl.exe or emx.exe.  Note that the `ok' field
+/* File structure for the DOS stub file.  Note that the `ok' field
    is initialized to FALSE to avoid closing an unopened file. */
 
-EXTERN struct file emx_file INIT ({FALSE});
+EXTERN struct file stub_file INIT ({FALSE});
 
 /* File structure for the core dump file (-c option).  Note that the
@@ -298 +278 @@
 EXTERN struct a_out_header a_in_h;
 
-/* The DOS and OS/2 emxbind headers, respectively. */
-
-EXTERN struct dos_bind_header dos_bind_h;
-EXTERN struct os2_bind_header os2_bind_h;
-
 /* The fixed part of the LX header. */
 
 EXTERN struct os2_header os2_h;
-
-/* This flag is set by check_bound() to indicate whether the input
-   file is a bound executable or not.  Only the -L option (for listing
-   the headers) can process executables which are not bound. */
-
-EXTERN int is_bound;
 
 /* The location of the a.out header in the source file. */
@@ -439 +408 @@
 EXTERN struct exe2_header out_h2;
 
-/* The emxbind DOS header of emxl.exe or emx.exe. */
-
-EXTERN struct dos_bind_header emx_bind_h;
-
-/* The bytes address of the DOS patch area in the input executable. */
-
-EXTERN long patch_pos;
-
 /* The location of the LX header of the output executable. */
 
@@ -502 +463 @@
 /* exec.c */
 
-void check_bound (void);
-void read_emx (void);
+void read_stub (void);
 void read_a_out_header (void);
 void read_core (void);
@@ -511 +471 @@
 void read_os2_header (void);
 void exe_flags (void);
-void set_dos_bind_header (void);
 void set_options (void);
 void set_exe_header (void);
@@ -522 +481 @@
 void write_header (void);
 void write_nonres (void);
-void write_bind_header (void);
 void copy_a_out (void);
 void fill (long count);
@@ -556 +514 @@
 
 /* list.c */
-
-#if LIST_OPT
-void list (void);
-#endif
 
 /* map.c */

trunk/src/emx/src/emxbind/emxbind.smak

@@ -7 +7 @@
 .TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxbind/*.c)
-.TCF    := -DLIST_OPT=1
 .TLDF   := -lmoddef
 include mkexe.smak

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

@@ -34 +34 @@
 
 
-/* String for relaxed checking of emxl.exe or emx.exe. */
-
-static char *relaxed = "emx ";
-
-/* String for strict checking of emxl.exe or emx.exe, including the
-   version number. */
-
-static char *version = "emx " VERSION;
-
 /* The first DOS EXE header read from emxl.exe or emx.exe. */
 
-static struct exe1_header emx_h1;
+static struct exe1_header stub_h1;
 
 /* The a.out header to be written to the output executable. */
@@ -83 +74 @@
 static long dst_image;
 
-/* The size of the emxl.exe or emx.exe image. */
-
-static long emx_size;
+/* The size of the DOS stub image. */
+
+static long stub_size;
 
 /* The size of the LX EXE header of the output executable. */
@@ -162 +153 @@
 
 
-/* Check the OS/2 emxbind header (patch area).  See also crt0.s. */
-
-static int check_os2_bind_header (void)
-{
-  if (os2_bind_h.text_base != TEXT_BASE
-      || 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;
-  if (memchr (os2_bind_h.options, 0, sizeof (os2_bind_h.options)) == NULL)
-    return FALSE;
-  return TRUE;
-}
-
-
 /* Read EXE header and emxbind DOS header of emx.exe */
 
-void read_emx (void)
-{
-  my_read (&emx_h1, sizeof (emx_h1), &emx_file);
-  if (emx_h1.magic != 0x5a4d)
+void read_stub (void)
+{
+  my_read (&stub_h1, sizeof (stub_h1), &stub_file);
+  if (stub_h1.magic != 0x5a4d)
     error ("invalid <emx>.exe");
-  src_image = (long)emx_h1.hdr_size << 4;
-  emx_size = ((long)emx_h1.pages << 9) - src_image;
-  if (emx_h1.last_page != 0)
-    emx_size += emx_h1.last_page - 512;
-
-  my_seek (&emx_file, src_image);
-  my_read (&emx_bind_h, sizeof (emx_bind_h), &emx_file);
-
-  if (memcmp (emx_bind_h.hdr, relaxed, strlen (relaxed)) != 0
-      || emx_bind_h.bind_flag != 0)
-    error ("invalid <emx>.exe");
-  if (memcmp (emx_bind_h.hdr, version, strlen (version)) != 0)
-    fputs ("emxbind: emx version mismatch (warning)\n", stderr);
-  dos_bind_h = emx_bind_h;
+  src_image = (long)stub_h1.hdr_size << 4;
+  stub_size = ((long)stub_h1.pages << 9) - src_image;
+  if (stub_h1.last_page != 0)
+    stub_size += stub_h1.last_page - 512;
 }
 
@@ -216 +183 @@
   my_seek (&inp_file, A_OUT_OFFSET);
   my_read (buf, sizeof (buf), &inp_file);
-  /*            PUSH              CALL               JMP                CALL */
-  if (buf[0] != 0x68 || buf[5] != 0xe8 || buf[10] != 0xeb || buf[12] != 0xe8)
-    error ("invalid a.out file (startup code)");
   a_in_text = A_OUT_OFFSET;
   a_in_data = a_in_text + round_page (a_in_h.text_size);
@@ -225 +189 @@
   a_in_sym = a_in_dr + a_in_h.drsize;
   data_base = round_segment (TEXT_BASE + a_in_h.text_size);
-  my_seek (&inp_file, a_in_data);
-  my_read (&os2_bind_h, sizeof (os2_bind_h), &inp_file);
-  if (!check_os2_bind_header ())
-    error ("invalid a.out file (startup data)");
   text_off = a_in_pos + a_in_text - TEXT_BASE;
   data_off = a_in_pos + a_in_data - data_base;
@@ -357 +317 @@
 
 
-/* Read the DOS EXE header of the input executable.  Fail if isn't a
-   bound executable file (unless the -L command option is in effect). */
-
-void check_bound (void)
-{
-  my_read (&inp_h1, sizeof (inp_h1), &inp_file);
-  if (inp_h1.magic != 0x5a4d)
-    error ("not an .exe file");
-  patch_pos = (long)inp_h1.hdr_size << 4;
-  my_seek (&inp_file, patch_pos);
-  my_read (&dos_bind_h, sizeof (dos_bind_h), &inp_file);
-  if (memcmp (dos_bind_h.hdr, relaxed, strlen (relaxed)) != 0
-      || dos_bind_h.bind_flag == 0)
-    {
-      is_bound = FALSE;
-      if (mode != 'L')
-        error ("invalid .exe file");
-    }
-  else
-    {
-      is_bound = TRUE;
-      if (mode != 'u' && mode != 'L' &&
-          memcmp (dos_bind_h.hdr, version, strlen (version)) != 0)
-        fputs ("emxbind: emx version mismatch in .exe file (warning)\n",
-               stderr);
-      a_in_pos = COMBINE (dos_bind_h.hdr_loc_lo, dos_bind_h.hdr_loc_hi);
-      my_seek (&inp_file, a_in_pos);
-      my_read (&a_in_h, sizeof (a_in_h), &inp_file);
-      a_out_h = a_in_h;
-      if (a_in_h.magic != A_OUT_MAGIC || a_in_h.entry != TEXT_BASE)
-        error ("invalid .exe file (a.out header)");
-      a_out_h.drsize = 0;
-      a_out_h.trsize = 0;
-      a_in_text = A_OUT_OFFSET;
-      a_in_data = a_in_text + round_page (a_in_h.text_size);
-      a_in_tr = a_in_data + round_page (a_in_h.data_size);
-      a_in_dr = a_in_tr + a_in_h.trsize;
-      a_in_sym = a_in_dr + a_in_h.drsize;
-      data_base = round_segment (TEXT_BASE + a_in_h.text_size);
-      my_seek (&inp_file, a_in_pos + a_in_data);
-      my_read (&os2_bind_h, sizeof (os2_bind_h), &inp_file);
-      if (!check_os2_bind_header ())
-        error ("invalid .exe file (startup data)");
-    }
-}
-
-
-/* Setup the DOS emxbind header, including emx options. */
-
-void set_dos_bind_header (void)
-{
-  dos_bind_h.bind_flag = 0xff;
-  dos_bind_h.hdr_loc_lo = LOWORD (a_out_pos);
-  dos_bind_h.hdr_loc_hi = HIWORD (a_out_pos);
-  set_options ();
-}
-
-
-/* Copy the emx options from options_for_dos and options_for_os2 to
-   dos_bind_h and os2_bind_h, respectively.  Fail if the strings are
-   too long. */
-
-void set_options (void)
-{
-  if (strlen (options_for_dos) > sizeof (dos_bind_h.options) - 1)
-    error ("too many emx options for MS-DOS");
-  memset (dos_bind_h.options, 0, sizeof (dos_bind_h.options));
-  strcpy ((char *)dos_bind_h.options, options_for_dos);
-  if (strlen (options_for_os2) > sizeof (os2_bind_h.options) - 1)
-    error ("too many emx options for OS/2");
-  memset (os2_bind_h.options, 0, sizeof (os2_bind_h.options));
-  strcpy ((char *)os2_bind_h.options, options_for_os2);
-}
-
-
 /* Setup the DOS EXE headers for the destination executable.  Compute
    the location of the LX header. */
@@ -439 +324 @@
   long i;
 
-  i = (emx_h1.reloc_size << 2) + sizeof (out_h1) + sizeof (out_h2);
+  i = (stub_h1.reloc_size << 2) + sizeof (out_h1) + sizeof (out_h2);
 #if 1
   dst_image = (i + 0x0f) & ~0x0f;
@@ -446 +331 @@
 #endif
   fill1 = dst_image - i;
-  out_h1 = emx_h1;
+  out_h1 = stub_h1;
   out_h1.reloc_ptr = sizeof (out_h1) + sizeof (out_h2);
   out_h1.hdr_size = dst_image >> 4;
@@ -452 +337 @@
   memset (out_h2.res1, 0, sizeof (out_h2.res1));
   out_h2.new_lo = out_h2.new_hi = 0;
-  i = os2_hdr_pos = dst_image + emx_size;
+  i = os2_hdr_pos = dst_image + stub_size;
   if (os2_hdr_pos & 0x1ff)
     os2_hdr_pos = (os2_hdr_pos + 0x1ff) & ~0x1ff;
@@ -514 +399 @@
     {
       data_pages = npages (a_in_h.data_size + a_in_h.bss_size);
-      if (!old_heap)
-        {
-          heap_pages = npages (core_h.u_heap_brk - core_h.u_heap_base);
-
-          /* Compute the number of pages between the last data page
-             and the first heap page, for padding the a.out subfile.
-             These pages are not mapped to any object.  Round down! */
-
-          gap_pages = (core_h.u_heap_base - core_h.u_data_end) / 0x1000;
-        }
+      heap_pages = npages (core_h.u_heap_brk - core_h.u_heap_base);
+
+      /* Compute the number of pages between the last data page
+         and the first heap page, for padding the a.out subfile.
+         These pages are not mapped to any object.  Round down! */
+
+      gap_pages = (core_h.u_heap_base - core_h.u_data_end) / 0x1000;
     }
   else
@@ -721 +603 @@
   put_res_obj (obj_stk0.map_first + obj_stk0.map_count);
   header.len = os2_hdr_size;
-  if (opt_c != NULL)
-    {
-      os2_bind_h.data_end = os2_bind_h.data_base + a_in_h.data_size + a_in_h.bss_size;
-      os2_bind_h.bss_base = os2_bind_h.data_end;
-      os2_bind_h.bss_end  = os2_bind_h.bss_base;
-      os2_bind_h.heap_base = core_h.u_heap_base;
-      os2_bind_h.heap_end  = core_h.u_heap_end;
-      os2_bind_h.heap_brk = core_h.u_heap_brk;
-      os2_bind_h.heap_off = a_out_pos + A_OUT_OFFSET
-        + round_page (a_in_h.text_size)
-          + round_segment (a_in_h.data_size + a_in_h.bss_size);
-    }
-  else
-    {
-      os2_bind_h.heap_base = obj_heap.virt_base;
-      os2_bind_h.heap_end  = OBJ_END (obj_heap);
-      os2_bind_h.heap_brk  = 0;
-      os2_bind_h.heap_off  = 0;
-    }
 }
 
@@ -817 +680 @@
   obj_heap.virt_size  = heap_size;
   obj_heap.virt_base  = 0;
-  if (old_heap || opt_c == NULL)
-    obj_heap.attr_flags = 0x2083;     /* readable, writable, big, invalid */
-  else
-    obj_heap.attr_flags = 0x2003;     /* readable, writable, big */
+  obj_heap.attr_flags = 0x2003;       /* readable, writable, big */
   obj_heap.map_first  = X;
   obj_heap.map_count  = X;
@@ -880 +740 @@
 
 
-/* Write the DOS EXE headers, the emxl.exe or emx.exe image, and the
-   OS/2 LX header. */
+/* Write the DOS EXE headers, the stub image, and the OS/2 LX header. */
 
 void write_header (void)
@@ -887 +746 @@
   my_write (&out_h1, sizeof (out_h1), &out_file);
   my_write (&out_h2, sizeof (out_h2), &out_file);
-  my_seek (&emx_file, emx_h1.reloc_ptr);
-  copy (&emx_file, emx_h1.reloc_size * 4);
+  my_seek (&stub_file, stub_h1.reloc_ptr);
+  copy (&stub_file, stub_h1.reloc_size * 4);
   fill (fill1);
-  my_seek (&emx_file, src_image);
-  copy (&emx_file, emx_size);
+  my_seek (&stub_file, src_image);
+  copy (&stub_file, stub_size);
   fill (fill2);
   if (mode != 'u')
@@ -898 +757 @@
       fill (fill3);
     }
-}
-
-
-/* Write the emxbind headers (patch areas). */
-
-void write_bind_header (void)
-{
-  my_seek (&out_file, dst_image);
-  my_write (&dos_bind_h, sizeof (dos_bind_h), &out_file);
-  my_seek (&out_file, a_out_pos + A_OUT_OFFSET
-           + round_page (a_out_h.text_size));
-  my_write (&os2_bind_h, sizeof (os2_bind_h), &out_file);
 }
 

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

@@ -41 +41 @@
 };
 
-
-/* The module number of EMX for importing emx_init and emx_syscall
-   from emx.dll. */
-
-static int mod_emx;
 
 /* This table holds the modules for method (I1).  module_size is the
@@ -585 +580 @@
   byte proc_name[256];
 
-  mod_emx = find_module (emx_dll, NO_ADDR);
-  ref_proc ("_emx_init", OBJ_TEXT, 6, mod_emx, NULL, 1, FIXUP_REL, 0);
-  ref_proc ("_emx_syscall", OBJ_TEXT, 13, mod_emx, NULL, 2, FIXUP_REL, 0);
-  my_seek (&inp_file, data_off + os2_bind_h.os2_dll);
+  /* The very first DWORD in data segment is the __os2_dll set.
+     It contains a list of fixups to be replaced by OS/2 DLL references. */
+  my_seek (&inp_file, data_base + data_off);
+  my_read (&set_len, sizeof (set_len), &inp_file);
+  if (set_len != DATASEG_MAGIC)
+    error ("invalid data segment (does not start with 0x%x)", DATASEG_MAGIC);
+  /* Now read the offset to the __os2_dll set */
+  my_read (&set_len, sizeof (set_len), &inp_file);
+
+  /* Start scanning the set */
+  my_seek (&inp_file, set_len + data_off);
   my_read (&set_len, sizeof (set_len), &inp_file);
   if (set_len == 0xffffffff)
     {
       /* I think this is a bug in GNU ld */
-      my_seek (&inp_file, data_off + os2_bind_h.os2_dll - 4);
+      my_seek (&inp_file, data_off - 4);
       my_read (&set_len, sizeof (set_len), &inp_file);
     }