Changeset 609 for branches/GNU/src/binutils/bfd/versados.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/versados.c (modified) (35 diffs, 1 prop)

branches/GNU/src/binutils/bfd/versados.c

@@ -1 +1 @@
 /* BFD back-end for VERSAdos-E objects.
-   Copyright 1995, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
@@ -44 +45 @@
 #include "libiberty.h"
 
-static boolean versados_mkobject PARAMS ((bfd *));
-static boolean versados_scan PARAMS ((bfd *));
+static bfd_boolean versados_mkobject PARAMS ((bfd *));
+static bfd_boolean versados_scan PARAMS ((bfd *));
 static const bfd_target *versados_object_p PARAMS ((bfd *));
+static asymbol *versados_new_symbol
+  PARAMS ((bfd *, int, const char *, bfd_vma, asection *));
+static char *new_symbol_string PARAMS ((bfd *, const char *));
+static const bfd_target *versados_object_p PARAMS ((bfd *));
+static bfd_boolean versados_pass_2 PARAMS ((bfd *));
+static bfd_boolean versados_get_section_contents
+  PARAMS ((bfd *, asection *, void *, file_ptr, bfd_size_type));
+static bfd_boolean versados_set_section_contents
+  PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
+static int versados_sizeof_headers PARAMS ((bfd *, bfd_boolean));
+static long int versados_get_symtab_upper_bound PARAMS ((bfd *));
+static long int versados_get_symtab PARAMS ((bfd *, asymbol **));
+static void versados_get_symbol_info
+  PARAMS ((bfd *, asymbol *, symbol_info *));
+static void versados_print_symbol
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+static long versados_get_reloc_upper_bound
+  PARAMS ((bfd *, sec_ptr));
+static long versados_canonicalize_reloc
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
 
 #define VHEADER '1'
@@ -142 +163 @@
   };
 
+static int get_record PARAMS ((bfd *, union ext_any *));
+static int get_4 PARAMS ((unsigned char **));
+static void get_10 PARAMS ((unsigned char **, char *));
+static void process_esd PARAMS ((bfd *, struct ext_esd *, int));
+static int get_offset PARAMS ((int, unsigned char *));
+static void process_otr PARAMS ((bfd *, struct ext_otr *, int));
+
 /* Initialize by filling in the hex conversion array.  */
 
 /* Set up the tdata information.  */
 
-static boolean
+static bfd_boolean
 versados_mkobject (abfd)
      bfd *abfd;
@@ -152 +180 @@
   if (abfd->tdata.versados_data == NULL)
     {
-      tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
+      bfd_size_type amt = sizeof (tdata_type);
+      tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, amt);
       if (tdata == NULL)
-        return false;
+        return FALSE;
       abfd->tdata.versados_data = tdata;
       tdata->symbols = NULL;
@@ -161 +190 @@
 
   bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
-  return true;
+  return TRUE;
 }
 
@@ -190 +219 @@
      union ext_any *ptr;
 {
-  bfd_read (&ptr->size, 1, 1, abfd);
-  if (bfd_read ((char *) ptr + 1, 1, ptr->size, abfd) != ptr->size)
+  if (bfd_bread (&ptr->size, (bfd_size_type) 1, abfd) != 1
+      || (bfd_bread ((char *) ptr + 1, (bfd_size_type) ptr->size, abfd)
+          != ptr->size))
     return 0;
   return 1;
 }
 
-int
+static int
 get_4 (pp)
      unsigned char **pp;
@@ -205 +235 @@
 }
 
-void
+static void
 get_10 (pp, name)
      unsigned char **pp;
@@ -225 +255 @@
 new_symbol_string (abfd, name)
      bfd *abfd;
-     char *name;
+     const char *name;
 {
   char *n = VDATA (abfd)->strings;
@@ -276 +306 @@
                 asymbol *s;
                 char *n = new_symbol_string (abfd, name);
-                s = versados_new_symbol (abfd, snum, n, 0,
-                                         &bfd_und_section, scn);
+                s = versados_new_symbol (abfd, snum, n, (bfd_vma) 0,
+                                         bfd_und_section_ptr);
                 esidx = VDATA (abfd)->es_done++;
                 RDATA (abfd, esidx - ES_BASE) = s;
@@ -300 +330 @@
           {
             int snum = VDATA (abfd)->def_idx++;
-            long val;
+            bfd_vma val;
             get_10 (&ptr, name);
             val = get_4 (&ptr);
@@ -312 +342 @@
                 asymbol *s;
                 char *n = new_symbol_string (abfd, name);
-                s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n, val, sec, scn);
+                s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n,
+                                         val, sec);
                 s->flags |= BSF_GLOBAL;
               }
@@ -328 +359 @@
 reloc_howto_type versados_howto_table[] =
 {
-  HOWTO (R_RELWORD, 0, 1, 16, false,
+  HOWTO (R_RELWORD, 0, 1, 16, FALSE,
          0, complain_overflow_dont, 0,
-         "+v16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG, 0, 2, 32, false,
+         "+v16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG, 0, 2, 32, FALSE,
          0, complain_overflow_dont, 0,
-         "+v32", true, 0xffffffff, 0xffffffff, false),
-
-  HOWTO (R_RELWORD_NEG, 0, -1, 16, false,
+         "+v32", TRUE, 0xffffffff, 0xffffffff, FALSE),
+
+  HOWTO (R_RELWORD_NEG, 0, -1, 16, FALSE,
          0, complain_overflow_dont, 0,
-         "-v16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG_NEG, 0, -2, 32, false,
+         "-v16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG_NEG, 0, -2, 32, FALSE,
          0, complain_overflow_dont, 0,
-         "-v32", true, 0xffffffff, 0xffffffff, false),
+         "-v32", TRUE, 0xffffffff, 0xffffffff, FALSE),
 };
 
@@ -381 +412 @@
   unsigned int dst_idx = esdid->pc;
 
-  for (shift = (1 << 31); shift && srcp < endp; shift >>= 1)
+  for (shift = ((unsigned long) 1 << 31); shift && srcp < endp; shift >>= 1)
     {
       if (bits & shift)
@@ -454 +485 @@
 
   if (!contents && need_contents)
-    esdid->contents = (unsigned char *) bfd_alloc (abfd, esdid->section->_raw_size);
-
-}
-
-static boolean
+    {
+      bfd_size_type size = esdid->section->_raw_size;
+      esdid->contents = (unsigned char *) bfd_alloc (abfd, size);
+    }
+}
+
+static bfd_boolean
 versados_scan (abfd)
      bfd *abfd;
@@ -466 +499 @@
   int j;
   int nsecs = 0;
+  bfd_size_type amt;
 
   VDATA (abfd)->stringlen = 0;
@@ -478 +512 @@
       union ext_any any;
       if (!get_record (abfd, &any))
-        return true;
+        return TRUE;
       switch (any.header.type)
         {
@@ -509 +543 @@
       if (esdid->section)
         {
-          esdid->section->relocation
-            = (arelent *) bfd_alloc (abfd, sizeof (arelent) * esdid->relocs);
+          amt = (bfd_size_type) esdid->relocs * sizeof (arelent);
+          esdid->section->relocation = (arelent *) bfd_alloc (abfd, amt);
 
           esdid->pc = 0;
@@ -531 +565 @@
   abfd->symcount += nsecs;
 
-  VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd,
-                                       sizeof (asymbol) * (abfd->symcount));
-
-  VDATA (abfd)->strings = bfd_alloc (abfd, VDATA (abfd)->stringlen);
+  amt = abfd->symcount;
+  amt *= sizeof (asymbol);
+  VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd, amt);
+
+  amt = VDATA (abfd)->stringlen;
+  VDATA (abfd)->strings = bfd_alloc (abfd, amt);
 
   if ((VDATA (abfd)->symbols == NULL && abfd->symcount > 0)
       || (VDATA (abfd)->strings == NULL && VDATA (abfd)->stringlen > 0))
-    return false;
+    return FALSE;
 
   /* Actually fill in the section symbols,
@@ -578 +614 @@
   struct ext_vheader ext;
   unsigned char len;
+  tdata_type *tdata_save;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return NULL;
 
-  if (bfd_read (&len, 1, 1, abfd) != 1)
+  if (bfd_bread (&len, (bfd_size_type) 1, abfd) != 1)
     {
       if (bfd_get_error () != bfd_error_system_call)
@@ -589 +626 @@
     }
 
-  if (bfd_read (&ext.type, 1, len, abfd) != len)
+  if (bfd_bread (&ext.type, (bfd_size_type) len, abfd) != len)
     {
       if (bfd_get_error () != bfd_error_system_call)
@@ -608 +645 @@
   /* OK, looks like a record, build the tdata and read in.  */
 
-  if (!versados_mkobject (abfd)
-      || !versados_scan (abfd))
-    return NULL;
+  tdata_save = abfd->tdata.versados_data;
+  if (!versados_mkobject (abfd) || !versados_scan (abfd))
+    {
+      abfd->tdata.versados_data = tdata_save;
+      return NULL;
+    }
 
   return abfd->xvec;
 }
 
-static boolean
+static bfd_boolean
 versados_pass_2 (abfd)
      bfd *abfd;
@@ -624 +664 @@
     return 1;
 
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return 0;
 
@@ -649 +689 @@
 }
 
-static boolean
+static bfd_boolean
 versados_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
@@ -658 +698 @@
 {
   if (!versados_pass_2 (abfd))
-    return false;
+    return FALSE;
 
   memcpy (location,
@@ -664 +704 @@
           (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
@@ -670 +710 @@
   _bfd_generic_get_section_contents_in_window
 
-static boolean
+static bfd_boolean
 versados_set_section_contents (abfd, section, location, offset, bytes_to_do)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -678 +718 @@
      bfd_size_type bytes_to_do ATTRIBUTE_UNUSED;
 {
-  return false;
+  return FALSE;
 }
 
@@ -684 +724 @@
 versados_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
-}
-
-static asymbol *
-versados_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
 }
 
@@ -733 +763 @@
 }
 
-void
+static void
 versados_get_symbol_info (ignore_abfd, symbol, ret)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
@@ -742 +772 @@
 }
 
-void
-versados_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+static void
+versados_print_symbol (abfd, afile, symbol, how)
+     bfd *abfd;
      PTR afile;
      asymbol *symbol;
@@ -756 +786 @@
       break;
     default:
-      bfd_print_symbol_vandf ((PTR) file, symbol);
+      bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
       fprintf (file, " %-5s %s",
                symbol->section->name,
@@ -764 +794 @@
 }
 
-long
+static long
 versados_get_reloc_upper_bound (abfd, asect)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -772 +802 @@
 }
 
-long
+static long
 versados_canonicalize_reloc (abfd, section, relptr, symbols)
      bfd *abfd;
@@ -829 +859 @@
 #define versados_get_lineno _bfd_nosymbols_get_lineno
 #define versados_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define versados_make_empty_symbol _bfd_generic_make_empty_symbol
 #define versados_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
 #define versados_read_minisymbols _bfd_generic_read_minisymbols
@@ -841 +872 @@
 #define versados_bfd_relax_section bfd_generic_relax_section
 #define versados_bfd_gc_sections bfd_generic_gc_sections
+#define versados_bfd_merge_sections bfd_generic_merge_sections
+#define versados_bfd_discard_group bfd_generic_discard_group
 #define versados_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define versados_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
 #define versados_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define versados_bfd_link_just_syms _bfd_generic_link_just_syms
 #define versados_bfd_final_link _bfd_generic_final_link
 #define versados_bfd_link_split_section _bfd_generic_link_split_section