*** empty log message ***

[gnu-emacs] / src / unexelf.c

diff --git a/src/unexelf.c b/src/unexelf.c
index 804e86b45e0540b0be57dda997419f3a0e3e3ceb..4f832aeb3a02be25bfbeb0f42c5904d933c16717 100644 (file)
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000

    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.


@@ -52,11 +52,6 @@ what you give them.   Help stamp out software-hoarding!  */
  * The value you specify may be rounded down to a suitable boundary
  * as required by the machine you are using.
  *
  * The value you specify may be rounded down to a suitable boundary
  * as required by the machine you are using.
  *

- * Specifying zero for data_start means the boundary between text and data
- * should not be the same as when the program was loaded.
- * If NO_REMAP is defined, the argument data_start is ignored and the
- * segment boundaries are never changed.
- *

  * Bss_start indicates how much of the data segment is to be saved in the
  * a.out file and restored when the program is executed.  It gives the lowest
  * unsaved address, and is rounded up to a page boundary.  The default when 0
  * Bss_start indicates how much of the data segment is to be saved in the
  * a.out file and restored when the program is executed.  It gives the lowest
  * unsaved address, and is rounded up to a page boundary.  The default when 0


@@ -66,9 +61,6 @@ what you give them.   Help stamp out software-hoarding!  */
  *
  * The new file is set up to start at entry_address.
  *
  *
  * The new file is set up to start at entry_address.
  *

- * If you make improvements I'd like to get them too.
- * harpo!utah-cs!thomas, thomas@Utah-20
- *

  */
 
 /* Even more heavily modified by james@bigtex.cactus.org of Dell Computer Co.
  */
 
 /* Even more heavily modified by james@bigtex.cactus.org of Dell Computer Co.


@@ -414,6 +406,7 @@ Filesz      Memsz       Flags       Align
 \f
 #ifndef emacs
 #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
 \f
 #ifndef emacs
 #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)

+#include <string.h>

 #else
 #include <config.h>
 extern void fatal (char *, ...);
 #else
 #include <config.h>
 extern void fatal (char *, ...);


@@ -423,7 +416,6 @@ extern void fatal (char *, ...);
 #include <stdio.h>
 #include <sys/stat.h>
 #include <memory.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <memory.h>

-#include <string.h>

 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>


@@ -436,7 +428,7 @@ extern void fatal (char *, ...);
 #include <sym.h>
 #endif /* __sony_news && _SYSTYPE_SYSV */
 #if __sgi
 #include <sym.h>
 #endif /* __sony_news && _SYSTYPE_SYSV */
 #if __sgi

-#include <sym.h> /* for HDRR declaration */
+#include <syms.h> /* for HDRR declaration */

 #endif /* __sgi */
 
 #if defined (__alpha__) && !defined (__NetBSD__) && !defined (__OpenBSD__)
 #endif /* __sgi */
 
 #if defined (__alpha__) && !defined (__NetBSD__) && !defined (__OpenBSD__)


@@ -478,40 +470,40 @@ typedef struct {
 /*
  * NetBSD does not have normal-looking user-land ELF support.
  */
 /*
  * NetBSD does not have normal-looking user-land ELF support.
  */

-# ifdef __alpha__
+# if defined __alpha__ || defined __sparc_v9__

 #  define ELFSIZE      64
 # else
 #  define ELFSIZE      32
 # endif
 # include <sys/exec_elf.h>
 
 #  define ELFSIZE      64
 # else
 #  define ELFSIZE      32
 # endif
 # include <sys/exec_elf.h>
 

-# define PT_LOAD       Elf_pt_load
-# define SHT_SYMTAB    Elf_sht_symtab
-# define SHT_DYNSYM    Elf_sht_dynsym
-# define SHT_NULL      Elf_sht_null
-# define SHT_NOBITS    Elf_sht_nobits
-# define SHT_REL       Elf_sht_rel
-# define SHT_RELA      Elf_sht_rela
-
-# define SHN_UNDEF     Elf_eshn_undefined
-# define SHN_ABS       Elf_eshn_absolute
-# define SHN_COMMON    Elf_eshn_common
-
-/*
- * The magic of picking the right size types is handled by the ELFSIZE
- * definition above.
- */
-# ifdef __STDC__
-#  define ElfW(type)    Elf_##type
-# else
-#  define ElfW(type)    Elf_/**/type
-# endif
+# ifndef PT_LOAD
+#  define PT_LOAD      Elf_pt_load
+#  if 0                                                /* was in pkgsrc patches for 20.7 */
+#   define SHT_PROGBITS Elf_sht_progbits
+#  endif
+#  define SHT_SYMTAB   Elf_sht_symtab
+#  define SHT_DYNSYM   Elf_sht_dynsym
+#  define SHT_NULL     Elf_sht_null
+#  define SHT_NOBITS   Elf_sht_nobits
+#  define SHT_REL      Elf_sht_rel
+#  define SHT_RELA     Elf_sht_rela
+
+#  define SHN_UNDEF    Elf_eshn_undefined
+#  define SHN_ABS      Elf_eshn_absolute
+#  define SHN_COMMON   Elf_eshn_common
+# endif /* !PT_LOAD */

 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>
 #  define HDRR         struct ecoff_symhdr
 #  define pHDRR                HDRR *
 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>
 #  define HDRR         struct ecoff_symhdr
 #  define pHDRR                HDRR *

-# endif
+# endif /* __alpha__ */
+
+#ifdef __mips__                        /* was in pkgsrc patches for 20.7 */
+# define SHT_MIPS_DEBUG        DT_MIPS_FLAGS
+# define HDRR          struct Elf_Shdr
+#endif /* __mips__ */

 #endif /* __NetBSD__ */
 
 #ifdef __OpenBSD__
 #endif /* __NetBSD__ */
 
 #ifdef __OpenBSD__


@@ -596,6 +588,45 @@ round_up (x, y)
   return x - rem + y;
 }
 
   return x - rem + y;
 }
 

+/* Return the index of the section named NAME.
+   SECTION_NAMES, FILE_NAME and FILE_H give information
+   about the file we are looking in.
+
+   If we don't find the section NAME, that is a fatal error
+   if NOERROR is 0; we return -1 if NOERROR is nonzero.  */
+
+static int
+find_section (name, section_names, file_name, old_file_h, old_section_h, noerror)
+     char *name;
+     char *section_names;
+     char *file_name;
+     ElfW(Ehdr) *old_file_h;
+     ElfW(Shdr) *old_section_h;
+     int noerror;
+{
+  int idx;
+
+  for (idx = 1; idx < old_file_h->e_shnum; idx++)
+    {
+#ifdef DEBUG
+      fprintf (stderr, "Looking for %s - found %s\n", name,
+              section_names + OLD_SECTION_H (idx).sh_name);
+#endif
+      if (!strcmp (section_names + OLD_SECTION_H (idx).sh_name,
+                  name))
+       break;
+    }
+  if (idx == old_file_h->e_shnum)
+    {
+      if (noerror)
+       return -1;
+      else
+       fatal ("Can't find %s in %s.\n", name, file_name);
+    }
+
+  return idx;
+}
+

 /* ****************************************************************
  * unexec
  *
 /* ****************************************************************
  * unexec
  *


@@ -630,8 +661,10 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   ElfW(Off)  new_data2_offset;
   ElfW(Addr) new_data2_addr;
 
   ElfW(Off)  new_data2_offset;
   ElfW(Addr) new_data2_addr;
 

-  int n, nn, old_bss_index, old_data_index, new_data2_index;
-  int old_sbss_index, old_mdebug_index;
+  int n, nn;
+  int old_bss_index, old_sbss_index;
+  int old_data_index, new_data2_index;
+  int old_mdebug_index;

   struct stat stat_buf;
 
   /* Open the old file & map it into the address space. */
   struct stat stat_buf;
 
   /* Open the old file & map it into the address space. */


@@ -663,65 +696,43 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   old_section_names = (char *) old_base
     + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset;
 
   old_section_names = (char *) old_base
     + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset;
 

+  /* Find the mdebug section, if any.  */
+
+  old_mdebug_index = find_section (".mdebug", old_section_names,
+                                  old_name, old_file_h, old_section_h, 1);
+

   /* Find the old .bss section.  Figure out parameters of the new
    * data2 and bss sections.
    */
 
   /* Find the old .bss section.  Figure out parameters of the new
    * data2 and bss sections.
    */
 

-  for (old_bss_index = 1; old_bss_index < (int) old_file_h->e_shnum;
-       old_bss_index++)
-    {
-#ifdef DEBUG
-      fprintf (stderr, "Looking for .bss - found %s\n",
-              old_section_names + OLD_SECTION_H (old_bss_index).sh_name);
-#endif
-      if (!strcmp (old_section_names + OLD_SECTION_H (old_bss_index).sh_name,
-                  ELF_BSS_SECTION_NAME))
-       break;
-    }
-  if (old_bss_index == old_file_h->e_shnum)
-    fatal ("Can't find .bss in %s.\n", old_name, 0);
+  old_bss_index = find_section (".bss", old_section_names,
+                               old_name, old_file_h, old_section_h, 0);

 
 

-  for (old_sbss_index = 1; old_sbss_index < (int) old_file_h->e_shnum;
-       old_sbss_index++)
-    {
-#ifdef DEBUG
-      fprintf (stderr, "Looking for .sbss - found %s\n",
-              old_section_names + OLD_SECTION_H (old_sbss_index).sh_name);
-#endif
-      if (!strcmp (old_section_names + OLD_SECTION_H (old_sbss_index).sh_name,
-                  ".sbss"))
-       break;
-    }
-  if (old_sbss_index == old_file_h->e_shnum)
-    {
+  old_sbss_index = find_section (".sbss", old_section_names,
+                                old_name, old_file_h, old_section_h, 1);
+  if (old_sbss_index != -1)
+    if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)

       old_sbss_index = -1;
       old_sbss_index = -1;

-      old_bss_addr = OLD_SECTION_H(old_bss_index).sh_addr;
-      old_bss_size = OLD_SECTION_H(old_bss_index).sh_size;
-      new_data2_offset = OLD_SECTION_H(old_bss_index).sh_offset;
+
+  if (old_sbss_index == -1)
+    {
+      old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;

       new_data2_index = old_bss_index;
     }
   else
     {
       new_data2_index = old_bss_index;
     }
   else
     {

-      old_bss_addr = OLD_SECTION_H(old_sbss_index).sh_addr;
-      old_bss_size = OLD_SECTION_H(old_bss_index).sh_size
-       + OLD_SECTION_H(old_sbss_index).sh_size;
-      new_data2_offset = OLD_SECTION_H(old_sbss_index).sh_offset;
+      old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+       + OLD_SECTION_H (old_sbss_index).sh_size;

       new_data2_index = old_sbss_index;
     }
 
       new_data2_index = old_sbss_index;
     }
 

-  for (old_mdebug_index = 1; old_mdebug_index < (int) old_file_h->e_shnum;
-       old_mdebug_index++)
-    {
-#ifdef DEBUG
-      fprintf (stderr, "Looking for .mdebug - found %s\n",
-              old_section_names + OLD_SECTION_H (old_mdebug_index).sh_name);
-#endif
-      if (!strcmp (old_section_names + OLD_SECTION_H (old_mdebug_index).sh_name,
-                  ".mdebug"))
-       break;
-    }
-    if (old_mdebug_index == old_file_h->e_shnum)
-       old_mdebug_index = 0;
+  /* Find the old .data section.  Figure out parameters of
+     the new data2 and bss sections.  */
+
+  old_data_index = find_section (".data", old_section_names,
+                                old_name, old_file_h, old_section_h, 0);

 
 #if defined (emacs) || !defined (DEBUG)
   new_bss_addr = (ElfW(Addr)) sbrk (0);
 
 #if defined (emacs) || !defined (DEBUG)
   new_bss_addr = (ElfW(Addr)) sbrk (0);


@@ -730,6 +741,8 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
 #endif
   new_data2_addr = old_bss_addr;
   new_data2_size = new_bss_addr - old_bss_addr;
 #endif
   new_data2_addr = old_bss_addr;
   new_data2_size = new_bss_addr - old_bss_addr;

+  new_data2_offset  = OLD_SECTION_H (old_data_index).sh_offset +
+    (new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr);

 
 #ifdef DEBUG
   fprintf (stderr, "old_bss_index %d\n", old_bss_index);
 
 #ifdef DEBUG
   fprintf (stderr, "old_bss_index %d\n", old_bss_index);


@@ -814,13 +827,13 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
       if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
        alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
 
       if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
        alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
 

-#ifdef __mips
+#ifdef __sgi

          /* According to r02kar@x4u2.desy.de (Karsten Kuenne)
             and oliva@gnu.org (Alexandre Oliva), on IRIX 5.2, we
             always get "Program segment above .bss" when dumping
             when the executable doesn't have an sbss section.  */
       if (old_sbss_index != -1)
          /* According to r02kar@x4u2.desy.de (Karsten Kuenne)
             and oliva@gnu.org (Alexandre Oliva), on IRIX 5.2, we
             always get "Program segment above .bss" when dumping
             when the executable doesn't have an sbss section.  */
       if (old_sbss_index != -1)

-#endif /* __mips */
+#endif /* __sgi */

       if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz
          > (old_sbss_index == -1
             ? old_bss_addr
       if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz
          > (old_sbss_index == -1
             ? old_bss_addr


@@ -934,15 +947,9 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
              >= OLD_SECTION_H (old_bss_index-1).sh_offset)
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #else
              >= OLD_SECTION_H (old_bss_index-1).sh_offset)
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #else

-         /* The idea of this is that the bss section's sh_offset
-            may need rounding up to compare with new_data2_offset.
-            So we cannot simply compare the sh_offset.
-            However, another small section could exist just before
-            the bss section, and we need to know that is before.  */
-         if (round_up (NEW_SECTION_H (nn).sh_offset
-                       + NEW_SECTION_H (nn).sh_size,
+         if (round_up (NEW_SECTION_H (nn).sh_offset,

                        OLD_SECTION_H (old_bss_index).sh_addralign)
                        OLD_SECTION_H (old_bss_index).sh_addralign)

-             > new_data2_offset)
+             >= new_data2_offset)

            NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #endif
          /* Any section that was originally placed after the section
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #endif
          /* Any section that was originally placed after the section


@@ -962,6 +969,15 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
       if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
          && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
        PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
       if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
          && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
        PATCH_INDEX (NEW_SECTION_H (nn).sh_info);

+      
+      if (old_sbss_index != -1)
+       if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
+         {
+           NEW_SECTION_H (nn).sh_offset = 
+             round_up (NEW_SECTION_H (nn).sh_offset,
+                       NEW_SECTION_H (nn).sh_addralign);
+           NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
+         }

 
       /* Now, start to copy the content of sections.  */
       if (NEW_SECTION_H (nn).sh_type == SHT_NULL
 
       /* Now, start to copy the content of sections.  */
       if (NEW_SECTION_H (nn).sh_type == SHT_NULL


@@ -978,12 +994,12 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
                      ".lit4")
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
                      ".lit8")
                      ".lit4")
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
                      ".lit8")

-         || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
-                     ".got")

          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
                      ".sdata1")
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
                      ".sdata1")
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),

-                     ".data1"))
+                     ".data1")
+         || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name,
+                     ".sbss"))

        src = (caddr_t) OLD_SECTION_H (n).sh_addr;
       else
        src = old_base + OLD_SECTION_H (n).sh_offset;
        src = (caddr_t) OLD_SECTION_H (n).sh_addr;
       else
        src = old_base + OLD_SECTION_H (n).sh_offset;


@@ -1013,7 +1029,8 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
 #endif /* __alpha__ */
 
 #if defined (__sony_news) && defined (_SYSTYPE_SYSV)
 #endif /* __alpha__ */
 
 #if defined (__sony_news) && defined (_SYSTYPE_SYSV)

-      if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG && old_mdebug_index) 
+      if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
+         && old_mdebug_index != -1) 

         {
          int diff = NEW_SECTION_H(nn).sh_offset 
                - OLD_SECTION_H(old_mdebug_index).sh_offset;
         {
          int diff = NEW_SECTION_H(nn).sh_offset 
                - OLD_SECTION_H(old_mdebug_index).sh_offset;


@@ -1155,8 +1172,6 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
                        ".lit4")
            || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                        ".lit8")
                        ".lit4")
            || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                        ".lit8")

-           || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-                       ".got")

            || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                        ".sdata1")
            || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
            || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                        ".sdata1")
            || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),