Changeset 144 for trunk/src/emx/src/emxbind/exec.c

Timestamp:

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

Author:

zap

Message:

Removed EMX.DLL dependency and EMXL.EXE dependency.

File:

• trunk/src/emx/src/emxbind/exec.c (modified) (15 diffs, 1 prop)

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 _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  image. */
+
+static long _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_ (void)
+{
+  my_read (&_file);
+  if (_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 = (_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 = _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 + _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 (&_h1.reloc_ptr);
+  copy (&_h1.reloc_size * 4);
   fill (fill1);
-  my_seek (&emx_file, src_image);
-  copy (&emx_file, emx_size);
+  my_seek (&_file, src_image);
+  copy (&_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);
 }