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

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

@@ -1 +1 @@
 /* BFD backend for Extended Tektronix Hex Format  objects.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
@@ -105 +105 @@
 static void tekhex_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
 static asymbol *tekhex_make_empty_symbol PARAMS ((bfd *));
-static int tekhex_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean tekhex_write_object_contents PARAMS ((bfd *));
+static int tekhex_sizeof_headers PARAMS ((bfd *, bfd_boolean));
+static bfd_boolean tekhex_write_object_contents PARAMS ((bfd *));
 static void out PARAMS ((bfd *, int, char *, char *));
-static void writesym PARAMS ((char **, CONST char *));
+static void writesym PARAMS ((char **, const char *));
 static void writevalue PARAMS ((char **, bfd_vma));
-static boolean tekhex_set_section_contents
+static bfd_boolean tekhex_set_section_contents
  PARAMS ((bfd*, sec_ptr, PTR, file_ptr, bfd_size_type));
-static boolean tekhex_set_arch_mach
+static bfd_boolean tekhex_set_arch_mach
  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean tekhex_get_section_contents
+static bfd_boolean tekhex_get_section_contents
  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
 static void move_section_contents
- PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type, boolean));
+ PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type, bfd_boolean));
 static const bfd_target *tekhex_object_p PARAMS ((bfd *));
-static boolean tekhex_mkobject PARAMS ((bfd *));
+static bfd_boolean tekhex_mkobject PARAMS ((bfd *));
 static long tekhex_get_symtab_upper_bound PARAMS ((bfd *));
 static long tekhex_get_symtab PARAMS ((bfd *, asymbol **));
@@ -240 +240 @@
 {
   unsigned int i;
-  static boolean inited = false;
+  static bfd_boolean inited = FALSE;
   int val;
 
-  if (inited == false)
-    {
-      inited = true;
+  if (! inited)
+    {
+      inited = TRUE;
       hex_init ();
       val = 0;
@@ -355 +355 @@
   if (!d)
     {
-      char *sname = bfd_alloc (abfd, 12);
-
       /* No chunk for this address, so make one up */
-      d = (struct data_struct *)
-        bfd_alloc (abfd, sizeof (struct data_struct));
-
-      if (!sname || !d)
+      d = ((struct data_struct *)
+           bfd_zalloc (abfd, (bfd_size_type) sizeof (struct data_struct)));
+
+      if (!d)
         return NULL;
 
-      memset (d->chunk_init, 0, CHUNK_MASK + 1);
-      memset (d->chunk_data, 0, CHUNK_MASK + 1);
       d->next = abfd->tdata.tekhex_data->data;
       d->vma = vma;
@@ -395 +391 @@
 {
   asection *section = bfd_abs_section_ptr;
-  int len;
+  unsigned int len;
   char sym[17];                 /* A symbol can only be 16chars long */
 
@@ -420 +416 @@
       if (section == (asection *) NULL)
         {
-          char *n = bfd_alloc (abfd, len + 1);
+          char *n = bfd_alloc (abfd, (bfd_size_type) len + 1);
 
           if (!n)
@@ -446 +442 @@
               /* Symbols, add to section */
               {
+                bfd_size_type amt = sizeof (tekhex_symbol_type);
                 tekhex_symbol_type *new =
-                (tekhex_symbol_type *) bfd_alloc (abfd,
-                                               sizeof (tekhex_symbol_type));
-                char type = (*src);
+                  (tekhex_symbol_type *) bfd_alloc (abfd, amt);
+                char stype = (*src);
 
                 if (!new)
@@ -460 +456 @@
                 abfd->tdata.tekhex_data->symbols = new;
                 len = getsym (sym, &src);
-                new->symbol.name = bfd_alloc (abfd, len + 1);
+                new->symbol.name = bfd_alloc (abfd, (bfd_size_type) len + 1);
                 if (!new->symbol.name)
                   abort ();     /* FIXME */
                 memcpy ((char *) (new->symbol.name), sym, len + 1);
                 new->symbol.section = section;
-                if (type <= '4')
+                if (stype <= '4')
                   new->symbol.flags = (BSF_GLOBAL | BSF_EXPORT);
                 else
@@ -476 +472 @@
 }
 
-/* Pass over an tekhex, calling one of the above functions on each
+/* Pass over a tekhex, calling one of the above functions on each
    record.  */
 
@@ -485 +481 @@
 {
   unsigned int chars_on_line;
-  boolean eof = false;
+  bfd_boolean eof = FALSE;
 
   /* To the front of the file */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     abort ();
-  while (eof == false)
+  while (! eof)
     {
       char buffer[MAXCHUNK];
@@ -497 +493 @@
 
       /* Find first '%' */
-      eof = (boolean) (bfd_read (src, 1, 1, abfd) != 1);
+      eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
       while (*src != '%' && !eof)
         {
-          eof = (boolean) (bfd_read (src, 1, 1, abfd) != 1);
+          eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
         }
       if (eof)
@@ -507 +503 @@
 
       /* Fetch the type and the length and the checksum */
-      if (bfd_read (src, 1, 5, abfd) != 5)
+      if (bfd_bread (src, (bfd_size_type) 5, abfd) != 5)
         abort (); /* FIXME */
 
@@ -517 +513 @@
       chars_on_line = HEX (src) - 5;    /* Already read five char */
 
-      if (bfd_read (src, 1, chars_on_line, abfd) != chars_on_line)
+      if (bfd_bread (src, (bfd_size_type) chars_on_line, abfd) != chars_on_line)
         abort (); /* FIXME */
       src[chars_on_line] = 0;   /* put a null at the end */
@@ -552 +548 @@
 }
 
-static boolean
+static bfd_boolean
 tekhex_mkobject (abfd)
      bfd *abfd;
 {
-  tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
-
+  tdata_type *tdata;
+
+  tdata = (tdata_type *) bfd_alloc (abfd, (bfd_size_type) sizeof (tdata_type));
   if (!tdata)
-    return false;
+    return FALSE;
   abfd->tdata.tekhex_data = tdata;
   tdata->type = 1;
@@ -565 +562 @@
   tdata->symbols = (struct tekhex_symbol_struct *) NULL;
   tdata->data = (struct data_struct *) NULL;
-  return true;
+  return TRUE;
 }
 
 /*
-  Return true if the file looks like it's in TekHex format. Just look
+  Return TRUE if the file looks like it's in TekHex format. Just look
   for a percent sign and some hex digits */
 
@@ -581 +578 @@
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || bfd_read (b, 1, 4, abfd) != 4)
+      || bfd_bread (b, (bfd_size_type) 4, abfd) != 4)
     return NULL;
 
@@ -598 +595 @@
      asection *section;
      PTR locationp;
-     file_ptr offset ATTRIBUTE_UNUSED;
+     file_ptr offset;
      bfd_size_type count;
-     boolean get;
+     bfd_boolean get;
 {
   bfd_vma addr;
@@ -607 +604 @@
   struct data_struct *d = (struct data_struct *) NULL;
 
+  BFD_ASSERT (offset == 0);
   for (addr = section->vma; count != 0; count--, addr++)
     {
-
-      bfd_vma chunk_number = addr & ~CHUNK_MASK;        /* Get high bits of address */
+      /* Get high bits of address.  */
+      bfd_vma chunk_number = addr & ~(bfd_vma) CHUNK_MASK;
       bfd_vma low_bits = addr & CHUNK_MASK;
 
@@ -642 +640 @@
 }
 
-static boolean
+static bfd_boolean
 tekhex_get_section_contents (abfd, section, locationp, offset, count)
      bfd *abfd;
@@ -652 +650 @@
   if (section->flags & (SEC_LOAD | SEC_ALLOC))
     {
-      move_section_contents (abfd, section, locationp, offset, count, true);
-      return true;
+      move_section_contents (abfd, section, locationp, offset, count, TRUE);
+      return TRUE;
     }
   else
-    return false;
-}
-
-static boolean
+    return FALSE;
+}
+
+static bfd_boolean
 tekhex_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
@@ -671 +669 @@
     */
 
-static boolean
+static bfd_boolean
 tekhex_set_section_contents (abfd, section, locationp, offset, bytes_to_do)
      bfd *abfd;
@@ -680 +678 @@
 {
 
-  if (abfd->output_has_begun == false)
+  if (! abfd->output_has_begun)
     {
       /* The first time around, allocate enough sections to hold all the chunks */
@@ -690 +688 @@
           if (s->flags & SEC_LOAD)
             {
-              for (vma = s->vma & ~CHUNK_MASK;
+              for (vma = s->vma & ~(bfd_vma) CHUNK_MASK;
                    vma < s->vma + s->_raw_size;
                    vma += CHUNK_MASK)
@@ -700 +698 @@
   if (section->flags & (SEC_LOAD | SEC_ALLOC))
     {
-      move_section_contents (abfd, section, locationp, offset, bytes_to_do, false);
-      return true;
+      move_section_contents (abfd, section, locationp, offset, bytes_to_do,
+                             FALSE);
+      return TRUE;
     }
   else
-    return false;
+    return FALSE;
 
 }
@@ -741 +740 @@
 writesym (dst, sym)
      char **dst;
-     CONST char *sym;
+     const char *sym;
 {
   char *p = *dst;
@@ -798 +797 @@
   sum += sum_block[(unsigned char) front[3]];   /* type */
   TOHEX (front + 4, sum);
-  if (bfd_write (front, 1, 6, abfd) != 6)
+  if (bfd_bwrite (front, (bfd_size_type) 6, abfd) != 6)
     abort ();
   end[0] = '\n';
   wrlen = end - start + 1;
-  if (bfd_write (start, 1, wrlen, abfd) != wrlen)
+  if (bfd_bwrite (start, wrlen, abfd) != wrlen)
     abort ();
 }
 
-static boolean
+static bfd_boolean
 tekhex_write_object_contents (abfd)
      bfd *abfd;
@@ -827 +826 @@
       int low;
 
-      CONST int span = 32;
+      const int span = 32;
       int addr;
 
@@ -877 +876 @@
           if (section_code != '?')
             {                   /* do not include debug symbols */
-              asymbol *s = *p;
+              asymbol *sym = *p;
               char *dst = buffer;
 
-              writesym (&dst, s->section->name);
+              writesym (&dst, sym->section->name);
 
               switch (section_code)
@@ -909 +908 @@
                 case 'U':
                   bfd_set_error (bfd_error_wrong_format);
-                  return false;
+                  return FALSE;
                 }
 
-              writesym (&dst, s->name);
-              writevalue (&dst, s->value + s->section->vma);
+              writesym (&dst, sym->name);
+              writevalue (&dst, sym->value + sym->section->vma);
               out (abfd, '3', buffer, dst);
             }
@@ -920 +919 @@
 
   /* And the terminator */
-  if (bfd_write ("%0781010\n", 1, 9, abfd) != 9)
+  if (bfd_bwrite ("%0781010\n", (bfd_size_type) 9, abfd) != 9)
     abort ();
-  return true;
+  return TRUE;
 }
 
@@ -928 +927 @@
 tekhex_sizeof_headers (abfd, exec)
      bfd *abfd ATTRIBUTE_UNUSED;
-     boolean exec ATTRIBUTE_UNUSED;
+     bfd_boolean exec ATTRIBUTE_UNUSED;
 
 {
@@ -938 +937 @@
      bfd *abfd;
 {
-  tekhex_symbol_type *new =
-  (tekhex_symbol_type *) bfd_zalloc (abfd, sizeof (struct tekhex_symbol_struct));
+  bfd_size_type amt = sizeof (struct tekhex_symbol_struct);
+  tekhex_symbol_type *new = (tekhex_symbol_type *) bfd_zalloc (abfd, amt);
 
   if (!new)
@@ -958 +957 @@
 
 static void
-tekhex_print_symbol (ignore_abfd, filep, symbol, how)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+tekhex_print_symbol (abfd, filep, symbol, how)
+     bfd *abfd;
      PTR filep;
      asymbol *symbol;
@@ -976 +975 @@
     case bfd_print_symbol_all:
       {
-        CONST char *section_name = symbol->section->name;
-
-        bfd_print_symbol_vandf ((PTR) file, symbol);
+        const char *section_name = symbol->section->name;
+
+        bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
 
         fprintf (file, " %-5s %s",
@@ -1002 +1001 @@
 #define tekhex_bfd_relax_section bfd_generic_relax_section
 #define tekhex_bfd_gc_sections bfd_generic_gc_sections
+#define tekhex_bfd_merge_sections bfd_generic_merge_sections
+#define tekhex_bfd_discard_group bfd_generic_discard_group
 #define tekhex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define tekhex_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
 #define tekhex_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define tekhex_bfd_link_just_syms _bfd_generic_link_just_syms
 #define tekhex_bfd_final_link _bfd_generic_final_link
 #define tekhex_bfd_link_split_section _bfd_generic_link_split_section