* defs.h (perror_with_name): Is a NORETURN function.

	* utils.c (perror_with_name): Is a NORETURN function.
	(error): Is NORETURN independently of ANSI_PROTOTYPES.

	* symtab.c (fixup_symbol_section): Remove prototype.
	* symtab.h: (fixup_symbol_section): Add prototype.
	* m32r-rom.c (report_transfer_performance): Add prototype.
	* sparclet-rom.c: Ditto.
	* dsrec.c: Ditto.

	* c-exp.y (parse_number): Cast args to float* or double* as
	appropriate for conversion format.
	* java-exp.y (parse_number): Ditto.

	* Makefile.in (c-exp.tab.c): Remove #line lines that refer
	to nonexistant y.tab.c file.
	(java-exp.tab.c): Ditto.
	(f-exp.tab.c): Ditto.
	(m2-exp.tab.c): Ditto.
start-sanitize-gdbtk

	* gdbtk.c (gdbtk_init): Make truth value test explicit.
	Remove unused static variable "Gdbtk_Library".
end-sanitize-gdbtk

1 files changed, 283 insertions, 0 deletions

diff --git a/gdb/dsrec.c b/gdb/dsrec.c
new file mode 100644
index 0000000..df69aef
--- /dev/null
+++ b/gdb/dsrec.c
@@ -0,0 +1,283 @@
+/* S-record download support for GDB, the GNU debugger.
+   Copyright 1995, 1996 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
+(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.  */
+
+#include "defs.h"
+#include "serial.h"
+#include "srec.h"
+#include <time.h>
+
+extern void report_transfer_performance PARAMS ((unsigned long, time_t, time_t));
+
+extern int remote_debug;
+
+static int make_srec PARAMS ((char *srec, CORE_ADDR targ_addr, bfd *abfd,
+			      asection *sect, int sectoff, int *maxrecsize,
+			      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 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.  */
+
+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) PARAMS ((void));
+{
+  bfd *abfd;
+  asection *s;
+  char *srec;
+  int i;
+  int reclen;
+  time_t start_time, end_time;
+  unsigned long data_count = 0;
+
+  srec = (char *)alloca (maxrecsize + 1);
+
+  abfd = bfd_openr (file, 0);
+  if (!abfd)
+    {
+      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");
+      return;
+    }
+
+  start_time = time (NULL);
+  
+  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);
+
+	printf_filtered ("%s\t: 0x%08x .. 0x%08x  ",
+			 bfd_get_section_name (abfd, s),
+			 (int) addr, (int) addr + size);
+	gdb_flush (gdb_stdout);
+
+	data_count += size;
+
+	for (i = 0; i < size; i += numbytes)
+	  {
+	    reclen = maxrecsize;
+	    numbytes = make_srec (srec, (CORE_ADDR) (addr + i), abfd, s,
+				  i, &reclen, flags);
+
+	    if (remote_debug)
+	      fprintf_unfiltered (gdb_stderr, "%.*s\\r\n", reclen-1, srec);
+
+	    /* Repeatedly send the S-record until a good acknowledgement
+	       is sent back.  */
+	    do
+	      {
+	        SERIAL_WRITE (desc, srec, reclen);
+	      }
+	    while (waitack != NULL && !waitack());
+
+	    if (hashmark)
+	      {
+		putchar_unfiltered ('#');
+		gdb_flush (gdb_stdout);
+	      }
+	  }			/* Per-packet (or S-record) loop */
+
+	putchar_unfiltered ('\n');
+      }				/* Loadable sections */
+
+  if (hashmark) 
+    putchar_unfiltered ('\n');
+
+  end_time = time (NULL);
+  
+  /* Write a type 7 terminator record. no data for a type 7, and there
+     is no data, so len is 0.  */
+
+  reclen = maxrecsize;
+  make_srec (srec, abfd->start_address, NULL, NULL, 0, &reclen, flags);
+
+  if (remote_debug)
+    fprintf_unfiltered (gdb_stderr, "%.*s\\r\n", reclen-1, srec);
+  SERIAL_WRITE (desc, srec, reclen);
+
+  SERIAL_WRITE (desc, "\r\r", 2); /* Some monitors need these to wake up */
+
+  SERIAL_FLUSH_INPUT (desc);
+
+  report_transfer_performance (data_count, start_time, end_time);
+}
+
+/*
+ * make_srec -- make an srecord. This writes each line, one at a
+ *	time, each with it's own header and trailer line.
+ *	An srecord looks like this:
+ *
+ * byte count-+     address
+ * start ---+ |        |       data        +- checksum
+ *	    | |        |                   |
+ *	  S01000006F6B692D746573742E73726563E4
+ *	  S315000448600000000000000000FC00005900000000E9
+ *	  S31A0004000023C1400037DE00F023604000377B009020825000348D
+ *	  S30B0004485A0000000000004E
+ *	  S70500040000F6
+ *
+ *	S<type><length><address><data><checksum>
+ *
+ *      Where
+ *      - length
+ *        is the number of bytes following upto the checksum. Note that
+ *        this is not the number of chars following, since it takes two
+ *        chars to represent a byte.
+ *      - type
+ *        is one of:
+ *        0) header record
+ *        1) two byte address data record
+ *        2) three byte address data record
+ *        3) four byte address data record
+ *        7) four byte address termination record
+ *        8) three byte address termination record
+ *        9) two byte address termination record
+ *       
+ *      - address
+ *        is the start address of the data following, or in the case of
+ *        a termination record, the start address of the image
+ *      - data
+ *        is the data.
+ *      - checksum
+ *	  is the sum of all the raw byte data in the record, from the length
+ *        upwards, modulo 256 and subtracted from 255.
+ *
+ * This routine returns the length of the S-record.
+ *
+ */
+
+static int
+make_srec (srec, targ_addr, abfd, sect, sectoff, maxrecsize, flags)
+     char *srec;
+     CORE_ADDR targ_addr;
+     bfd *abfd;
+     asection *sect;
+     int sectoff;
+     int *maxrecsize;
+     int flags;
+{
+  unsigned char checksum;
+  int tmp;
+  const static char hextab[] = "0123456789ABCDEF";
+  const static char data_code_table[] = "xx123";
+  const static char term_code_table[] = "xx987";
+  const static char *formats[] = {NULL, NULL, "S%c%02X%04X", "S%c%02X%06X",
+				    "S%c%02X%08X"};
+  char const *code_table;
+  int addr_size;
+  int payload_size;
+  int type_code;
+  char *binbuf;
+  char *p;
+
+  if (sect)
+    {
+      tmp = flags;		/* Data record */
+      code_table = data_code_table;
+      binbuf = alloca (*maxrecsize/2);
+    }
+  else
+    {
+      tmp = flags >> SREC_TERM_SHIFT; /* Term record */
+      code_table = term_code_table;
+    }
+
+  if ((tmp & SREC_2_BYTE_ADDR) && (targ_addr <= 0xffff))
+    addr_size = 2;
+  else if ((tmp & SREC_3_BYTE_ADDR) && (targ_addr <= 0xffffff))
+    addr_size = 3;
+  else if (tmp & SREC_4_BYTE_ADDR)
+    addr_size = 4;
+  else
+    fatal ("make_srec:  Bad address (0x%x), or bad flags (0x%x).", targ_addr,
+	   flags);
+
+/* Now that we know the address size, we can figure out how much data this
+   record can hold.  */
+
+  if (sect)
+    {
+      payload_size = (*maxrecsize - (1 + 1 + 2 + addr_size * 2 + 2)) / 2;
+      payload_size = min (payload_size, sect->_raw_size - sectoff);
+
+      bfd_get_section_contents (abfd, sect, binbuf, sectoff, payload_size);
+    }
+  else
+    payload_size = 0;		/* Term packets have no payload */
+
+/* Output the header.  */
+
+  sprintf (srec, formats[addr_size], code_table[addr_size],
+	   addr_size + payload_size + 1, targ_addr);
+
+/* Note that the checksum is calculated on the raw data, not the hexified
+   data.  It includes the length, address and the data portions of the
+   packet.  */
+
+  checksum = 0;
+  
+  checksum += (payload_size + addr_size + 1 /* Packet length */
+	       + (targ_addr & 0xff)	/* Address... */
+	       + ((targ_addr >>  8) & 0xff)
+	       + ((targ_addr >> 16) & 0xff)
+	       + ((targ_addr >> 24) & 0xff));
+  
+  p = srec + 1 + 1 + 2 + addr_size * 2;
+
+  /* build the srecord */
+  for (tmp = 0; tmp < payload_size; tmp++)
+    {
+      unsigned char k;
+
+      k = binbuf[tmp];
+      *p++ = hextab [k >> 4];
+      *p++ = hextab [k & 0xf];
+      checksum += k;
+    }
+
+  checksum = ~checksum;
+
+  *p++ = hextab[checksum >> 4];
+  *p++ = hextab[checksum & 0xf];
+  *p++ = '\r';
+
+  *maxrecsize = p - srec;
+  return payload_size;
+}