Changeset 609 for branches/GNU/src/binutils/bfd/ihex.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/ihex.c (modified) (55 diffs, 1 prop)

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

@@ -1 +1 @@
 /* BFD back-end for Intel Hex 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 Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
 
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* This is what Intel Hex files look like:
@@ -123 +124 @@
 #include "libbfd.h"
 #include "libiberty.h"
-
-#include <ctype.h>
-
-static void ihex_init PARAMS ((void));
-static boolean ihex_mkobject PARAMS ((bfd *));
-static INLINE int ihex_get_byte PARAMS ((bfd *, boolean *));
-static void ihex_bad_byte PARAMS ((bfd *, unsigned int, int, boolean));
-static boolean ihex_scan PARAMS ((bfd *));
-static const bfd_target *ihex_object_p PARAMS ((bfd *));
-static boolean ihex_read_section PARAMS ((bfd *, asection *, bfd_byte *));
-static boolean ihex_get_section_contents
+#include "safe-ctype.h"
+
+static void ihex_init
+  PARAMS ((void));
+static bfd_boolean ihex_mkobject
+  PARAMS ((bfd *));
+static INLINE int ihex_get_byte
+  PARAMS ((bfd *, bfd_boolean *));
+static void ihex_bad_byte
+  PARAMS ((bfd *, unsigned int, int, bfd_boolean));
+static bfd_boolean ihex_scan
+  PARAMS ((bfd *));
+static const bfd_target *ihex_object_p
+  PARAMS ((bfd *));
+static bfd_boolean ihex_read_section
+  PARAMS ((bfd *, asection *, bfd_byte *));
+static bfd_boolean ihex_get_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean ihex_set_section_contents
+static bfd_boolean ihex_set_section_contents
   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean ihex_write_record
-  PARAMS ((bfd *, bfd_size_type, bfd_vma, unsigned int, bfd_byte *));
-static boolean ihex_write_object_contents PARAMS ((bfd *));
-static asymbol *ihex_make_empty_symbol PARAMS ((bfd *));
-static boolean ihex_set_arch_mach
+static bfd_boolean ihex_write_record
+  PARAMS ((bfd *, size_t, unsigned int, unsigned int, bfd_byte *));
+static bfd_boolean ihex_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean ihex_set_arch_mach
   PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static int ihex_sizeof_headers PARAMS ((bfd *, boolean));
+static int ihex_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
 /* The number of bytes we put on one line during output.  */
@@ -149 +157 @@
 #define CHUNK 16
 
-/* Macros for converting between hex and binary. */
-
-#define NIBBLE(x) (hex_value (x))
+/* Macros for converting between hex and binary.  */
+
+#define NIBBLE(x)    (hex_value (x))
 #define HEX2(buffer) ((NIBBLE ((buffer)[0]) << 4) + NIBBLE ((buffer)[1]))
 #define HEX4(buffer) ((HEX2 (buffer) << 8) + HEX2 ((buffer) + 2))
-#define ISHEX(x) (hex_p (x))
+#define ISHEX(x)     (hex_p (x))
 
 /* When we write out an ihex value, the values can not be output as
@@ -180 +188 @@
 ihex_init ()
 {
-  static boolean inited;
+  static bfd_boolean inited;
 
   if (! inited)
     {
-      inited = true;
+      inited = TRUE;
       hex_init ();
     }
@@ -191 +199 @@
 /* Create an ihex object.  */
 
-static boolean
+static bfd_boolean
 ihex_mkobject (abfd)
      bfd *abfd;
 {
-  if (abfd->tdata.ihex_data == NULL)
-    {
-      struct ihex_data_struct *tdata;
-
-      tdata = ((struct ihex_data_struct *)
-               bfd_alloc (abfd, sizeof (struct ihex_data_struct)));
-      if (tdata == NULL)
-        return false;
-      abfd->tdata.ihex_data = tdata;
-      tdata->head = NULL;
-      tdata->tail = NULL;
-    }
-
-  return true;
+  struct ihex_data_struct *tdata;
+  bfd_size_type amt = sizeof (struct ihex_data_struct);
+
+  tdata = (struct ihex_data_struct *) bfd_alloc (abfd, amt);
+  if (tdata == NULL)
+    return FALSE;
+
+  abfd->tdata.ihex_data = tdata;
+  tdata->head = NULL;
+  tdata->tail = NULL;
+  return TRUE;
 }
 
@@ -217 +222 @@
 ihex_get_byte (abfd, errorptr)
      bfd *abfd;
-     boolean *errorptr;
+     bfd_boolean *errorptr;
 {
   bfd_byte c;
 
-  if (bfd_read (&c, 1, 1, abfd) != 1)
+  if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
     {
       if (bfd_get_error () != bfd_error_file_truncated)
-        *errorptr = true;
+        *errorptr = TRUE;
       return EOF;
     }
@@ -238 +243 @@
      unsigned int lineno;
      int c;
-     boolean error;
+     bfd_boolean error;
 {
   if (c == EOF)
@@ -249 +254 @@
       char buf[10];
 
-      if (! isprint (c))
+      if (! ISPRINT (c))
         sprintf (buf, "\\%03o", (unsigned int) c);
       else
@@ -258 +263 @@
       (*_bfd_error_handler)
         (_("%s:%d: unexpected character `%s' in Intel Hex file\n"),
-         bfd_get_filename (abfd), lineno, buf);
+         bfd_archive_filename (abfd), lineno, buf);
       bfd_set_error (bfd_error_bad_value);
     }
@@ -266 +271 @@
    section for each contiguous set of bytes.  */
 
-static boolean
+static bfd_boolean
 ihex_scan (abfd)
      bfd *abfd;
@@ -273 +278 @@
   bfd_vma extbase;
   asection *sec;
-  int lineno;
-  boolean error;
+  unsigned int lineno;
+  bfd_boolean error;
   bfd_byte *buf = NULL;
   size_t bufsize;
@@ -288 +293 @@
   sec = NULL;
   lineno = 1;
-  error = false;
+  error = FALSE;
   bufsize = 0;
+
   while ((c = ihex_get_byte (abfd, &error)) != EOF)
     {
@@ -316 +322 @@
 
           /* This is a data record.  */
-
           pos = bfd_tell (abfd) - 1;
 
           /* Read the header bytes.  */
-
-          if (bfd_read (hdr, 1, 8, abfd) != 8)
+          if (bfd_bread (hdr, (bfd_size_type) 8, abfd) != 8)
             goto error_return;
 
@@ -338 +342 @@
 
           /* Read the data bytes.  */
-
           chars = len * 2 + 2;
           if (chars >= bufsize)
             {
-              buf = (bfd_byte *) bfd_realloc (buf, chars);
+              buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) chars);
               if (buf == NULL)
                 goto error_return;
@@ -348 +351 @@
             }
 
-          if (bfd_read (buf, 1, chars, abfd) != chars)
+          if (bfd_bread (buf, (bfd_size_type) chars, abfd) != chars)
             goto error_return;
 
@@ -367 +370 @@
             {
               (*_bfd_error_handler)
-                (_("%s:%d: bad checksum in Intel Hex file (expected %u, found %u)"),
-                 bfd_get_filename (abfd), lineno,
+                (_("%s:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
+                 bfd_archive_filename (abfd), lineno,
                  (- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
               bfd_set_error (bfd_error_bad_value);
@@ -389 +392 @@
                   char secbuf[20];
                   char *secname;
+                  bfd_size_type amt;
 
                   sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
-                  secname = (char *) bfd_alloc (abfd, strlen (secbuf) + 1);
+                  amt = strlen (secbuf) + 1;
+                  secname = (char *) bfd_alloc (abfd, amt);
                   if (secname == NULL)
                     goto error_return;
@@ -412 +417 @@
               if (buf != NULL)
                 free (buf);
-              return true;
+              return TRUE;
 
             case 2:
@@ -419 +424 @@
                 {
                   (*_bfd_error_handler)
-                    (_("%s:%d: bad extended address record length in Intel Hex file"),
-                     bfd_get_filename (abfd), lineno);
+                    (_("%s:%u: bad extended address record length in Intel Hex file"),
+                     bfd_archive_filename (abfd), lineno);
                   bfd_set_error (bfd_error_bad_value);
                   goto error_return;
@@ -436 +441 @@
                 {
                   (*_bfd_error_handler)
-                    (_("%s:%d: bad extended start address length in Intel Hex file"),
-                     bfd_get_filename (abfd), lineno);
+                    (_("%s:%u: bad extended start address length in Intel Hex file"),
+                     bfd_archive_filename (abfd), lineno);
                   bfd_set_error (bfd_error_bad_value);
                   goto error_return;
@@ -453 +458 @@
                 {
                   (*_bfd_error_handler)
-                    (_("%s:%d: bad extended linear address record length in Intel Hex file"),
-                     bfd_get_filename (abfd), lineno);
+                    (_("%s:%u: bad extended linear address record length in Intel Hex file"),
+                     bfd_archive_filename (abfd), lineno);
                   bfd_set_error (bfd_error_bad_value);
                   goto error_return;
@@ -470 +475 @@
                 {
                   (*_bfd_error_handler)
-                    (_("%s:%d: bad extended linear start address length in Intel Hex file"),
-                     bfd_get_filename (abfd), lineno);
+                    (_("%s:%u: bad extended linear start address length in Intel Hex file"),
+                     bfd_archive_filename (abfd), lineno);
                   bfd_set_error (bfd_error_bad_value);
                   goto error_return;
@@ -487 +492 @@
             default:
               (*_bfd_error_handler)
-                (_("%s:%d: unrecognized ihex type %u in Intel Hex file\n"),
-                 bfd_get_filename (abfd), lineno, type);
+                (_("%s:%u: unrecognized ihex type %u in Intel Hex file\n"),
+                 bfd_archive_filename (abfd), lineno, type);
               bfd_set_error (bfd_error_bad_value);
               goto error_return;
@@ -501 +506 @@
     free (buf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
@@ -515 +520 @@
      bfd *abfd;
 {
+  PTR tdata_save;
   bfd_byte b[9];
   unsigned int i;
@@ -523 +529 @@
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return NULL;
-  if (bfd_read (b, 1, 9, abfd) != 9)
+  if (bfd_bread (b, (bfd_size_type) 9, abfd) != 9)
     {
       if (bfd_get_error () == bfd_error_file_truncated)
@@ -553 +559 @@
 
   /* OK, it looks like it really is an Intel Hex file.  */
-
-  if (! ihex_mkobject (abfd)
-      || ! ihex_scan (abfd))
-    return NULL;
+  tdata_save = abfd->tdata.any;
+  if (! ihex_mkobject (abfd) || ! ihex_scan (abfd))
+    {
+      if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
+        bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = tdata_save;
+      return NULL;
+    }
 
   return abfd->xvec;
@@ -563 +573 @@
 /* Read the contents of a section in an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_read_section (abfd, section, contents)
      bfd *abfd;
@@ -573 +583 @@
   bfd_byte *buf = NULL;
   size_t bufsize;
-  boolean error;
+  bfd_boolean error;
 
   if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
@@ -580 +590 @@
   p = contents;
   bufsize = 0;
-  error = false;
+  error = FALSE;
   while ((c = ihex_get_byte (abfd, &error)) != EOF)
     {
@@ -596 +606 @@
       BFD_ASSERT (c == ':');
 
-      if (bfd_read (hdr, 1, 8, abfd) != 8)
+      if (bfd_bread (hdr, (bfd_size_type) 8, abfd) != 8)
         goto error_return;
 
@@ -608 +618 @@
           (*_bfd_error_handler)
             (_("%s: internal error in ihex_read_section"),
-             bfd_get_filename (abfd));
+             bfd_archive_filename (abfd));
           bfd_set_error (bfd_error_bad_value);
           goto error_return;
@@ -615 +625 @@
       if (len * 2 > bufsize)
         {
-          buf = (bfd_byte *) bfd_realloc (buf, len * 2);
+          buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) len * 2);
           if (buf == NULL)
             goto error_return;
@@ -621 +631 @@
         }
 
-      if (bfd_read (buf, 1, len * 2, abfd) != len * 2)
+      if (bfd_bread (buf, (bfd_size_type) len * 2, abfd) != len * 2)
         goto error_return;
 
@@ -631 +641 @@
           if (buf != NULL)
             free (buf);
-          return true;
+          return TRUE;
         }
 
       /* Skip the checksum.  */
-      if (bfd_read (buf, 1, 2, abfd) != 2)
+      if (bfd_bread (buf, (bfd_size_type) 2, abfd) != 2)
         goto error_return;
     }
@@ -643 +653 @@
       (*_bfd_error_handler)
         (_("%s: bad section length in ihex_read_section"),
-         bfd_get_filename (abfd));
+         bfd_archive_filename (abfd));
       bfd_set_error (bfd_error_bad_value);
       goto error_return;
@@ -651 +661 @@
     free (buf);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (buf != NULL)
     free (buf);
-  return false;
+  return FALSE;
 }
 
 /* Get the contents of a section in an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
@@ -673 +683 @@
       section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
       if (section->used_by_bfd == NULL)
-        return false;
+        return FALSE;
       if (! ihex_read_section (abfd, section, section->used_by_bfd))
-        return false;
+        return FALSE;
     }
 
@@ -681 +691 @@
           (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
 /* Set the contents of a section in an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
@@ -697 +707 @@
   bfd_byte *data;
   struct ihex_data_struct *tdata;
+  bfd_size_type amt;
 
   if (count == 0
       || (section->flags & SEC_ALLOC) == 0
       || (section->flags & SEC_LOAD) == 0)
-    return true;
-
-  n = ((struct ihex_data_list *)
-       bfd_alloc (abfd, sizeof (struct ihex_data_list)));
+    return TRUE;
+
+  amt = sizeof (struct ihex_data_list);
+  n = (struct ihex_data_list *) bfd_alloc (abfd, amt);
   if (n == NULL)
-    return false;
+    return FALSE;
 
   data = (bfd_byte *) bfd_alloc (abfd, count);
   if (data == NULL)
-    return false;
+    return FALSE;
   memcpy (data, location, (size_t) count);
 
@@ -741 +752 @@
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Write a record out to an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_write_record (abfd, count, addr, type, data)
      bfd *abfd;
-     bfd_size_type count;
-     bfd_vma addr;
+     size_t count;
+     unsigned int addr;
      unsigned int type;
      bfd_byte *data;
@@ -759 +770 @@
   unsigned int chksum;
   unsigned int i;
+  size_t total;
 
 #define TOHEX(buf, v) \
@@ -781 +793 @@
   p[3] = '\n';
 
-  if (bfd_write (buf, 1, 9 + count * 2 + 4, abfd) != 9 + count * 2 + 4)
-    return false;
-
-  return true;
+  total = 9 + count * 2 + 4;
+  if (bfd_bwrite (buf, (bfd_size_type) total, abfd) != total)
+    return FALSE;
+
+  return TRUE;
 }
 
 /* Write out an Intel Hex file.  */
 
-static boolean
+static bfd_boolean
 ihex_write_object_contents (abfd)
      bfd *abfd;
@@ -810 +823 @@
       while (count > 0)
         {
-          bfd_size_type now;
+          size_t now;
+          unsigned int rec_addr;
 
           now = count;
-          if (now > CHUNK)
+          if (count > CHUNK)
             now = CHUNK;
 
@@ -830 +844 @@
                   addr[1] = (bfd_byte)(segbase >> 4) & 0xff;
                   if (! ihex_write_record (abfd, 2, 0, 2, addr))
-                    return false;
+                    return FALSE;
                 }
               else
@@ -845 +859 @@
                       addr[1] = 0;
                       if (! ihex_write_record (abfd, 2, 0, 2, addr))
-                        return false;
+                        return FALSE;
                       segbase = 0;
                     }
@@ -856 +870 @@
                       sprintf_vma (buf, where);
                       (*_bfd_error_handler)
-                        (_("%s: address 0x%s out of range for Intex Hex file"),
+                        (_("%s: address 0x%s out of range for Intel Hex file"),
                          bfd_get_filename (abfd), buf);
                       bfd_set_error (bfd_error_bad_value);
-                      return false;
+                      return FALSE;
                     }
                   addr[0] = (bfd_byte)(extbase >> 24) & 0xff;
                   addr[1] = (bfd_byte)(extbase >> 16) & 0xff;
                   if (! ihex_write_record (abfd, 2, 0, 4, addr))
-                    return false;
+                    return FALSE;
                 }
             }
 
-          if (! ihex_write_record (abfd, now, where - (extbase + segbase),
-                                   0, p))
-            return false;
+          rec_addr = where - (extbase + segbase);
+
+          /* Output records shouldn't cross 64K boundaries.  */
+          if (rec_addr + now > 0xffff)
+            now = 0x10000 - rec_addr;
+
+          if (! ihex_write_record (abfd, now, rec_addr, 0, p))
+            return FALSE;
 
           where += now;
@@ -892 +911 @@
           startbuf[3] = (bfd_byte)start & 0xff;
           if (! ihex_write_record (abfd, 4, 0, 3, startbuf))
-            return false;
+            return FALSE;
         }
       else
@@ -901 +920 @@
           startbuf[3] = (bfd_byte)start & 0xff;
           if (! ihex_write_record (abfd, 4, 0, 5, startbuf))
-            return false;
+            return FALSE;
         }
     }
 
   if (! ihex_write_record (abfd, 0, 0, 1, NULL))
-    return false;
-
-  return true;
-}
-
-/* Make an empty symbol.  This is required only because
-   bfd_make_section_anyway wants to create a symbol for the section.  */
-
-static asymbol *
-ihex_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new;
-
-  new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new != NULL)
-    new->the_bfd = abfd;
-  return new;
+    return FALSE;
+
+  return TRUE;
 }
 
@@ -929 +933 @@
    irrelevant, so we ignore errors about unknown architectures.  */
 
-static boolean
+static bfd_boolean
 ihex_set_arch_mach (abfd, arch, mach)
      bfd *abfd;
@@ -938 +942 @@
     {
       if (arch != bfd_arch_unknown)
-        return false;
-    }
-  return true;
+        return FALSE;
+    }
+  return TRUE;
 }
 
@@ -949 +953 @@
 ihex_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 {
   return 0;
@@ -965 +969 @@
 #define ihex_get_symtab \
   ((long (*) PARAMS ((bfd *, asymbol **))) bfd_0l)
+#define ihex_make_empty_symbol _bfd_generic_make_empty_symbol
 #define ihex_print_symbol _bfd_nosymbols_print_symbol
 #define ihex_get_symbol_info _bfd_nosymbols_get_symbol_info
@@ -984 +989 @@
 #define ihex_bfd_relax_section bfd_generic_relax_section
 #define ihex_bfd_gc_sections bfd_generic_gc_sections
+#define ihex_bfd_merge_sections bfd_generic_merge_sections
+#define ihex_bfd_discard_group bfd_generic_discard_group
 #define ihex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define ihex_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
 #define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define ihex_bfd_link_just_syms _bfd_generic_link_just_syms
 #define ihex_bfd_final_link _bfd_generic_final_link
 #define ihex_bfd_link_split_section _bfd_generic_link_split_section
@@ -1039 +1048 @@
 
   NULL,
-  
+
   (PTR) 0
 };