Update/correct copyright notices.

[deliverable/binutils-gdb.git] / gdb / remote-es.c

diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index a5005107d90cc60cb080d177d74340bd5ecf1809..19ec2083efca302a9b6005ade975ee72ac1e29b3 100644 (file)
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -1,5 +1,6 @@
 /* Memory-access and commands for remote es1800 processes, for GDB.
-   Copyright (C) 1988, 1992 Free Software Foundation, Inc.
+   Copyright 1988, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    This file is added to GDB to make it possible to do debugging via an
    ES-1800 emulator. The code was originally written by Johan Holmberg
@@ -104,11 +105,12 @@
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "command.h"
+#include "symfile.h"
 #include "remote-utils.h"
 #include "gdbcore.h"
 #include "serial.h"
+#include "regcache.h"
 
 /* Prototypes for local functions */
 
@@ -134,7 +136,7 @@ static void es1800_files_info (struct target_ops *);
 
 static int
 es1800_xfer_inferior_memory (CORE_ADDR, char *, int, int,
-                            struct target_ops *);
+                            struct mem_attrib *, struct target_ops *);
 
 static void es1800_prepare_to_store (void);
 
@@ -433,7 +435,7 @@ es1800_close (int quitting)
     }
   if (savename != NULL)
     {
-      free (savename);
+      xfree (savename);
     }
   savename = NULL;
 
@@ -954,15 +956,14 @@ tohex (int nib)
    memaddr - the target's address
    myaddr  - gdb's address
    len     - number of bytes 
-   write   - write if != 0 otherwise read       */
+   write   - write if != 0 otherwise read
+   tops    - unused */
 
 static int
-es1800_xfer_inferior_memory (memaddr, myaddr, len, write, tops)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write;
-     struct target_ops *tops;  /* Unused */
+es1800_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+                            int write, 
+                            struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+                            struct target_ops *target ATTRIBUTE_UNUSED)
 {
   int origlen = len;
   int xfersize;
@@ -1032,7 +1033,7 @@ es1800_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
 
   if (len > PBUFSIZ / 2 - 1)
     {
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 
   if (len == 1)                        /* The emulator does not like expressions like:  */
@@ -1065,11 +1066,10 @@ es1800_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
     }
 }
 
-/* Information about the current target  */
+/* Display information about the current target.  TOPS is unused.  */
 
 static void
-es1800_files_info (tops)
-     struct target_ops *tops;  /* Unused */
+es1800_files_info (struct target_ops *tops)
 {
   printf ("ES1800 Attached to %s at %d baud in %s mode\n", savename, 19200,
          MODE);
@@ -1155,14 +1155,14 @@ verify_break (int vec)
        {
          memory_error (status, memaddress);
        }
-      return (STRCMP (instr, buf));
+      return (strcmp (instr, buf));
     }
   return (-1);
 }
 
 
 /* get_break_addr ()
-   find address of breakpint routine
+   find address of breakpoint routine
    vec - trap vector used for breakpoints
    addrp - store the address here       */
 
@@ -1239,7 +1239,7 @@ es1800_load (char *filename, int from_tty)
     }
 
   filename = tilde_expand (filename);
-  make_cleanup (free, filename);
+  make_cleanup (xfree, filename);
 
   switch (es1800_load_format)
     {
@@ -1320,7 +1320,7 @@ es1800_load (char *filename, int from_tty)
       system (buf);
     }
 
-  symbol_file_command (filename, from_tty);    /* reading symbol table */
+  symbol_file_add_main (filename, from_tty);   /* reading symbol table */
   immediate_quit--;
 }