i386: Add tests for -malign-branch-boundary and -malign-branch

[deliverable/binutils-gdb.git] / bfd / pef.c

diff --git a/bfd/pef.c b/bfd/pef.c
index b839095146d157529eaf9eba5b39509074dd054b..fccb9b6ac38aba7fa2c820e280887c20945d35b0 100644 (file)
--- a/bfd/pef.c
+++ b/bfd/pef.c
@@ -1,6 +1,5 @@
 /* PEF support for BFD.
 /* PEF support for BFD.

-   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -19,6 +18,10 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 

+/* PEF (Preferred Executable Format) is the binary file format for late
+   classic Mac OS versions (before Darwin).  It is supported by both m68k
+   and PowerPc.  It is also called CFM (Code Fragment Manager).  */
+

 #include "sysdep.h"
 #include "safe-ctype.h"
 #include "pef.h"
 #include "sysdep.h"
 #include "safe-ctype.h"
 #include "pef.h"


@@ -31,34 +34,43 @@
 #define BFD_IO_FUNCS 0
 #endif
 
 #define BFD_IO_FUNCS 0
 #endif
 

-#define bfd_pef_close_and_cleanup                   _bfd_generic_close_and_cleanup
-#define bfd_pef_bfd_free_cached_info                _bfd_generic_bfd_free_cached_info
-#define bfd_pef_new_section_hook                    _bfd_generic_new_section_hook
-#define bfd_pef_bfd_is_local_label_name             bfd_generic_is_local_label_name
-#define bfd_pef_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define bfd_pef_get_lineno                          _bfd_nosymbols_get_lineno
-#define bfd_pef_find_nearest_line                   _bfd_nosymbols_find_nearest_line
-#define bfd_pef_find_inliner_info                   _bfd_nosymbols_find_inliner_info
-#define bfd_pef_bfd_make_debug_symbol               _bfd_nosymbols_bfd_make_debug_symbol
-#define bfd_pef_read_minisymbols                    _bfd_generic_read_minisymbols
-#define bfd_pef_minisymbol_to_symbol                _bfd_generic_minisymbol_to_symbol
-#define bfd_pef_set_arch_mach                       _bfd_generic_set_arch_mach
-#define bfd_pef_get_section_contents                _bfd_generic_get_section_contents
-#define bfd_pef_set_section_contents                _bfd_generic_set_section_contents
+#define bfd_pef_close_and_cleanup                  _bfd_generic_close_and_cleanup
+#define bfd_pef_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
+#define bfd_pef_new_section_hook                   _bfd_generic_new_section_hook
+#define bfd_pef_bfd_is_local_label_name                    bfd_generic_is_local_label_name
+#define bfd_pef_bfd_is_target_special_symbol        _bfd_bool_bfd_asymbol_false
+#define bfd_pef_get_lineno                         _bfd_nosymbols_get_lineno
+#define bfd_pef_find_nearest_line                  _bfd_nosymbols_find_nearest_line
+#define bfd_pef_find_line                          _bfd_nosymbols_find_line
+#define bfd_pef_find_inliner_info                  _bfd_nosymbols_find_inliner_info
+#define bfd_pef_get_symbol_version_string          _bfd_nosymbols_get_symbol_version_string
+#define bfd_pef_bfd_make_debug_symbol              _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_pef_read_minisymbols                   _bfd_generic_read_minisymbols
+#define bfd_pef_minisymbol_to_symbol               _bfd_generic_minisymbol_to_symbol
+#define bfd_pef_set_arch_mach                      _bfd_generic_set_arch_mach
+#define bfd_pef_get_section_contents               _bfd_generic_get_section_contents
+#define bfd_pef_set_section_contents               _bfd_generic_set_section_contents

 #define bfd_pef_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
 #define bfd_pef_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents

-#define bfd_pef_bfd_relax_section                   bfd_generic_relax_section
-#define bfd_pef_bfd_gc_sections                     bfd_generic_gc_sections
-#define bfd_pef_bfd_merge_sections                  bfd_generic_merge_sections
+#define bfd_pef_bfd_relax_section                  bfd_generic_relax_section
+#define bfd_pef_bfd_gc_sections                            bfd_generic_gc_sections
+#define bfd_pef_bfd_lookup_section_flags           bfd_generic_lookup_section_flags
+#define bfd_pef_bfd_merge_sections                 bfd_generic_merge_sections

 #define bfd_pef_bfd_is_group_section               bfd_generic_is_group_section
 #define bfd_pef_bfd_is_group_section               bfd_generic_is_group_section

-#define bfd_pef_bfd_discard_group                   bfd_generic_discard_group
-#define bfd_pef_section_already_linked             _bfd_generic_section_already_linked
-#define bfd_pef_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
-#define bfd_pef_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
-#define bfd_pef_bfd_link_add_symbols                _bfd_generic_link_add_symbols
-#define bfd_pef_bfd_link_just_syms                  _bfd_generic_link_just_syms
-#define bfd_pef_bfd_final_link                      _bfd_generic_final_link
-#define bfd_pef_bfd_link_split_section              _bfd_generic_link_split_section
-#define bfd_pef_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
+#define bfd_pef_bfd_group_name                     bfd_generic_group_name
+#define bfd_pef_bfd_discard_group                  bfd_generic_discard_group
+#define bfd_pef_section_already_linked             _bfd_generic_section_already_linked
+#define bfd_pef_bfd_define_common_symbol           bfd_generic_define_common_symbol
+#define bfd_pef_bfd_link_hide_symbol               _bfd_generic_link_hide_symbol
+#define bfd_pef_bfd_define_start_stop              bfd_generic_define_start_stop
+#define bfd_pef_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define bfd_pef_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define bfd_pef_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define bfd_pef_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define bfd_pef_bfd_final_link                     _bfd_generic_final_link
+#define bfd_pef_bfd_link_split_section             _bfd_generic_link_split_section
+#define bfd_pef_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define bfd_pef_bfd_link_check_relocs              _bfd_generic_link_check_relocs

 
 static int
 bfd_pef_parse_traceback_table (bfd *abfd,
 
 static int
 bfd_pef_parse_traceback_table (bfd *abfd,


@@ -209,16 +221,18 @@ bfd_pef_print_symbol (bfd *abfd,
       fprintf (file, " %-5s %s", symbol->section->name, symbol->name);
       if (CONST_STRNEQ (symbol->name, "__traceback_"))
        {
       fprintf (file, " %-5s %s", symbol->section->name, symbol->name);
       if (CONST_STRNEQ (symbol->name, "__traceback_"))
        {

-         unsigned char *buf = alloca (symbol->udata.i);
+         unsigned char *buf;

          size_t offset = symbol->value + 4;
          size_t len = symbol->udata.i;
          size_t offset = symbol->value + 4;
          size_t len = symbol->udata.i;

-         int ret;

 
 

-         bfd_get_section_contents (abfd, symbol->section, buf, offset, len);
-         ret = bfd_pef_parse_traceback_table (abfd, symbol->section, buf,
-                                              len, 0, NULL, file);
-         if (ret < 0)
+         buf = bfd_malloc (len);
+         if (buf == NULL
+             || !bfd_get_section_contents (abfd, symbol->section, buf,
+                                           offset, len)
+             || bfd_pef_parse_traceback_table (abfd, symbol->section, buf,
+                                               len, 0, NULL, file) < 0)

            fprintf (file, " [ERROR]");
            fprintf (file, " [ERROR]");

+         free (buf);

        }
     }
 }
        }
     }
 }


@@ -360,7 +374,7 @@ bfd_pef_parse_imported_symbol (bfd *abfd ATTRIBUTE_UNUSED,
   BFD_ASSERT (len == 4);
 
   value = bfd_getb32 (buf);
   BFD_ASSERT (len == 4);
 
   value = bfd_getb32 (buf);

-  symbol->class = value >> 24;
+  symbol->symbol_class = value >> 24;

   symbol->name = value & 0x00ffffff;
 
   return 0;
   symbol->name = value & 0x00ffffff;
 
   return 0;


@@ -479,7 +493,7 @@ bfd_pef_scan_start_address (bfd *abfd)
     goto end;
 
   for (section = abfd->sections; section != NULL; section = section->next)
     goto end;
 
   for (section = abfd->sections; section != NULL; section = section->next)

-    if ((section->index + 1) == header.main_section)
+    if ((long) (section->index + 1) == header.main_section)

       break;
 
   if (section == NULL)
       break;
 
   if (section == NULL)


@@ -499,10 +513,9 @@ bfd_pef_scan_start_address (bfd *abfd)
 }
 
 int
 }
 
 int

-bfd_pef_scan (abfd, header, mdata)
-     bfd *abfd;
-     bfd_pef_header *header;
-     bfd_pef_data_struct *mdata;
+bfd_pef_scan (bfd *abfd,
+             bfd_pef_header *header,
+             bfd_pef_data_struct *mdata)

 {
   unsigned int i;
   enum bfd_architecture cputype;
 {
   unsigned int i;
   enum bfd_architecture cputype;


@@ -513,8 +526,8 @@ bfd_pef_scan (abfd, header, mdata)
   bfd_pef_convert_architecture (header->architecture, &cputype, &cpusubtype);
   if (cputype == bfd_arch_unknown)
     {
   bfd_pef_convert_architecture (header->architecture, &cputype, &cpusubtype);
   if (cputype == bfd_arch_unknown)
     {

-      fprintf (stderr, "bfd_pef_scan: unknown architecture 0x%lx\n",
-              header->architecture);
+      _bfd_error_handler (_("bfd_pef_scan: unknown architecture 0x%lx"),
+                         header->architecture);

       return -1;
     }
   bfd_set_arch_mach (abfd, cputype, cpusubtype);
       return -1;
     }
   bfd_set_arch_mach (abfd, cputype, cpusubtype);


@@ -576,34 +589,28 @@ bfd_pef_read_header (bfd *abfd, bfd_pef_header *header)
 static const bfd_target *
 bfd_pef_object_p (bfd *abfd)
 {
 static const bfd_target *
 bfd_pef_object_p (bfd *abfd)
 {

-  struct bfd_preserve preserve;

   bfd_pef_header header;
   bfd_pef_header header;

+  bfd_pef_data_struct *mdata;

 
 

-  preserve.marker = NULL;

   if (bfd_pef_read_header (abfd, &header) != 0)
     goto wrong;
 
   if (header.tag1 != BFD_PEF_TAG1 || header.tag2 != BFD_PEF_TAG2)
     goto wrong;
 
   if (bfd_pef_read_header (abfd, &header) != 0)
     goto wrong;
 
   if (header.tag1 != BFD_PEF_TAG1 || header.tag2 != BFD_PEF_TAG2)
     goto wrong;
 

-  preserve.marker = bfd_zalloc (abfd, sizeof (bfd_pef_data_struct));
-  if (preserve.marker == NULL
-      || !bfd_preserve_save (abfd, &preserve))
+  mdata = (bfd_pef_data_struct *) bfd_zalloc (abfd, sizeof (*mdata));
+  if (mdata == NULL)

     goto fail;
 
     goto fail;
 

-  if (bfd_pef_scan (abfd, &header,
-                   (bfd_pef_data_struct *) preserve.marker) != 0)
+  if (bfd_pef_scan (abfd, &header, mdata))

     goto wrong;
 
     goto wrong;
 

-  bfd_preserve_finish (abfd, &preserve);

   return abfd->xvec;
 
  wrong:
   bfd_set_error (bfd_error_wrong_format);
 
  fail:
   return abfd->xvec;
 
  wrong:
   bfd_set_error (bfd_error_wrong_format);
 
  fail:

-  if (preserve.marker != NULL)
-    bfd_preserve_restore (abfd, &preserve);

   return NULL;
 }
 
   return NULL;
 }
 


@@ -727,14 +734,11 @@ bfd_pef_parse_function_stubs (bfd *abfd,
                              asymbol **csym)
 {
   const char *const sprefix = "__stub_";
                              asymbol **csym)
 {
   const char *const sprefix = "__stub_";

-

   size_t codepos = 0;
   unsigned long count = 0;
   size_t codepos = 0;
   unsigned long count = 0;

-

   bfd_pef_loader_header header;
   bfd_pef_imported_library *libraries = NULL;
   bfd_pef_imported_symbol *imports = NULL;
   bfd_pef_loader_header header;
   bfd_pef_imported_library *libraries = NULL;
   bfd_pef_imported_symbol *imports = NULL;

-

   unsigned long i;
   int ret;
 
   unsigned long i;
   int ret;
 


@@ -780,8 +784,7 @@ bfd_pef_parse_function_stubs (bfd *abfd,
       asymbol sym;
       const char *symname;
       char *name;
       asymbol sym;
       const char *symname;
       char *name;

-      unsigned long index;
-      int ret;
+      unsigned long sym_index;

 
       if (csym && (csym[count] == NULL))
        break;
 
       if (csym && (csym[count] == NULL))
        break;


@@ -799,14 +802,14 @@ bfd_pef_parse_function_stubs (bfd *abfd,
       if ((codepos + 4) > codelen)
        break;
 
       if ((codepos + 4) > codelen)
        break;
 

-      ret = bfd_pef_parse_function_stub (abfd, codebuf + codepos, 24, &index);
+      ret = bfd_pef_parse_function_stub (abfd, codebuf + codepos, 24, &sym_index);

       if (ret < 0)
        {
          codepos += 24;
          continue;
        }
 
       if (ret < 0)
        {
          codepos += 24;
          continue;
        }
 

-      if (index >= header.total_imported_symbol_count)
+      if (sym_index >= header.total_imported_symbol_count)

        {
          codepos += 24;
          continue;
        {
          codepos += 24;
          continue;


@@ -816,12 +819,12 @@ bfd_pef_parse_function_stubs (bfd *abfd,
        size_t max, namelen;
        const char *s;
 
        size_t max, namelen;
        const char *s;
 

-       if (loaderlen < (header.loader_strings_offset + imports[index].name))
+       if (loaderlen < (header.loader_strings_offset + imports[sym_index].name))

          goto error;
 
          goto error;
 

-       max = loaderlen - (header.loader_strings_offset + imports[index].name);
+       max = loaderlen - (header.loader_strings_offset + imports[sym_index].name);

        symname = (char *) loaderbuf;
        symname = (char *) loaderbuf;

-       symname += header.loader_strings_offset + imports[index].name;
+       symname += header.loader_strings_offset + imports[sym_index].name;

        namelen = 0;
        for (s = symname; s < (symname + max); s++)
          {
        namelen = 0;
        for (s = symname; s < (symname + max); s++)
          {


@@ -1016,6 +1019,7 @@ const bfd_target pef_vec =
   0,                           /* Symbol_leading_char.  */
   ' ',                         /* AR_pad_char.  */
   16,                          /* AR_max_namelen.  */
   0,                           /* Symbol_leading_char.  */
   ' ',                         /* AR_pad_char.  */
   16,                          /* AR_max_namelen.  */

+  0,                           /* match priority.  */

   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* Data.  */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* Data.  */


@@ -1029,16 +1033,16 @@ const bfd_target pef_vec =
     _bfd_dummy_target,
   },
   {                            /* bfd_set_format.  */
     _bfd_dummy_target,
   },
   {                            /* bfd_set_format.  */

-    bfd_false,
+    _bfd_bool_bfd_false_error,

     bfd_pef_mkobject,
     bfd_pef_mkobject,

-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,

   },
   {                            /* bfd_write_contents.  */
   },
   {                            /* bfd_write_contents.  */

-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_true,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,

   },
 
   BFD_JUMP_TABLE_GENERIC (bfd_pef),
   },
 
   BFD_JUMP_TABLE_GENERIC (bfd_pef),


@@ -1056,22 +1060,22 @@ const bfd_target pef_vec =
   NULL
 };
 
   NULL
 };
 

-#define bfd_pef_xlib_close_and_cleanup              _bfd_generic_close_and_cleanup
-#define bfd_pef_xlib_bfd_free_cached_info           _bfd_generic_bfd_free_cached_info
-#define bfd_pef_xlib_new_section_hook               _bfd_generic_new_section_hook
-#define bfd_pef_xlib_get_section_contents           _bfd_generic_get_section_contents
-#define bfd_pef_xlib_set_section_contents           _bfd_generic_set_section_contents
+#define bfd_pef_xlib_close_and_cleanup             _bfd_generic_close_and_cleanup
+#define bfd_pef_xlib_bfd_free_cached_info          _bfd_generic_bfd_free_cached_info
+#define bfd_pef_xlib_new_section_hook              _bfd_generic_new_section_hook
+#define bfd_pef_xlib_get_section_contents          _bfd_generic_get_section_contents
+#define bfd_pef_xlib_set_section_contents          _bfd_generic_set_section_contents

 #define bfd_pef_xlib_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
 #define bfd_pef_xlib_set_section_contents_in_window _bfd_generic_set_section_contents_in_window
 
 static int
 bfd_pef_xlib_read_header (bfd *abfd, bfd_pef_xlib_header *header)
 {
 #define bfd_pef_xlib_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
 #define bfd_pef_xlib_set_section_contents_in_window _bfd_generic_set_section_contents_in_window
 
 static int
 bfd_pef_xlib_read_header (bfd *abfd, bfd_pef_xlib_header *header)
 {

-  unsigned char buf[76];
+  unsigned char buf[80];

 
   bfd_seek (abfd, 0, SEEK_SET);
 
 
   bfd_seek (abfd, 0, SEEK_SET);
 

-  if (bfd_bread ((void *) buf, 76, abfd) != 76)
+  if (bfd_bread ((void *) buf, sizeof buf, abfd) != sizeof buf)

     return -1;
 
   header->tag1 = bfd_getb32 (buf);
     return -1;
 
   header->tag1 = bfd_getb32 (buf);


@@ -1120,7 +1124,6 @@ bfd_pef_xlib_scan (bfd *abfd, bfd_pef_xlib_header *header)
 static const bfd_target *
 bfd_pef_xlib_object_p (bfd *abfd)
 {
 static const bfd_target *
 bfd_pef_xlib_object_p (bfd *abfd)
 {

-  struct bfd_preserve preserve;

   bfd_pef_xlib_header header;
 
   if (bfd_pef_xlib_read_header (abfd, &header) != 0)
   bfd_pef_xlib_header header;
 
   if (bfd_pef_xlib_read_header (abfd, &header) != 0)


@@ -1137,20 +1140,12 @@ bfd_pef_xlib_object_p (bfd *abfd)
       return NULL;
     }
 
       return NULL;
     }
 

-  if (! bfd_preserve_save (abfd, &preserve))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-

   if (bfd_pef_xlib_scan (abfd, &header) != 0)
     {
   if (bfd_pef_xlib_scan (abfd, &header) != 0)
     {

-      bfd_preserve_restore (abfd, &preserve);

       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
 
       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
 

-  bfd_preserve_finish (abfd, &preserve);

   return abfd->xvec;
 }
 
   return abfd->xvec;
 }
 


@@ -1168,6 +1163,7 @@ const bfd_target pef_xlib_vec =
   0,                           /* Symbol_leading_char.  */
   ' ',                         /* AR_pad_char.  */
   16,                          /* AR_max_namelen.  */
   0,                           /* Symbol_leading_char.  */
   ' ',                         /* AR_pad_char.  */
   16,                          /* AR_max_namelen.  */

+  0,                           /* match priority.  */

   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* Data.  */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* Data.  */


@@ -1181,16 +1177,16 @@ const bfd_target pef_xlib_vec =
     _bfd_dummy_target,
   },
   {                            /* bfd_set_format.  */
     _bfd_dummy_target,
   },
   {                            /* bfd_set_format.  */

-    bfd_false,
+    _bfd_bool_bfd_false_error,

     bfd_pef_mkobject,
     bfd_pef_mkobject,

-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,

   },
   {                            /* bfd_write_contents.  */
   },
   {                            /* bfd_write_contents.  */

-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_true,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,

   },
 
   BFD_JUMP_TABLE_GENERIC (bfd_pef_xlib),
   },
 
   BFD_JUMP_TABLE_GENERIC (bfd_pef_xlib),