X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdsrec.c;h=2ca91fe5e2119fa902fbf4392b82ec39ebf09a20;hb=8a076db965ba49f891b959752db7c8bb0c524688;hp=8f58916424fe12ff62684f1fe143b39ec7b11c3b;hpb=fba45db2faf619e71856ee38ec63949c0ef6903e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/dsrec.c b/gdb/dsrec.c index 8f58916424..2ca91fe5e2 100644 --- a/gdb/dsrec.c +++ b/gdb/dsrec.c @@ -1,5 +1,6 @@ /* S-record download support for GDB, the GNU debugger. - Copyright 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004 + Free Software Foundation, Inc. This file is part of GDB. @@ -22,6 +23,8 @@ #include "serial.h" #include "srec.h" #include +#include "gdb_assert.h" +#include "gdb_string.h" extern void report_transfer_performance (unsigned long, time_t, time_t); @@ -32,26 +35,21 @@ static int make_srec (char *srec, CORE_ADDR targ_addr, bfd * abfd, int flags); /* Download an executable by converting it to S records. DESC is a - serial_t to send the data to. FILE is the name of the file to be - loaded. LOAD_OFFSET is the offset into memory to load data into. - It is usually specified by the user and is useful with the a.out - file format. MAXRECSIZE is the length in chars of the largest - S-record the host can accomodate. This is measured from the - starting `S' to the last char of the checksum. FLAGS is various - random flags, and HASHMARK is non-zero to cause a `#' to be + `struct serial *' to send the data to. FILE is the name of the + file to be loaded. LOAD_OFFSET is the offset into memory to load + data into. It is usually specified by the user and is useful with + the a.out file format. MAXRECSIZE is the length in chars of the + largest S-record the host can accomodate. This is measured from + the starting `S' to the last char of the checksum. FLAGS is + various random flags, and HASHMARK is non-zero to cause a `#' to be printed out for each record loaded. WAITACK, if non-NULL, is a - function that waits for an acknowledgement after each S-record, - and returns non-zero if the ack is read correctly. */ + function that waits for an acknowledgement after each S-record, and + returns non-zero if the ack is read correctly. */ void -load_srec (desc, file, load_offset, maxrecsize, flags, hashmark, waitack) - serial_t desc; - const char *file; - bfd_vma load_offset; - int maxrecsize; - int flags; - int hashmark; - int (*waitack) (void); +load_srec (struct serial *desc, const char *file, bfd_vma load_offset, + int maxrecsize, + int flags, int hashmark, int (*waitack) (void)) { bfd *abfd; asection *s; @@ -88,14 +86,14 @@ load_srec (desc, file, load_offset, maxrecsize, flags, hashmark, waitack) srec[reclen] = '\0'; puts_debug ("sent -->", srec, "<--"); } - SERIAL_WRITE (desc, srec, reclen); + serial_write (desc, srec, reclen); for (s = abfd->sections; s; s = s->next) if (s->flags & SEC_LOAD) { 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 @@ -125,9 +123,10 @@ load_srec (desc, file, load_offset, maxrecsize, flags, hashmark, waitack) acknowledgement is sent back. */ do { - SERIAL_WRITE (desc, srec, reclen); - if (ui_load_progress_hook) - if (ui_load_progress_hook (section_name, (unsigned long) i)) + serial_write (desc, srec, reclen); + 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 ()); @@ -139,8 +138,9 @@ load_srec (desc, file, load_offset, maxrecsize, flags, hashmark, waitack) } } /* Per-packet (or S-record) loop */ - if (ui_load_progress_hook) - if (ui_load_progress_hook (section_name, (unsigned long) i)) + if (deprecated_ui_load_progress_hook) + if (deprecated_ui_load_progress_hook (section_name, + (unsigned long) i)) error ("Canceled the download"); putchar_unfiltered ('\n'); } @@ -161,14 +161,14 @@ load_srec (desc, file, load_offset, maxrecsize, flags, hashmark, waitack) puts_debug ("sent -->", srec, "<--"); } - SERIAL_WRITE (desc, srec, reclen); + serial_write (desc, srec, reclen); /* Some monitors need these to wake up properly. (Which ones? -sts) */ - SERIAL_WRITE (desc, "\r\r", 2); + serial_write (desc, "\r\r", 2); if (remote_debug) puts_debug ("sent -->", "\r\r", "<---"); - SERIAL_FLUSH_INPUT (desc); + serial_flush_input (desc); report_transfer_performance (data_count, start_time, end_time); } @@ -227,10 +227,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; @@ -247,6 +243,7 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect, { tmp = flags >> SREC_TERM_SHIFT; /* Term record */ code_table = term_code_table; + binbuf = NULL; } if ((tmp & SREC_2_BYTE_ADDR) && (targ_addr <= 0xffff)) @@ -256,8 +253,9 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect, else if (tmp & SREC_4_BYTE_ADDR) addr_size = 4; else - internal_error ("make_srec: Bad address (0x%x), or bad flags (0x%x).", - targ_addr, flags); + internal_error (__FILE__, __LINE__, + "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 data this record can hold. */ @@ -265,7 +263,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); } @@ -273,9 +271,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 @@ -289,6 +288,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. */