* breakpoint.c (do_enable_breakpoint): Use update_watchpoint for

[binutils-gdb.git] / gdb / dsrec.c

diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index 5f2c2d703ceea69cf5d6ca1ccab00914e0bf584f..94ccca9ff52258f56e9df9a903b70e52ea66c4af 100644 (file)
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -1,12 +1,12 @@
 /* S-record download support for GDB, the GNU debugger.
-   Copyright 1995, 1996, 1997, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2007, 2008,
+   2009 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,14 +15,14 @@
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "serial.h"
 #include "srec.h"
 #include <time.h>
+#include "gdb_assert.h"
+#include "gdb_string.h"
 
 extern void report_transfer_performance (unsigned long, time_t, time_t);
 
@@ -62,13 +62,13 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
   abfd = bfd_openr (file, 0);
   if (!abfd)
     {
-      printf_filtered ("Unable to open file %s\n", file);
+      printf_filtered (_("Unable to open file %s\n"), file);
       return;
     }
 
   if (bfd_check_format (abfd, bfd_object) == 0)
     {
-      printf_filtered ("File is not an object file\n");
+      printf_filtered (_("File is not an object file\n"));
       return;
     }
 
@@ -91,7 +91,7 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
       {
        int numbytes;
        bfd_vma addr = bfd_get_section_vma (abfd, s) + load_offset;
-       bfd_size_type size = bfd_get_section_size_before_reloc (s);
+       bfd_size_type size = bfd_get_section_size (s);
        char *section_name = (char *) bfd_get_section_name (abfd, s);
        /* Both GDB and BFD have mechanisms for printing addresses.
            In the below, GDB's is used so that the address is
@@ -122,9 +122,10 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
            do
              {
                serial_write (desc, srec, reclen);
-               if (ui_load_progress_hook)
-                 if (ui_load_progress_hook (section_name, (unsigned long) i))
-                   error ("Canceled the download");
+               if (deprecated_ui_load_progress_hook)
+                 if (deprecated_ui_load_progress_hook (section_name,
+                                                       (unsigned long) i))
+                   error (_("Canceled the download"));
              }
            while (waitack != NULL && !waitack ());
 
@@ -135,9 +136,10 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
              }
          }                     /* Per-packet (or S-record) loop */
 
-       if (ui_load_progress_hook)
-         if (ui_load_progress_hook (section_name, (unsigned long) i))
-           error ("Canceled the download");
+       if (deprecated_ui_load_progress_hook)
+         if (deprecated_ui_load_progress_hook (section_name,
+                                               (unsigned long) i))
+           error (_("Canceled the download"));
        putchar_unfiltered ('\n');
       }
 
@@ -223,10 +225,6 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
   const static char data_code_table[] = "123";
   const static char term_code_table[] = "987";
   const static char header_code_table[] = "000";
-  const static char *formats[] =
-  {"S%c%02X%04X",
-   "S%c%02X%06X",
-   "S%c%02X%08X"};
   char const *code_table;
   int addr_size;
   int payload_size;
@@ -254,7 +252,7 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
     addr_size = 4;
   else
     internal_error (__FILE__, __LINE__,
-                   "make_srec:  Bad address (0x%s), or bad flags (0x%x).",
+                   _("make_srec:  Bad address (0x%s), or bad flags (0x%x)."),
                    paddr (targ_addr), flags);
 
   /* Now that we know the address size, we can figure out how much
@@ -263,7 +261,7 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
   if (sect && abfd)
     {
       payload_size = (*maxrecsize - (1 + 1 + 2 + addr_size * 2 + 2)) / 2;
-      payload_size = min (payload_size, sect->_raw_size - sectoff);
+      payload_size = min (payload_size, bfd_get_section_size (sect) - sectoff);
 
       bfd_get_section_contents (abfd, sect, binbuf, sectoff, payload_size);
     }
@@ -271,9 +269,10 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
     payload_size = 0;          /* Term or header packets have no payload */
 
   /* Output the header.  */
-
-  sprintf (srec, formats[addr_size - 2], code_table[addr_size - 2],
-          addr_size + payload_size + 1, (int) targ_addr);
+  snprintf (srec, (*maxrecsize) + 1, "S%c%02X%0*X",
+           code_table[addr_size - 2],
+           addr_size + payload_size + 1,
+           addr_size * 2, (int) targ_addr);
 
   /* Note that the checksum is calculated on the raw data, not the
      hexified data.  It includes the length, address and the data
@@ -287,6 +286,9 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
               + ((targ_addr >> 16) & 0xff)
               + ((targ_addr >> 24) & 0xff));
 
+  /* NOTE: cagney/2003-08-10: The equation is old.  Check that the
+     recent snprintf changes match that equation.  */
+  gdb_assert (strlen (srec) == 1 + 1 + 2 + addr_size * 2);
   p = srec + 1 + 1 + 2 + addr_size * 2;
 
   /* Build the Srecord.  */