Updated copyright notices for most files.

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

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 883ee9e8617ef606220b05ba73a8806edd2e818c..244df5aedf99d96093f3654c304ff5ef6e3bc877 100644 (file)
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -1,5 +1,8 @@
 /* Remote debugging interface for MIPS remote debugging protocol.
 /* Remote debugging interface for MIPS remote debugging protocol.

-   Copyright 1993-1995, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+

    Contributed by Cygnus Support.  Written by Ian Lance Taylor
    <ian@cygnus.com>.
 
    Contributed by Cygnus Support.  Written by Ian Lance Taylor
    <ian@cygnus.com>.
 


@@ -7,7 +10,7 @@
 
    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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,31 +19,22 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 "inferior.h"
 #include "bfd.h"
 #include "symfile.h"
 
 #include "defs.h"
 #include "inferior.h"
 #include "bfd.h"
 #include "symfile.h"

-#include "gdb_wait.h"

 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "serial.h"
 #include "target.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "serial.h"
 #include "target.h"

-#include "remote-utils.h"
+#include "exceptions.h"

 #include "gdb_string.h"
 #include "gdb_string.h"

-
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-/* Microsoft C's stat.h doesn't define all the POSIX file modes.  */
-#ifndef S_IROTH
-#define S_IROTH S_IREAD
-#endif
-
+#include "gdb_stat.h"
+#include "regcache.h"
+#include <ctype.h>
+#include "mips-tdep.h"

 \f
 
 /* Breakpoint types.  Values 0, 1, and 2 must agree with the watch
 \f
 
 /* Breakpoint types.  Values 0, 1, and 2 must agree with the watch


@@ -75,9 +69,8 @@ static void mips_send_command (const char *cmd, int prompt);
 
 static int mips_receive_packet (char *buff, int throw_error, int timeout);
 
 
 static int mips_receive_packet (char *buff, int throw_error, int timeout);
 

-static CORE_ADDR mips_request (int cmd, CORE_ADDR addr,
-                              CORE_ADDR data, int *perr, int timeout,
-                              char *buff);
+static ULONGEST mips_request (int cmd, ULONGEST addr, ULONGEST data,
+                             int *perr, int timeout, char *buff);

 
 static void mips_initialize (void);
 
 
 static void mips_initialize (void);
 


@@ -93,30 +86,32 @@ static void mips_close (int quitting);
 
 static void mips_detach (char *args, int from_tty);
 
 
 static void mips_detach (char *args, int from_tty);
 

-static void mips_resume (int pid, int step, enum target_signal siggnal);
+static void mips_resume (ptid_t ptid, int step,
+                         enum target_signal siggnal);

 
 

-static int mips_wait (int pid, struct target_waitstatus *status);
+static ptid_t mips_wait (ptid_t ptid,
+                               struct target_waitstatus *status);

 
 static int mips_map_regno (int regno);
 
 
 static int mips_map_regno (int regno);
 

-static void mips_fetch_registers (int regno);
+static void mips_fetch_registers (struct regcache *regcache, int regno);

 
 

-static void mips_prepare_to_store (void);
+static void mips_prepare_to_store (struct regcache *regcache);

 
 

-static void mips_store_registers (int regno);
+static void mips_store_registers (struct regcache *regcache, int regno);

 
 static unsigned int mips_fetch_word (CORE_ADDR addr);
 
 static int mips_store_word (CORE_ADDR addr, unsigned int value,
                            char *old_contents);
 
 
 static unsigned int mips_fetch_word (CORE_ADDR addr);
 
 static int mips_store_word (CORE_ADDR addr, unsigned int value,
                            char *old_contents);
 

-static int mips_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
-                            int write, struct target_ops *ignore);
+static int mips_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
+                            int write, 
+                            struct mem_attrib *attrib,
+                            struct target_ops *target);

 
 static void mips_files_info (struct target_ops *ignore);
 
 
 static void mips_files_info (struct target_ops *ignore);
 

-static void mips_create_inferior (char *execfile, char *args, char **env);
-

 static void mips_mourn_inferior (void);
 
 static int pmon_makeb64 (unsigned long v, char *p, int n, int *chksum);
 static void mips_mourn_inferior (void);
 
 static int pmon_makeb64 (unsigned long v, char *p, int n, int *chksum);


@@ -356,7 +351,7 @@ static int mips_send_retries = 10;
 
 /* The number of garbage characters to accept when looking for an
    SYN for the next packet.  */
 
 /* The number of garbage characters to accept when looking for an
    SYN for the next packet.  */

-static int mips_syn_garbage = 1050;
+static int mips_syn_garbage = 10;

 
 /* The time to wait for a packet, in seconds.  */
 static int mips_receive_wait = 5;
 
 /* The time to wait for a packet, in seconds.  */
 static int mips_receive_wait = 5;


@@ -366,10 +361,10 @@ static int mips_receive_wait = 5;
 static int mips_need_reply = 0;
 
 /* Handle used to access serial I/O stream.  */
 static int mips_need_reply = 0;
 
 /* Handle used to access serial I/O stream.  */

-static serial_t mips_desc;
+static struct serial *mips_desc;

 
 /* UDP handle used to download files to target.  */
 
 /* UDP handle used to download files to target.  */

-static serial_t udp_desc;
+static struct serial *udp_desc;

 static int udp_in_use;
 
 /* TFTP filename used to download files to DDB board, in the form
 static int udp_in_use;
 
 /* TFTP filename used to download files to DDB board, in the form


@@ -456,14 +451,14 @@ static int monitor_warnings;
 
 
 static void
 
 
 static void

-close_ports ()
+close_ports (void)

 {
   mips_is_open = 0;
 {
   mips_is_open = 0;

-  SERIAL_CLOSE (mips_desc);
+  serial_close (mips_desc);

 
   if (udp_in_use)
     {
 
   if (udp_in_use)
     {

-      SERIAL_CLOSE (udp_desc);
+      serial_close (udp_desc);

       udp_in_use = 0;
     }
   tftp_in_use = 0;
       udp_in_use = 0;
     }
   tftp_in_use = 0;


@@ -485,7 +480,7 @@ mips_error (char *string,...)
   wrap_here ("");              /* Force out any buffered output */
   gdb_flush (gdb_stdout);
   if (error_pre_print)
   wrap_here ("");              /* Force out any buffered output */
   gdb_flush (gdb_stdout);
   if (error_pre_print)

-    fprintf_filtered (gdb_stderr, error_pre_print);
+    fputs_filtered (error_pre_print, gdb_stderr);

   vfprintf_filtered (gdb_stderr, string, args);
   fprintf_filtered (gdb_stderr, "\n");
   va_end (args);
   vfprintf_filtered (gdb_stderr, string, args);
   fprintf_filtered (gdb_stderr, "\n");
   va_end (args);


@@ -499,16 +494,14 @@ mips_error (char *string,...)
   printf_unfiltered ("Ending remote MIPS debugging.\n");
   target_mourn_inferior ();
 
   printf_unfiltered ("Ending remote MIPS debugging.\n");
   target_mourn_inferior ();
 

-  return_to_top_level (RETURN_ERROR);
+  deprecated_throw_reason (RETURN_ERROR);

 }
 
 /* putc_readable - print a character, displaying non-printable chars in
    ^x notation or in hex.  */
 
 static void
 }
 
 /* putc_readable - print a character, displaying non-printable chars in
    ^x notation or in hex.  */
 
 static void

-fputc_readable (ch, file)
-     int ch;
-     struct ui_file *file;
+fputc_readable (int ch, struct ui_file *file)

 {
   if (ch == '\n')
     fputc_unfiltered ('\n', file);
 {
   if (ch == '\n')
     fputc_unfiltered ('\n', file);


@@ -527,9 +520,7 @@ fputc_readable (ch, file)
    ^x notation or in hex.  */
 
 static void
    ^x notation or in hex.  */
 
 static void

-fputs_readable (string, file)
-     char *string;
-     struct ui_file *file;
+fputs_readable (const char *string, struct ui_file *file)

 {
   int c;
 
 {
   int c;
 


@@ -542,12 +533,10 @@ fputs_readable (string, file)
    timed out.  TIMEOUT specifies timeout value in seconds.
  */
 
    timed out.  TIMEOUT specifies timeout value in seconds.
  */
 

-int
-mips_expect_timeout (string, timeout)
-     char *string;
-     int timeout;
+static int
+mips_expect_timeout (const char *string, int timeout)

 {
 {

-  char *p = string;
+  const char *p = string;

 
   if (remote_debug)
     {
 
   if (remote_debug)
     {


@@ -556,15 +545,15 @@ mips_expect_timeout (string, timeout)
       fprintf_unfiltered (gdb_stdlog, "\", got \"");
     }
 
       fprintf_unfiltered (gdb_stdlog, "\", got \"");
     }
 

-  immediate_quit = 1;
+  immediate_quit++;

   while (1)
     {
       int c;
 
   while (1)
     {
       int c;
 

-/* Must use SERIAL_READCHAR here cuz mips_readchar would get confused if we
-   were waiting for the mips_monitor_prompt... */
+      /* Must use serial_readchar() here cuz mips_readchar would get
+        confused if we were waiting for the mips_monitor_prompt... */

 
 

-      c = SERIAL_READCHAR (mips_desc, timeout);
+      c = serial_readchar (mips_desc, timeout);

 
       if (c == SERIAL_TIMEOUT)
        {
 
       if (c == SERIAL_TIMEOUT)
        {


@@ -580,7 +569,7 @@ mips_expect_timeout (string, timeout)
        {
          if (*p == '\0')
            {
        {
          if (*p == '\0')
            {

-             immediate_quit = 0;
+             immediate_quit--;

              if (remote_debug)
                fprintf_unfiltered (gdb_stdlog, "\": OK\n");
              return 1;
              if (remote_debug)
                fprintf_unfiltered (gdb_stdlog, "\": OK\n");
              return 1;


@@ -600,50 +589,20 @@ mips_expect_timeout (string, timeout)
    mips_expect_timeout if a different timeout value is needed.
  */
 
    mips_expect_timeout if a different timeout value is needed.
  */
 

-int
-mips_expect (string)
-     char *string;
+static int
+mips_expect (const char *string)

 {
 {

-  return mips_expect_timeout (string, 2);
-}
-
-/* Read the required number of characters into the given buffer (which
-   is assumed to be large enough). The only failure is a timeout. */
-int
-mips_getstring (string, n)
-     char *string;
-     int n;
-{
-  char *p = string;
-  int c;
-
-  immediate_quit = 1;
-  while (n > 0)
-    {
-      c = SERIAL_READCHAR (mips_desc, 2);
-
-      if (c == SERIAL_TIMEOUT)
-       {
-         fprintf_unfiltered (gdb_stderr,
-                "Failed to read %d characters from target (TIMEOUT)\n", n);
-         return 0;
-       }
-
-      *p++ = c;
-      n--;
-    }
-
-  return 1;
+  return mips_expect_timeout (string, remote_timeout);

 }
 
 /* Read a character from the remote, aborting on error.  Returns
 }
 
 /* Read a character from the remote, aborting on error.  Returns

-   SERIAL_TIMEOUT on timeout (since that's what SERIAL_READCHAR
-   returns).  FIXME: If we see the string mips_monitor_prompt from
-   the board, then we are debugging on the main console port, and we
-   have somehow dropped out of remote debugging mode.  In this case,
-   we automatically go back in to remote debugging mode.  This is a
-   hack, put in because I can't find any way for a program running on
-   the remote board to terminate without also ending remote debugging
+   SERIAL_TIMEOUT on timeout (since that's what serial_readchar()
+   returns).  FIXME: If we see the string mips_monitor_prompt from the
+   board, then we are debugging on the main console port, and we have
+   somehow dropped out of remote debugging mode.  In this case, we
+   automatically go back in to remote debugging mode.  This is a hack,
+   put in because I can't find any way for a program running on the
+   remote board to terminate without also ending remote debugging

    mode.  I assume users won't have any trouble with this; for one
    thing, the IDT documentation generally assumes that the remote
    debugging port is not the console port.  This is, however, very
    mode.  I assume users won't have any trouble with this; for one
    thing, the IDT documentation generally assumes that the remote
    debugging port is not the console port.  This is, however, very


@@ -651,8 +610,7 @@ mips_getstring (string, n)
    port.  */
 
 static int
    port.  */
 
 static int

-mips_readchar (timeout)
-     int timeout;
+mips_readchar (int timeout)

 {
   int ch;
   static int state = 0;
 {
   int ch;
   static int state = 0;


@@ -668,7 +626,7 @@ mips_readchar (timeout)
 
   if (state == mips_monitor_prompt_len)
     timeout = 1;
 
   if (state == mips_monitor_prompt_len)
     timeout = 1;

-  ch = SERIAL_READCHAR (mips_desc, timeout);
+  ch = serial_readchar (mips_desc, timeout);

 
   if (ch == SERIAL_TIMEOUT && timeout == -1)   /* Watchdog went off */
     {
 
   if (ch == SERIAL_TIMEOUT && timeout == -1)   /* Watchdog went off */
     {


@@ -730,11 +688,7 @@ mips_readchar (timeout)
    or -1 for timeout.  */
 
 static int
    or -1 for timeout.  */
 
 static int

-mips_receive_header (hdr, pgarbage, ch, timeout)
-     unsigned char *hdr;
-     int *pgarbage;
-     int ch;
-     int timeout;
+mips_receive_header (unsigned char *hdr, int *pgarbage, int ch, int timeout)

 {
   int i;
 
 {
   int i;
 


@@ -753,15 +707,26 @@ mips_receive_header (hdr, pgarbage, ch, timeout)
            {
              /* Printing the character here lets the user of gdb see
                 what the program is outputting, if the debugging is
            {
              /* Printing the character here lets the user of gdb see
                 what the program is outputting, if the debugging is

-                being done on the console port.  Don't use _filtered;
-                we can't deal with a QUIT out of target_wait.  */
-             if (!mips_initializing || remote_debug > 0)
-               {
-                 fputc_readable (ch, gdb_stdlog);
-                 gdb_flush (gdb_stdlog);
-               }
+                being done on the console port.  Don't use _filtered:
+                we can't deal with a QUIT out of target_wait and
+                buffered target output confuses the user. */
+             if (!mips_initializing || remote_debug > 0)
+               {
+                 if (isprint (ch) || isspace (ch))
+                   {
+                     fputc_unfiltered (ch, gdb_stdtarg);
+                   }
+                 else
+                   {
+                     fputc_readable (ch, gdb_stdtarg);
+                   }
+                 gdb_flush (gdb_stdtarg);
+               }
+             
+             /* Only count unprintable characters. */
+             if (! (isprint (ch) || isspace (ch)))
+               (*pgarbage) += 1;

 
 

-             ++*pgarbage;

              if (mips_syn_garbage > 0
                  && *pgarbage > mips_syn_garbage)
                mips_error ("Debug protocol failure:  more than %d characters before a sync.",
              if (mips_syn_garbage > 0
                  && *pgarbage > mips_syn_garbage)
                mips_error ("Debug protocol failure:  more than %d characters before a sync.",


@@ -795,11 +760,7 @@ mips_receive_header (hdr, pgarbage, ch, timeout)
    for success, -1 for timeout, -2 for error.  */
 
 static int
    for success, -1 for timeout, -2 for error.  */
 
 static int

-mips_receive_trailer (trlr, pgarbage, pch, timeout)
-     unsigned char *trlr;
-     int *pgarbage;
-     int *pch;
-     int timeout;
+mips_receive_trailer (unsigned char *trlr, int *pgarbage, int *pch, int timeout)

 {
   int i;
   int ch;
 {
   int i;
   int ch;


@@ -821,14 +782,11 @@ mips_receive_trailer (trlr, pgarbage, pch, timeout)
    DATA points to the packet data.  LEN is the length of DATA.  */
 
 static int
    DATA points to the packet data.  LEN is the length of DATA.  */
 
 static int

-mips_cksum (hdr, data, len)
-     const unsigned char *hdr;
-     const unsigned char *data;
-     int len;
+mips_cksum (const unsigned char *hdr, const unsigned char *data, int len)

 {
 {

-  register const unsigned char *p;
-  register int c;
-  register int cksum;
+  const unsigned char *p;
+  int c;
+  int cksum;

 
   cksum = 0;
 
 
   cksum = 0;
 


@@ -849,13 +807,11 @@ mips_cksum (hdr, data, len)
 /* Send a packet containing the given ASCII string.  */
 
 static void
 /* Send a packet containing the given ASCII string.  */
 
 static void

-mips_send_packet (s, get_ack)
-     const char *s;
-     int get_ack;
+mips_send_packet (const char *s, int get_ack)

 {
   /* unsigned */ int len;
   unsigned char *packet;
 {
   /* unsigned */ int len;
   unsigned char *packet;

-  register int cksum;
+  int cksum;

   int try;
 
   len = strlen (s);
   int try;
 
   len = strlen (s);


@@ -896,7 +852,7 @@ mips_send_packet (s, get_ack)
          fprintf_unfiltered (gdb_stdlog, "Writing \"%s\"\n", packet + 1);
        }
 
          fprintf_unfiltered (gdb_stdlog, "Writing \"%s\"\n", packet + 1);
        }
 

-      if (SERIAL_WRITE (mips_desc, packet,
+      if (serial_write (mips_desc, packet,

                        HDR_LENGTH + len + TRLR_LENGTH) != 0)
        mips_error ("write to target failed: %s", safe_strerror (errno));
 
                        HDR_LENGTH + len + TRLR_LENGTH) != 0)
        mips_error ("write to target failed: %s", safe_strerror (errno));
 


@@ -937,7 +893,7 @@ mips_send_packet (s, get_ack)
                {
                  int rch;
 
                {
                  int rch;
 

-                 rch = mips_readchar (2);
+                 rch = mips_readchar (remote_timeout);

                  if (rch == SYN)
                    {
                      ch = SYN;
                  if (rch == SYN)
                    {
                      ch = SYN;


@@ -949,7 +905,8 @@ mips_send_packet (s, get_ack)
                }
 
              if (i == len)
                }
 
              if (i == len)

-               (void) mips_receive_trailer (trlr, &garbage, &ch, 2);
+               (void) mips_receive_trailer (trlr, &garbage, &ch,
+                                            remote_timeout);

 
              /* We don't bother checking the checksum, or providing an
                 ACK to the packet. */
 
              /* We don't bother checking the checksum, or providing an
                 ACK to the packet. */


@@ -1016,10 +973,7 @@ mips_send_packet (s, get_ack)
    don't print an error message and return -1.  */
 
 static int
    don't print an error message and return -1.  */
 
 static int

-mips_receive_packet (buff, throw_error, timeout)
-     char *buff;
-     int throw_error;
-     int timeout;
+mips_receive_packet (char *buff, int throw_error, int timeout)

 {
   int ch;
   int garbage;
 {
   int ch;
   int garbage;


@@ -1158,7 +1112,7 @@ mips_receive_packet (buff, throw_error, timeout)
                             ack + 1);
        }
 
                             ack + 1);
        }
 

-      if (SERIAL_WRITE (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)
+      if (serial_write (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)

        {
          if (throw_error)
            mips_error ("write to target failed: %s", safe_strerror (errno));
        {
          if (throw_error)
            mips_error ("write to target failed: %s", safe_strerror (errno));


@@ -1198,7 +1152,7 @@ mips_receive_packet (buff, throw_error, timeout)
                         ack + 1);
     }
 
                         ack + 1);
     }
 

-  if (SERIAL_WRITE (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)
+  if (serial_write (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)

     {
       if (throw_error)
        mips_error ("write to target failed: %s", safe_strerror (errno));
     {
       if (throw_error)
        mips_error ("write to target failed: %s", safe_strerror (errno));


@@ -1234,14 +1188,13 @@ mips_receive_packet (buff, throw_error, timeout)
    occurs, it sets *PERR to 1 and sets errno according to what the
    target board reports.  */
 
    occurs, it sets *PERR to 1 and sets errno according to what the
    target board reports.  */
 

-static CORE_ADDR
-mips_request (cmd, addr, data, perr, timeout, buff)
-     int cmd;
-     CORE_ADDR addr;
-     CORE_ADDR data;
-     int *perr;
-     int timeout;
-     char *buff;
+static ULONGEST
+mips_request (int cmd,
+             ULONGEST addr,
+             ULONGEST data,
+             int *perr,
+             int timeout,
+             char *buff)

 {
   char myBuff[DATA_MAXLEN + 1];
   int len;
 {
   char myBuff[DATA_MAXLEN + 1];
   int len;


@@ -1256,7 +1209,8 @@ mips_request (cmd, addr, data, perr, timeout, buff)
   if (cmd != '\0')
     {
       if (mips_need_reply)
   if (cmd != '\0')
     {
       if (mips_need_reply)

-       internal_error ("mips_request: Trying to send command before reply");
+       internal_error (__FILE__, __LINE__,
+                       _("mips_request: Trying to send command before reply"));

       sprintf (buff, "0x0 %c 0x%s 0x%s", cmd, paddr_nz (addr), paddr_nz (data));
       mips_send_packet (buff, 1);
       mips_need_reply = 1;
       sprintf (buff, "0x0 %c 0x%s 0x%s", cmd, paddr_nz (addr), paddr_nz (data));
       mips_send_packet (buff, 1);
       mips_need_reply = 1;


@@ -1266,7 +1220,8 @@ mips_request (cmd, addr, data, perr, timeout, buff)
     return 0;
 
   if (!mips_need_reply)
     return 0;
 
   if (!mips_need_reply)

-    internal_error ("mips_request: Trying to get reply before command");
+    internal_error (__FILE__, __LINE__,
+                   _("mips_request: Trying to get reply before command"));

 
   mips_need_reply = 0;
 
 
   mips_need_reply = 0;
 


@@ -1296,25 +1251,21 @@ mips_request (cmd, addr, data, perr, timeout, buff)
 }
 
 static void
 }
 
 static void

-mips_initialize_cleanups (arg)
-     PTR arg;
+mips_initialize_cleanups (void *arg)

 {
   mips_initializing = 0;
 }
 
 static void
 {
   mips_initializing = 0;
 }
 
 static void

-mips_exit_cleanups (arg)
-     PTR arg;
+mips_exit_cleanups (void *arg)

 {
   mips_exiting = 0;
 }
 
 static void
 {
   mips_exiting = 0;
 }
 
 static void

-mips_send_command (cmd, prompt)
-     const char *cmd;
-     int prompt;
+mips_send_command (const char *cmd, int prompt)

 {
 {

-  SERIAL_WRITE (mips_desc, cmd, strlen (cmd));
+  serial_write (mips_desc, cmd, strlen (cmd));

   mips_expect (cmd);
   mips_expect ("\n");
   if (prompt)
   mips_expect (cmd);
   mips_expect ("\n");
   if (prompt)


@@ -1323,7 +1274,7 @@ mips_send_command (cmd, prompt)
 
 /* Enter remote (dbx) debug mode: */
 static void
 
 /* Enter remote (dbx) debug mode: */
 static void

-mips_enter_debug ()
+mips_enter_debug (void)

 {
   /* Reset the sequence numbers, ready for the new debug sequence: */
   mips_send_seq = 0;
 {
   /* Reset the sequence numbers, ready for the new debug sequence: */
   mips_send_seq = 0;


@@ -1335,7 +1286,7 @@ mips_enter_debug ()
     mips_send_command ("db tty0\r", 0);
 
   sleep (1);
     mips_send_command ("db tty0\r", 0);
 
   sleep (1);

-  SERIAL_WRITE (mips_desc, "\r", sizeof "\r" - 1);
+  serial_write (mips_desc, "\r", sizeof "\r" - 1);

 
   /* We don't need to absorb any spurious characters here, since the
      mips_receive_header will eat up a reasonable number of characters
 
   /* We don't need to absorb any spurious characters here, since the
      mips_receive_header will eat up a reasonable number of characters


@@ -1353,7 +1304,7 @@ mips_enter_debug ()
 
 /* Exit remote (dbx) debug mode, returning to the monitor prompt: */
 static int
 
 /* Exit remote (dbx) debug mode, returning to the monitor prompt: */
 static int

-mips_exit_debug ()
+mips_exit_debug (void)

 {
   int err;
   struct cleanup *old_cleanups = make_cleanup (mips_exit_cleanups, NULL);
 {
   int err;
   struct cleanup *old_cleanups = make_cleanup (mips_exit_cleanups, NULL);


@@ -1364,15 +1315,13 @@ mips_exit_debug ()
     {
       /* The DDB (NEC) and MiniRISC (LSI) versions of PMON exit immediately,
          so we do not get a reply to this command: */
     {
       /* The DDB (NEC) and MiniRISC (LSI) versions of PMON exit immediately,
          so we do not get a reply to this command: */

-      mips_request ('x', (unsigned int) 0, (unsigned int) 0, NULL,
-                   mips_receive_wait, NULL);
+      mips_request ('x', 0, 0, NULL, mips_receive_wait, NULL);

       mips_need_reply = 0;
       if (!mips_expect (" break!"))
        return -1;
     }
   else
       mips_need_reply = 0;
       if (!mips_expect (" break!"))
        return -1;
     }
   else

-    mips_request ('x', (unsigned int) 0, (unsigned int) 0, &err,
-                 mips_receive_wait, NULL);
+    mips_request ('x', 0, 0, &err, mips_receive_wait, NULL);

 
   if (!mips_expect (mips_monitor_prompt))
     return -1;
 
   if (!mips_expect (mips_monitor_prompt))
     return -1;


@@ -1386,7 +1335,7 @@ mips_exit_debug ()
    really connected.  */
 
 static void
    really connected.  */
 
 static void

-mips_initialize ()
+mips_initialize (void)

 {
   int err;
   struct cleanup *old_cleanups = make_cleanup (mips_initialize_cleanups, NULL);
 {
   int err;
   struct cleanup *old_cleanups = make_cleanup (mips_initialize_cleanups, NULL);


@@ -1419,14 +1368,14 @@ mips_initialize ()
       switch (j)
        {
        case 0:         /* First, try sending a CR */
       switch (j)
        {
        case 0:         /* First, try sending a CR */

-         SERIAL_FLUSH_INPUT (mips_desc);
-         SERIAL_WRITE (mips_desc, "\r", 1);
+         serial_flush_input (mips_desc);
+         serial_write (mips_desc, "\r", 1);

          break;
        case 1:         /* First, try sending a break */
          break;
        case 1:         /* First, try sending a break */

-         SERIAL_SEND_BREAK (mips_desc);
+         serial_send_break (mips_desc);

          break;
        case 2:         /* Then, try a ^C */
          break;
        case 2:         /* Then, try a ^C */

-         SERIAL_WRITE (mips_desc, "\003", 1);
+         serial_write (mips_desc, "\003", 1);

          break;
        case 3:         /* Then, try escaping from download */
          {
          break;
        case 3:         /* Then, try escaping from download */
          {


@@ -1440,9 +1389,9 @@ mips_initialize ()
                   packets. In-case we were downloading a large packet
                   we flush the output buffer before inserting a
                   termination sequence. */
                   packets. In-case we were downloading a large packet
                   we flush the output buffer before inserting a
                   termination sequence. */

-               SERIAL_FLUSH_OUTPUT (mips_desc);
+               serial_flush_output (mips_desc);

                sprintf (tbuff, "\r/E/E\r");
                sprintf (tbuff, "\r/E/E\r");

-               SERIAL_WRITE (mips_desc, tbuff, 6);
+               serial_write (mips_desc, tbuff, 6);

              }
            else
              {
              }
            else
              {


@@ -1462,9 +1411,9 @@ mips_initialize ()
 
                for (i = 1; i <= 33; i++)
                  {
 
                for (i = 1; i <= 33; i++)
                  {

-                   SERIAL_WRITE (mips_desc, srec, 8);
+                   serial_write (mips_desc, srec, 8);

 
 

-                   if (SERIAL_READCHAR (mips_desc, 0) >= 0)
+                   if (serial_readchar (mips_desc, 0) >= 0)

                      break;    /* Break immediatly if we get something from
                                   the board. */
                  }
                      break;    /* Break immediatly if we get something from
                                   the board. */
                  }


@@ -1512,20 +1461,14 @@ mips_initialize ()
   /* If this doesn't call error, we have connected; we don't care if
      the request itself succeeds or fails.  */
 
   /* If this doesn't call error, we have connected; we don't care if
      the request itself succeeds or fails.  */
 

-  mips_request ('r', (unsigned int) 0, (unsigned int) 0, &err,
-               mips_receive_wait, NULL);
-  set_current_frame (create_new_frame (read_fp (), read_pc ()));
-  select_frame (get_current_frame (), 0);
+  mips_request ('r', 0, 0, &err, mips_receive_wait, NULL);

 }
 
 /* Open a connection to the remote board.  */
 static void
 }
 
 /* Open a connection to the remote board.  */
 static void

-common_open (ops, name, from_tty, new_monitor, new_monitor_prompt)
-     struct target_ops *ops;
-     char *name;
-     int from_tty;
-     enum mips_monitor_type new_monitor;
-     char *new_monitor_prompt;
+common_open (struct target_ops *ops, char *name, int from_tty,
+            enum mips_monitor_type new_monitor,
+            const char *new_monitor_prompt)

 {
   char *ptype;
   char *serial_port_name;
 {
   char *ptype;
   char *serial_port_name;


@@ -1550,7 +1493,7 @@ device is attached to the target board (e.g., /dev/ttya).\n"
     nomem (0);
   make_cleanup_freeargv (argv);
 
     nomem (0);
   make_cleanup_freeargv (argv);
 

-  serial_port_name = strsave (argv[0]);
+  serial_port_name = xstrdup (argv[0]);

   if (argv[1])                 /* remote TFTP name specified? */
     {
       remote_name = argv[1];
   if (argv[1])                 /* remote TFTP name specified? */
     {
       remote_name = argv[1];


@@ -1564,20 +1507,20 @@ device is attached to the target board (e.g., /dev/ttya).\n"
     unpush_target (current_ops);
 
   /* Open and initialize the serial port.  */
     unpush_target (current_ops);
 
   /* Open and initialize the serial port.  */

-  mips_desc = SERIAL_OPEN (serial_port_name);
-  if (mips_desc == (serial_t) NULL)
+  mips_desc = serial_open (serial_port_name);
+  if (mips_desc == NULL)

     perror_with_name (serial_port_name);
 
   if (baud_rate != -1)
     {
     perror_with_name (serial_port_name);
 
   if (baud_rate != -1)
     {

-      if (SERIAL_SETBAUDRATE (mips_desc, baud_rate))
+      if (serial_setbaudrate (mips_desc, baud_rate))

        {
        {

-         SERIAL_CLOSE (mips_desc);
+         serial_close (mips_desc);

          perror_with_name (serial_port_name);
        }
     }
 
          perror_with_name (serial_port_name);
        }
     }
 

-  SERIAL_RAW (mips_desc);
+  serial_raw (mips_desc);

 
   /* Open and initialize the optional download port.  If it is in the form
      hostname#portnumber, it's a UDP socket.  If it is in the form
 
   /* Open and initialize the optional download port.  If it is in the form
      hostname#portnumber, it's a UDP socket.  If it is in the form


@@ -1587,7 +1530,7 @@ device is attached to the target board (e.g., /dev/ttya).\n"
     {
       if (strchr (remote_name, '#'))
        {
     {
       if (strchr (remote_name, '#'))
        {

-         udp_desc = SERIAL_OPEN (remote_name);
+         udp_desc = serial_open (remote_name);

          if (!udp_desc)
            perror_with_name ("Unable to open UDP port");
          udp_in_use = 1;
          if (!udp_desc)
            perror_with_name ("Unable to open UDP port");
          udp_in_use = 1;


@@ -1598,16 +1541,16 @@ device is attached to the target board (e.g., /dev/ttya).\n"
             the user didn't specify a local name, assume it's the same
             as the part of the remote name after the "host:".  */
          if (tftp_name)
             the user didn't specify a local name, assume it's the same
             as the part of the remote name after the "host:".  */
          if (tftp_name)

-           free (tftp_name);
+           xfree (tftp_name);

          if (tftp_localname)
          if (tftp_localname)

-           free (tftp_localname);
+           xfree (tftp_localname);

          if (local_name == NULL)
            if ((local_name = strchr (remote_name, ':')) != NULL)
              local_name++;     /* skip over the colon */
          if (local_name == NULL)
            local_name = remote_name;   /* local name same as remote name */
          if (local_name == NULL)
            if ((local_name = strchr (remote_name, ':')) != NULL)
              local_name++;     /* skip over the colon */
          if (local_name == NULL)
            local_name = remote_name;   /* local name same as remote name */

-         tftp_name = strsave (remote_name);
-         tftp_localname = strsave (local_name);
+         tftp_name = xstrdup (remote_name);
+         tftp_localname = xstrdup (local_name);

          tftp_in_use = 1;
        }
     }
          tftp_in_use = 1;
        }
     }


@@ -1617,7 +1560,7 @@ device is attached to the target board (e.g., /dev/ttya).\n"
 
   /* Reset the expected monitor prompt if it's never been set before.  */
   if (mips_monitor_prompt == NULL)
 
   /* Reset the expected monitor prompt if it's never been set before.  */
   if (mips_monitor_prompt == NULL)

-    mips_monitor_prompt = strsave (new_monitor_prompt);
+    mips_monitor_prompt = xstrdup (new_monitor_prompt);

   mips_monitor = new_monitor;
 
   mips_initialize ();
   mips_monitor = new_monitor;
 
   mips_initialize ();


@@ -1631,52 +1574,57 @@ device is attached to the target board (e.g., /dev/ttya).\n"
   /* FIXME: Should we call start_remote here?  */
 
   /* Try to figure out the processor model if possible.  */
   /* FIXME: Should we call start_remote here?  */
 
   /* Try to figure out the processor model if possible.  */

-  ptype = mips_read_processor_type ();
-  if (ptype)
-    mips_set_processor_type_command (strsave (ptype), 0);
+  deprecated_mips_set_processor_regs_hack ();

 
 

-/* This is really the job of start_remote however, that makes an assumption
-   that the target is about to print out a status message of some sort.  That
-   doesn't happen here (in fact, it may not be possible to get the monitor to
-   send the appropriate packet).  */
+  /* This is really the job of start_remote however, that makes an
+     assumption that the target is about to print out a status message
+     of some sort.  That doesn't happen here (in fact, it may not be
+     possible to get the monitor to send the appropriate packet).  */

 
 

-  flush_cached_frames ();
+  reinit_frame_cache ();

   registers_changed ();
   stop_pc = read_pc ();
   registers_changed ();
   stop_pc = read_pc ();

-  set_current_frame (create_new_frame (read_fp (), stop_pc));
-  select_frame (get_current_frame (), 0);
-  print_stack_frame (selected_frame, -1, 1);
-  free (serial_port_name);
+  print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC);
+  xfree (serial_port_name);

 }
 
 static void
 }
 
 static void

-mips_open (name, from_tty)
-     char *name;
-     int from_tty;
+mips_open (char *name, int from_tty)

 {
 {

-  common_open (&mips_ops, name, from_tty, MON_IDT, TARGET_MONITOR_PROMPT);
+  const char *monitor_prompt = NULL;
+  if (gdbarch_bfd_arch_info (current_gdbarch) != NULL
+      && gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_mips)
+    {
+    switch (gdbarch_bfd_arch_info (current_gdbarch)->mach)
+      {
+      case bfd_mach_mips4100:
+      case bfd_mach_mips4300:
+      case bfd_mach_mips4600:
+      case bfd_mach_mips4650:
+      case bfd_mach_mips5000:
+       monitor_prompt = "<RISQ> ";
+       break;
+      }
+    }
+  if (monitor_prompt == NULL)
+    monitor_prompt = "<IDT>";
+  common_open (&mips_ops, name, from_tty, MON_IDT, monitor_prompt);

 }
 
 static void
 }
 
 static void

-pmon_open (name, from_tty)
-     char *name;
-     int from_tty;
+pmon_open (char *name, int from_tty)

 {
   common_open (&pmon_ops, name, from_tty, MON_PMON, "PMON> ");
 }
 
 static void
 {
   common_open (&pmon_ops, name, from_tty, MON_PMON, "PMON> ");
 }
 
 static void

-ddb_open (name, from_tty)
-     char *name;
-     int from_tty;
+ddb_open (char *name, int from_tty)

 {
   common_open (&ddb_ops, name, from_tty, MON_DDB, "NEC010>");
 }
 
 static void
 {
   common_open (&ddb_ops, name, from_tty, MON_DDB, "NEC010>");
 }
 
 static void

-lsi_open (name, from_tty)
-     char *name;
-     int from_tty;
+lsi_open (char *name, int from_tty)

 {
   int i;
 
 {
   int i;
 


@@ -1690,8 +1638,7 @@ lsi_open (name, from_tty)
 /* Close a connection to the remote board.  */
 
 static void
 /* Close a connection to the remote board.  */
 
 static void

-mips_close (quitting)
-     int quitting;
+mips_close (int quitting)

 {
   if (mips_is_open)
     {
 {
   if (mips_is_open)
     {


@@ -1705,9 +1652,7 @@ mips_close (quitting)
 /* Detach from the remote board.  */
 
 static void
 /* Detach from the remote board.  */
 
 static void

-mips_detach (args, from_tty)
-     char *args;
-     int from_tty;
+mips_detach (char *args, int from_tty)

 {
   if (args)
     error ("Argument given to \"detach\" when remotely debugging.");
 {
   if (args)
     error ("Argument given to \"detach\" when remotely debugging.");


@@ -1725,26 +1670,21 @@ mips_detach (args, from_tty)
    where PMON does return a reply.  */
 
 static void
    where PMON does return a reply.  */
 
 static void

-mips_resume (pid, step, siggnal)
-     int pid, step;
-     enum target_signal siggnal;
+mips_resume (ptid_t ptid, int step, enum target_signal siggnal)

 {
   int err;
 
   /* LSI PMON requires returns a reply packet "0x1 s 0x0 0x57f" after
      a single step, so we wait for that.  */
 {
   int err;
 
   /* LSI PMON requires returns a reply packet "0x1 s 0x0 0x57f" after
      a single step, so we wait for that.  */

-  mips_request (step ? 's' : 'c',
-               (unsigned int) 1,
-               (unsigned int) siggnal,
+  mips_request (step ? 's' : 'c', 1, siggnal,

                mips_monitor == MON_LSI && step ? &err : (int *) NULL,
                mips_receive_wait, NULL);
 }
 
 /* Return the signal corresponding to SIG, where SIG is the number which
    the MIPS protocol uses for the signal.  */
                mips_monitor == MON_LSI && step ? &err : (int *) NULL,
                mips_receive_wait, NULL);
 }
 
 /* Return the signal corresponding to SIG, where SIG is the number which
    the MIPS protocol uses for the signal.  */

-enum target_signal
-mips_signal_from_protocol (sig)
-     int sig;
+static enum target_signal
+mips_signal_from_protocol (int sig)

 {
   /* We allow a few more signals than the IDT board actually returns, on
      the theory that there is at least *some* hope that perhaps the numbering
 {
   /* We allow a few more signals than the IDT board actually returns, on
      the theory that there is at least *some* hope that perhaps the numbering


@@ -1762,10 +1702,8 @@ mips_signal_from_protocol (sig)
 
 /* Wait until the remote stops, and return a wait status.  */
 
 
 /* Wait until the remote stops, and return a wait status.  */
 

-static int
-mips_wait (pid, status)
-     int pid;
-     struct target_waitstatus *status;
+static ptid_t
+mips_wait (ptid_t ptid, struct target_waitstatus *status)

 {
   int rstatus;
   int err;
 {
   int rstatus;
   int err;


@@ -1785,13 +1723,12 @@ mips_wait (pid, status)
     {
       status->kind = TARGET_WAITKIND_STOPPED;
       status->value.sig = TARGET_SIGNAL_TRAP;
     {
       status->kind = TARGET_WAITKIND_STOPPED;
       status->value.sig = TARGET_SIGNAL_TRAP;

-      return 0;
+      return inferior_ptid;

     }
 
   /* No timeout; we sit here as long as the program continues to execute.  */
   mips_wait_flag = 1;
     }
 
   /* No timeout; we sit here as long as the program continues to execute.  */
   mips_wait_flag = 1;

-  rstatus = mips_request ('\000', (unsigned int) 0, (unsigned int) 0, &err, -1,
-                         buff);
+  rstatus = mips_request ('\000', 0, 0, &err, -1, buff);

   mips_wait_flag = 0;
   if (err)
     mips_error ("Remote failure: %s", safe_strerror (errno));
   mips_wait_flag = 0;
   if (err)
     mips_error ("Remote failure: %s", safe_strerror (errno));


@@ -1816,19 +1753,30 @@ mips_wait (pid, status)
                    &rpc, &rfp, &rsp, flags);
   if (nfields >= 3)
     {
                    &rpc, &rfp, &rsp, flags);
   if (nfields >= 3)
     {

-      char buf[MAX_REGISTER_RAW_SIZE];
+      struct regcache *regcache = get_current_regcache ();
+      struct gdbarch *gdbarch = get_regcache_arch (regcache);
+      char buf[MAX_REGISTER_SIZE];

 
 

-      store_unsigned_integer (buf, REGISTER_RAW_SIZE (PC_REGNUM), rpc);
-      supply_register (PC_REGNUM, buf);
+      store_unsigned_integer (buf,
+                             register_size
+                               (gdbarch, gdbarch_pc_regnum (gdbarch)), rpc);
+      regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch), buf);

 
 

-      store_unsigned_integer (buf, REGISTER_RAW_SIZE (PC_REGNUM), rfp);
-      supply_register (30, buf);       /* This register they are avoiding and so it is unnamed */
+      store_unsigned_integer
+       (buf, register_size (gdbarch, gdbarch_pc_regnum (gdbarch)), rfp);
+      regcache_raw_supply (regcache, 30, buf); /* This register they are avoiding and so it is unnamed */

 
 

-      store_unsigned_integer (buf, REGISTER_RAW_SIZE (SP_REGNUM), rsp);
-      supply_register (SP_REGNUM, buf);
+      store_unsigned_integer (buf, register_size (gdbarch,
+                             gdbarch_sp_regnum (gdbarch)), rsp);
+      regcache_raw_supply (regcache, gdbarch_sp_regnum (gdbarch), buf);

 
 

-      store_unsigned_integer (buf, REGISTER_RAW_SIZE (FP_REGNUM), 0);
-      supply_register (FP_REGNUM, buf);
+      store_unsigned_integer (buf,
+                             register_size (gdbarch,
+                                            gdbarch_deprecated_fp_regnum
+                                              (gdbarch)),
+                             0);
+      regcache_raw_supply (regcache,
+                          gdbarch_deprecated_fp_regnum (gdbarch), buf);

 
       if (nfields == 9)
        {
 
       if (nfields == 9)
        {


@@ -1917,62 +1865,59 @@ mips_wait (pid, status)
       status->value.sig = mips_signal_from_protocol (rstatus & 0x7f);
     }
 
       status->value.sig = mips_signal_from_protocol (rstatus & 0x7f);
     }
 

-  return 0;
+  return inferior_ptid;

 }
 
 /* We have to map between the register numbers used by gdb and the
 }
 
 /* We have to map between the register numbers used by gdb and the

-   register numbers used by the debugging protocol.  This function
-   assumes that we are using tm-mips.h.  */
+   register numbers used by the debugging protocol.  */

 
 #define REGNO_OFFSET 96
 
 static int
 
 #define REGNO_OFFSET 96
 
 static int

-mips_map_regno (regno)
-     int regno;
+mips_map_regno (int regno)

 {
   if (regno < 32)
     return regno;
 {
   if (regno < 32)
     return regno;

-  if (regno >= FP0_REGNUM && regno < FP0_REGNUM + 32)
-    return regno - FP0_REGNUM + 32;
-  switch (regno)
-    {
-    case PC_REGNUM:
-      return REGNO_OFFSET + 0;
-    case CAUSE_REGNUM:
-      return REGNO_OFFSET + 1;
-    case HI_REGNUM:
-      return REGNO_OFFSET + 2;
-    case LO_REGNUM:
-      return REGNO_OFFSET + 3;
-    case FCRCS_REGNUM:
-      return REGNO_OFFSET + 4;
-    case FCRIR_REGNUM:
-      return REGNO_OFFSET + 5;
-    default:
-      /* FIXME: Is there a way to get the status register?  */
-      return 0;
-    }
+  if (regno >= mips_regnum (current_gdbarch)->fp0
+      && regno < mips_regnum (current_gdbarch)->fp0 + 32)
+    return regno - mips_regnum (current_gdbarch)->fp0 + 32;
+  else if (regno == mips_regnum (current_gdbarch)->pc)
+    return REGNO_OFFSET + 0;
+  else if (regno == mips_regnum (current_gdbarch)->cause)
+    return REGNO_OFFSET + 1;
+  else if (regno == mips_regnum (current_gdbarch)->hi)
+    return REGNO_OFFSET + 2;
+  else if (regno == mips_regnum (current_gdbarch)->lo)
+    return REGNO_OFFSET + 3;
+  else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
+    return REGNO_OFFSET + 4;
+  else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision)
+    return REGNO_OFFSET + 5;
+  else
+    /* FIXME: Is there a way to get the status register?  */
+    return 0;

 }
 
 /* Fetch the remote registers.  */
 
 static void
 }
 
 /* Fetch the remote registers.  */
 
 static void

-mips_fetch_registers (regno)
-     int regno;
+mips_fetch_registers (struct regcache *regcache, int regno)

 {
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   unsigned LONGEST val;
   int err;
 
   if (regno == -1)
     {
   unsigned LONGEST val;
   int err;
 
   if (regno == -1)
     {

-      for (regno = 0; regno < NUM_REGS; regno++)
-       mips_fetch_registers (regno);
+      for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
+       mips_fetch_registers (regcache, regno);

       return;
     }
 
       return;
     }
 

-  if (regno == FP_REGNUM || regno == ZERO_REGNUM)
-    /* FP_REGNUM on the mips is a hack which is just supposed to read
-       zero (see also mips-nat.c).  */
+  if (regno == gdbarch_deprecated_fp_regnum (gdbarch)
+      || regno == MIPS_ZERO_REGNUM)
+    /* gdbarch_deprecated_fp_regnum on the mips is a hack which is just
+       supposed to read zero (see also mips-nat.c).  */

     val = 0;
   else
     {
     val = 0;
   else
     {


@@ -1987,11 +1932,11 @@ mips_fetch_registers (regno)
             compiled without the 64bit register access commands. This
             means we cannot get hold of the full register width. */
          if (mips_monitor == MON_DDB)
             compiled without the 64bit register access commands. This
             means we cannot get hold of the full register width. */
          if (mips_monitor == MON_DDB)

-           val = (unsigned) mips_request ('t', (unsigned int) pmon_reg,
-                          (unsigned int) 0, &err, mips_receive_wait, NULL);
+           val = (unsigned) mips_request ('t', pmon_reg, 0,
+                                          &err, mips_receive_wait, NULL);

          else
          else

-           val = mips_request ('r', (unsigned int) pmon_reg,
-                          (unsigned int) 0, &err, mips_receive_wait, NULL);
+           val = mips_request ('r', pmon_reg, 0,
+                               &err, mips_receive_wait, NULL);

          if (err)
            mips_error ("Can't read register %d: %s", regno,
                        safe_strerror (errno));
          if (err)
            mips_error ("Can't read register %d: %s", regno,
                        safe_strerror (errno));


@@ -1999,12 +1944,12 @@ mips_fetch_registers (regno)
     }
 
   {
     }
 
   {

-    char buf[MAX_REGISTER_RAW_SIZE];
+    char buf[MAX_REGISTER_SIZE];

 
     /* We got the number the register holds, but gdb expects to see a
        value in the target byte ordering.  */
 
     /* We got the number the register holds, but gdb expects to see a
        value in the target byte ordering.  */

-    store_unsigned_integer (buf, REGISTER_RAW_SIZE (regno), val);
-    supply_register (regno, buf);
+    store_unsigned_integer (buf, register_size (gdbarch, regno), val);
+    regcache_raw_supply (regcache, regno, buf);

   }
 }
 
   }
 }
 


@@ -2012,27 +1957,28 @@ mips_fetch_registers (regno)
    registers, so this function doesn't have to do anything.  */
 
 static void
    registers, so this function doesn't have to do anything.  */
 
 static void

-mips_prepare_to_store ()
+mips_prepare_to_store (struct regcache *regcache)

 {
 }
 
 /* Store remote register(s).  */
 
 static void
 {
 }
 
 /* Store remote register(s).  */
 
 static void

-mips_store_registers (regno)
-     int regno;
+mips_store_registers (struct regcache *regcache, int regno)

 {
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  ULONGEST val;

   int err;
 
   if (regno == -1)
     {
   int err;
 
   if (regno == -1)
     {

-      for (regno = 0; regno < NUM_REGS; regno++)
-       mips_store_registers (regno);
+      for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
+       mips_store_registers (regcache, regno);

       return;
     }
 
       return;
     }
 

-  mips_request ('R', (unsigned int) mips_map_regno (regno),
-               read_register (regno),
+  regcache_cooked_read_unsigned (regcache, regno, &val);
+  mips_request ('R', mips_map_regno (regno), val,

                &err, mips_receive_wait, NULL);
   if (err)
     mips_error ("Can't write register %d: %s", regno, safe_strerror (errno));
                &err, mips_receive_wait, NULL);
   if (err)
     mips_error ("Can't write register %d: %s", regno, safe_strerror (errno));


@@ -2041,20 +1987,16 @@ mips_store_registers (regno)
 /* Fetch a word from the target board.  */
 
 static unsigned int
 /* Fetch a word from the target board.  */
 
 static unsigned int

-mips_fetch_word (addr)
-     CORE_ADDR addr;
+mips_fetch_word (CORE_ADDR addr)

 {
   unsigned int val;
   int err;
 
 {
   unsigned int val;
   int err;
 

-  /* FIXME! addr was cast to uint! */
-  val = mips_request ('d', addr, (unsigned int) 0, &err,
-                     mips_receive_wait, NULL);
+  val = mips_request ('d', addr, 0, &err, mips_receive_wait, NULL);

   if (err)
     {
       /* Data space failed; try instruction space.  */
   if (err)
     {
       /* Data space failed; try instruction space.  */

-      /* FIXME! addr was cast to uint! */
-      val = mips_request ('i', addr, (unsigned int) 0, &err,
+      val = mips_request ('i', addr, 0, &err,

                          mips_receive_wait, NULL);
       if (err)
        mips_error ("Can't read address 0x%s: %s",
                          mips_receive_wait, NULL);
       if (err)
        mips_error ("Can't read address 0x%s: %s",


@@ -2069,22 +2011,17 @@ mips_fetch_word (addr)
 
 /* FIXME! make sure only 32-bit quantities get stored! */
 static int
 
 /* FIXME! make sure only 32-bit quantities get stored! */
 static int

-mips_store_word (addr, val, old_contents)
-     CORE_ADDR addr;
-     unsigned int val;
-     char *old_contents;
+mips_store_word (CORE_ADDR addr, unsigned int val, char *old_contents)

 {
   int err;
   unsigned int oldcontents;
 
 {
   int err;
   unsigned int oldcontents;
 

-  oldcontents = mips_request ('D', addr, (unsigned int) val,
-                             &err,
+  oldcontents = mips_request ('D', addr, val, &err,

                              mips_receive_wait, NULL);
   if (err)
     {
       /* Data space failed; try instruction space.  */
                              mips_receive_wait, NULL);
   if (err)
     {
       /* Data space failed; try instruction space.  */

-      oldcontents = mips_request ('I', addr,
-                                 (unsigned int) val, &err,
+      oldcontents = mips_request ('I', addr, val, &err,

                                  mips_receive_wait, NULL);
       if (err)
        return errno;
                                  mips_receive_wait, NULL);
       if (err)
        return errno;


@@ -2101,23 +2038,29 @@ mips_store_word (addr, val, old_contents)
    for a longword, since it transfers values in ASCII.  We want the
    byte values, so we have to swap the longword values.  */
 
    for a longword, since it transfers values in ASCII.  We want the
    byte values, so we have to swap the longword values.  */
 

+static int mask_address_p = 1;
+

 static int
 static int

-mips_xfer_memory (memaddr, myaddr, len, write, ignore)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write;
-     struct target_ops *ignore;
-{
-  register int i;
+mips_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
+                 struct mem_attrib *attrib, struct target_ops *target)
+{
+  int i;
+  CORE_ADDR addr;
+  int count;
+  char *buffer;
+  int status;
+
+  /* PMON targets do not cope well with 64 bit addresses.  Mask the
+     value down to 32 bits. */
+  if (mask_address_p)
+    memaddr &= (CORE_ADDR) 0xffffffff;
+

   /* Round starting address down to longword boundary.  */
   /* Round starting address down to longword boundary.  */

-  register CORE_ADDR addr = memaddr & ~3;
+  addr = memaddr & ~3;

   /* Round ending address up; get number of longwords that makes.  */
   /* Round ending address up; get number of longwords that makes.  */

-  register int count = (((memaddr + len) - addr) + 3) / 4;
+  count = (((memaddr + len) - addr) + 3) / 4;

   /* Allocate buffer of that many longwords.  */
   /* Allocate buffer of that many longwords.  */

-  register char *buffer = alloca (count * 4);
-
-  int status;
+  buffer = alloca (count * 4);

 
   if (write)
     {
 
   if (write)
     {


@@ -2181,8 +2124,7 @@ mips_xfer_memory (memaddr, myaddr, len, write, ignore)
 /* Print info on this target.  */
 
 static void
 /* Print info on this target.  */
 
 static void

-mips_files_info (ignore)
-     struct target_ops *ignore;
+mips_files_info (struct target_ops *ignore)

 {
   printf_unfiltered ("Debugging a MIPS board over a serial line.\n");
 }
 {
   printf_unfiltered ("Debugging a MIPS board over a serial line.\n");
 }


@@ -2193,7 +2135,7 @@ mips_files_info (ignore)
    right port, we could interrupt the process with a break signal.  */
 
 static void
    right port, we could interrupt the process with a break signal.  */
 
 static void

-mips_kill ()
+mips_kill (void)

 {
   if (!mips_wait_flag)
     return;
 {
   if (!mips_wait_flag)
     return;


@@ -2218,7 +2160,7 @@ Give up (and stop debugging it)? "))
          printf_unfiltered ("Ending remote MIPS debugging.\n");
          target_mourn_inferior ();
 
          printf_unfiltered ("Ending remote MIPS debugging.\n");
          target_mourn_inferior ();
 

-         return_to_top_level (RETURN_QUIT);
+         deprecated_throw_reason (RETURN_QUIT);

        }
 
       target_terminal_inferior ();
        }
 
       target_terminal_inferior ();


@@ -2227,7 +2169,7 @@ Give up (and stop debugging it)? "))
   if (remote_debug > 0)
     printf_unfiltered ("Sending break\n");
 
   if (remote_debug > 0)
     printf_unfiltered ("Sending break\n");
 

-  SERIAL_SEND_BREAK (mips_desc);
+  serial_send_break (mips_desc);

 
 #if 0
   if (mips_is_open)
 
 #if 0
   if (mips_is_open)


@@ -2236,7 +2178,7 @@ Give up (and stop debugging it)? "))
 
       /* Send a ^C.  */
       cc = '\003';
 
       /* Send a ^C.  */
       cc = '\003';

-      SERIAL_WRITE (mips_desc, &cc, 1);
+      serial_write (mips_desc, &cc, 1);

       sleep (1);
       target_mourn_inferior ();
     }
       sleep (1);
       target_mourn_inferior ();
     }


@@ -2246,10 +2188,7 @@ Give up (and stop debugging it)? "))
 /* Start running on the target board.  */
 
 static void
 /* Start running on the target board.  */
 
 static void

-mips_create_inferior (execfile, args, env)
-     char *execfile;
-     char *args;
-     char **env;
+mips_create_inferior (char *execfile, char *args, char **env, int from_tty)

 {
   CORE_ADDR entry_pt;
 
 {
   CORE_ADDR entry_pt;
 


@@ -2268,15 +2207,15 @@ Can't pass arguments to remote MIPS board; arguments ignored.");
 
   init_wait_for_inferior ();
 
 
   init_wait_for_inferior ();
 

-  /* FIXME: Should we set inferior_pid here?  */
+  /* FIXME: Should we set inferior_ptid here?  */

 
 

-  proceed (entry_pt, TARGET_SIGNAL_DEFAULT, 0);
+  write_pc (entry_pt);

 }
 
 /* Clean up after a process.  Actually nothing to do.  */
 
 static void
 }
 
 /* Clean up after a process.  Actually nothing to do.  */
 
 static void

-mips_mourn_inferior ()
+mips_mourn_inferior (void)

 {
   if (current_ops != NULL)
     unpush_target (current_ops);
 {
   if (current_ops != NULL)
     unpush_target (current_ops);


@@ -2286,170 +2225,39 @@ mips_mourn_inferior ()
 /* We can write a breakpoint and read the shadow contents in one
    operation.  */
 
 /* We can write a breakpoint and read the shadow contents in one
    operation.  */
 

-/* Insert a breakpoint.  On targets that don't have built-in breakpoint
-   support, we read the contents of the target location and stash it,
-   then overwrite it with a breakpoint instruction.  ADDR is the target
-   location in the target machine.  CONTENTS_CACHE is a pointer to 
-   memory allocated for saving the target contents.  It is guaranteed
-   by the caller to be long enough to save sizeof BREAKPOINT bytes (this
-   is accomplished via BREAKPOINT_MAX).  */
+/* Insert a breakpoint.  On targets that don't have built-in
+   breakpoint support, we read the contents of the target location and
+   stash it, then overwrite it with a breakpoint instruction.  ADDR is
+   the target location in the target machine.  BPT is the breakpoint
+   being inserted or removed, which contains memory for saving the
+   target contents.  */

 
 static int
 
 static int

-mips_insert_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
+mips_insert_breakpoint (struct bp_target_info *bp_tgt)

 {
   if (monitor_supports_breakpoints)
 {
   if (monitor_supports_breakpoints)

-    return set_breakpoint (addr, MIPS_INSTLEN, BREAK_FETCH);
+    return set_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
+                          BREAK_FETCH);

   else
   else

-    return memory_insert_breakpoint (addr, contents_cache);
+    return memory_insert_breakpoint (bp_tgt);

 }
 
 static int
 }
 
 static int

-mips_remove_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
+mips_remove_breakpoint (struct bp_target_info *bp_tgt)

 {
   if (monitor_supports_breakpoints)
 {
   if (monitor_supports_breakpoints)

-    return clear_breakpoint (addr, MIPS_INSTLEN, BREAK_FETCH);
+    return clear_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
+                            BREAK_FETCH);

   else
   else

-    return memory_remove_breakpoint (addr, contents_cache);
+    return memory_remove_breakpoint (bp_tgt);

 }
 
 }
 

-#if 0                          /* currently not used */
-/* PMON does not currently provide support for the debug mode 'b'
-   commands to manipulate breakpoints. However, if we wanted to use
-   the monitor breakpoints (rather than the GDB BREAK_INSN version)
-   then this code performs the work needed to leave debug mode,
-   set/clear the breakpoint, and then return to debug mode. */
-
-#define PMON_MAX_BP (33)       /* 32 SW, 1 HW */
-static CORE_ADDR mips_pmon_bp_info[PMON_MAX_BP];
-/* NOTE: The code relies on this vector being zero-initialised by the system */
-
-static int
-pmon_insert_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
-{
-  int status;
-
-  if (monitor_supports_breakpoints)
-    {
-      char tbuff[12];          /* space for breakpoint command */
-      int bpnum;
-      CORE_ADDR bpaddr;
-
-      /* PMON does not support debug level breakpoint set/remove: */
-      if (mips_exit_debug ())
-       mips_error ("Failed to exit debug mode");
-
-      sprintf (tbuff, "b %08x\r", addr);
-      mips_send_command (tbuff, 0);
-
-      mips_expect ("Bpt ");
-
-      if (!mips_getstring (tbuff, 2))
-       return 1;
-      tbuff[2] = '\0';         /* terminate the string */
-      if (sscanf (tbuff, "%d", &bpnum) != 1)
-       {
-         fprintf_unfiltered (gdb_stderr,
-             "Invalid decimal breakpoint number from target: %s\n", tbuff);
-         return 1;
-       }
-
-      mips_expect (" = ");
-
-      /* Lead in the hex number we are expecting: */
-      tbuff[0] = '0';
-      tbuff[1] = 'x';
-
-      /* FIXME!! only 8 bytes!  need to expand for Bfd64; 
-         which targets return 64-bit addresses?  PMON returns only 32! */
-      if (!mips_getstring (&tbuff[2], 8))
-       return 1;
-      tbuff[10] = '\0';                /* terminate the string */
-
-      if (sscanf (tbuff, "0x%08x", &bpaddr) != 1)
-       {
-         fprintf_unfiltered (gdb_stderr,
-                           "Invalid hex address from target: %s\n", tbuff);
-         return 1;
-       }
-
-      if (bpnum >= PMON_MAX_BP)
-       {
-         fprintf_unfiltered (gdb_stderr,
-                             "Error: Returned breakpoint number %d outside acceptable range (0..%d)\n",
-                             bpnum, PMON_MAX_BP - 1);
-         return 1;
-       }
-
-      if (bpaddr != addr)
-       fprintf_unfiltered (gdb_stderr, "Warning: Breakpoint addresses do not match: 0x%x != 0x%x\n", addr, bpaddr);
-
-      mips_pmon_bp_info[bpnum] = bpaddr;
-
-      mips_expect ("\r\n");
-      mips_expect (mips_monitor_prompt);
-
-      mips_enter_debug ();
-
-      return 0;
-    }
-
-  return mips_store_word (addr, BREAK_INSN, contents_cache);
-}
-
-static int
-pmon_remove_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
-{
-  if (monitor_supports_breakpoints)
-    {
-      int bpnum;
-      char tbuff[7];           /* enough for delete breakpoint command */
-
-      for (bpnum = 0; bpnum < PMON_MAX_BP; bpnum++)
-       if (mips_pmon_bp_info[bpnum] == addr)
-         break;
-
-      if (bpnum >= PMON_MAX_BP)
-       {
-         fprintf_unfiltered (gdb_stderr,
-                             "pmon_remove_breakpoint: Failed to find breakpoint at address 0x%s\n",
-                             paddr_nz (addr));
-         return 1;
-       }
-
-      if (mips_exit_debug ())
-       mips_error ("Failed to exit debug mode");
-
-      sprintf (tbuff, "db %02d\r", bpnum);
-
-      mips_send_command (tbuff, -1);
-      /* NOTE: If the breakpoint does not exist then a "Bpt <dd> not
-         set" message will be returned. */
-
-      mips_enter_debug ();
-
-      return 0;
-    }
-
-  return target_write_memory (addr, contents_cache, BREAK_INSN_SIZE);
-}
-#endif
-
-

 /* Tell whether this target can support a hardware breakpoint.  CNT
    is the number of hardware breakpoints already installed.  This
    implements the TARGET_CAN_USE_HARDWARE_WATCHPOINT macro.  */
 
 int
 /* Tell whether this target can support a hardware breakpoint.  CNT
    is the number of hardware breakpoints already installed.  This
    implements the TARGET_CAN_USE_HARDWARE_WATCHPOINT macro.  */
 
 int

-remote_mips_can_use_hardware_watchpoint (cnt)
-     int cnt;
+mips_can_use_watchpoint (int type, int cnt, int othertype)

 {
   return cnt < MAX_LSI_BREAKPOINTS && strcmp (target_shortname, "lsi") == 0;
 }
 {
   return cnt < MAX_LSI_BREAKPOINTS && strcmp (target_shortname, "lsi") == 0;
 }


@@ -2459,9 +2267,7 @@ remote_mips_can_use_hardware_watchpoint (cnt)
    This is used for memory ref breakpoints.  */
 
 static unsigned long
    This is used for memory ref breakpoints.  */
 
 static unsigned long

-calculate_mask (addr, len)
-     CORE_ADDR addr;
-     int len;
+calculate_mask (CORE_ADDR addr, int len)

 {
   unsigned long mask;
   int i;
 {
   unsigned long mask;
   int i;


@@ -2480,44 +2286,12 @@ calculate_mask (addr, len)
 }
 
 
 }
 
 

-/* Insert a hardware breakpoint.  This works only on LSI targets, which
-   implement ordinary breakpoints using hardware facilities.  */
-
-int
-remote_mips_insert_hw_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
-{
-  if (strcmp (target_shortname, "lsi") == 0)
-    return mips_insert_breakpoint (addr, contents_cache);
-  else
-    return -1;
-}
-
-
-/* Remove a hardware breakpoint.  This works only on LSI targets, which
-   implement ordinary breakpoints using hardware facilities.  */
-
-int
-remote_mips_remove_hw_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
-{
-  if (strcmp (target_shortname, "lsi") == 0)
-    return mips_remove_breakpoint (addr, contents_cache);
-  else
-    return -1;
-}
-

 /* Set a data watchpoint.  ADDR and LEN should be obvious.  TYPE is 0
    for a write watchpoint, 1 for a read watchpoint, or 2 for a read/write
    watchpoint. */
 
 int
 /* Set a data watchpoint.  ADDR and LEN should be obvious.  TYPE is 0
    for a write watchpoint, 1 for a read watchpoint, or 2 for a read/write
    watchpoint. */
 
 int

-remote_mips_set_watchpoint (addr, len, type)
-     CORE_ADDR addr;
-     int len;
-     int type;
+mips_insert_watchpoint (CORE_ADDR addr, int len, int type)

 {
   if (set_breakpoint (addr, len, type))
     return -1;
 {
   if (set_breakpoint (addr, len, type))
     return -1;


@@ -2526,10 +2300,7 @@ remote_mips_set_watchpoint (addr, len, type)
 }
 
 int
 }
 
 int

-remote_mips_remove_watchpoint (addr, len, type)
-     CORE_ADDR addr;
-     int len;
-     int type;
+mips_remove_watchpoint (CORE_ADDR addr, int len, int type)

 {
   if (clear_breakpoint (addr, len, type))
     return -1;
 {
   if (clear_breakpoint (addr, len, type))
     return -1;


@@ -2538,7 +2309,7 @@ remote_mips_remove_watchpoint (addr, len, type)
 }
 
 int
 }
 
 int

-remote_mips_stopped_by_watchpoint (void)
+mips_stopped_by_watchpoint (void)

 {
   return hit_watchpoint;
 }
 {
   return hit_watchpoint;
 }


@@ -2547,10 +2318,7 @@ remote_mips_stopped_by_watchpoint (void)
 /* Insert a breakpoint.  */
 
 static int
 /* Insert a breakpoint.  */
 
 static int

-set_breakpoint (addr, len, type)
-     CORE_ADDR addr;
-     int len;
-     enum break_type type;
+set_breakpoint (CORE_ADDR addr, int len, enum break_type type)

 {
   return common_breakpoint (1, addr, len, type);
 }
 {
   return common_breakpoint (1, addr, len, type);
 }


@@ -2559,10 +2327,7 @@ set_breakpoint (addr, len, type)
 /* Clear a breakpoint.  */
 
 static int
 /* Clear a breakpoint.  */
 
 static int

-clear_breakpoint (addr, len, type)
-     CORE_ADDR addr;
-     int len;
-     enum break_type type;
+clear_breakpoint (CORE_ADDR addr, int len, enum break_type type)

 {
   return common_breakpoint (0, addr, len, type);
 }
 {
   return common_breakpoint (0, addr, len, type);
 }


@@ -2576,9 +2341,7 @@ clear_breakpoint (addr, len, type)
    This is a helper function for common_breakpoint.  */
 
 static int
    This is a helper function for common_breakpoint.  */
 
 static int

-check_lsi_error (addr, rerrflg)
-     CORE_ADDR addr;
-     int rerrflg;
+check_lsi_error (CORE_ADDR addr, int rerrflg)

 {
   struct lsi_error *err;
   char *saddr = paddr_nz (addr);       /* printable address string */
 {
   struct lsi_error *err;
   char *saddr = paddr_nz (addr);       /* printable address string */


@@ -2646,18 +2409,14 @@ check_lsi_error (addr, rerrflg)
    Return 0 if successful; otherwise 1.  */
 
 static int
    Return 0 if successful; otherwise 1.  */
 
 static int

-common_breakpoint (set, addr, len, type)
-     int set;
-     CORE_ADDR addr;
-     int len;
-     enum break_type type;
+common_breakpoint (int set, CORE_ADDR addr, int len, enum break_type type)

 {
   char buf[DATA_MAXLEN + 1];
   char cmd, rcmd;
   int rpid, rerrflg, rresponse, rlen;
   int nfields;
 
 {
   char buf[DATA_MAXLEN + 1];
   char cmd, rcmd;
   int rpid, rerrflg, rresponse, rlen;
   int nfields;
 

-  addr = ADDR_BITS_REMOVE (addr);
+  addr = gdbarch_addr_bits_remove (current_gdbarch, addr);

 
   if (mips_monitor == MON_LSI)
     {
 
   if (mips_monitor == MON_LSI)
     {


@@ -2794,7 +2553,7 @@ common_breakpoint (set, addr, len, type)
              flags = "f";
              break;
            default:
              flags = "f";
              break;
            default:

-             abort ();
+             internal_error (__FILE__, __LINE__, _("failed internal consistency check"));

            }
 
          cmd = 'B';
            }
 
          cmd = 'B';


@@ -2836,18 +2595,15 @@ common_breakpoint (set, addr, len, type)
 }
 \f
 static void
 }
 \f
 static void

-send_srec (srec, len, addr)
-     char *srec;
-     int len;
-     CORE_ADDR addr;
+send_srec (char *srec, int len, CORE_ADDR addr)

 {
   while (1)
     {
       int ch;
 
 {
   while (1)
     {
       int ch;
 

-      SERIAL_WRITE (mips_desc, srec, len);
+      serial_write (mips_desc, srec, len);

 
 

-      ch = mips_readchar (2);
+      ch = mips_readchar (remote_timeout);

 
       switch (ch)
        {
 
       switch (ch)
        {


@@ -2868,8 +2624,7 @@ send_srec (srec, len, addr)
 /*  Download a binary file by converting it to S records. */
 
 static void
 /*  Download a binary file by converting it to S records. */
 
 static void

-mips_load_srec (args)
-     char *args;
+mips_load_srec (char *args)

 {
   bfd *abfd;
   asection *s;
 {
   bfd *abfd;
   asection *s;


@@ -2906,18 +2661,22 @@ mips_load_srec (args)
          /* FIXME!  vma too small????? */
          printf_filtered ("%s\t: 0x%4lx .. 0x%4lx  ", s->name,
                           (long) s->vma,
          /* FIXME!  vma too small????? */
          printf_filtered ("%s\t: 0x%4lx .. 0x%4lx  ", s->name,
                           (long) s->vma,

-                          (long) (s->vma + s->_raw_size));
+                          (long) (s->vma + bfd_get_section_size (s)));

          gdb_flush (gdb_stdout);
 
          gdb_flush (gdb_stdout);
 

-         for (i = 0; i < s->_raw_size; i += numbytes)
+         for (i = 0; i < bfd_get_section_size (s); i += numbytes)

            {
            {

-             numbytes = min (srec_frame, s->_raw_size - i);
+             numbytes = min (srec_frame, bfd_get_section_size (s) - i);

 
              bfd_get_section_contents (abfd, s, buffer, i, numbytes);
 
 
              bfd_get_section_contents (abfd, s, buffer, i, numbytes);
 

-             reclen = mips_make_srec (srec, '3', s->vma + i, buffer, numbytes);
+             reclen = mips_make_srec (srec, '3', s->vma + i, 
+                                      buffer, numbytes);

              send_srec (srec, reclen, s->vma + i);
 
              send_srec (srec, reclen, s->vma + i);
 

+             if (deprecated_ui_load_progress_hook)
+               deprecated_ui_load_progress_hook (s->name, i);
+

              if (hashmark)
                {
                  putchar_unfiltered ('#');
              if (hashmark)
                {
                  putchar_unfiltered ('#');


@@ -2939,7 +2698,7 @@ mips_load_srec (args)
 
   send_srec (srec, reclen, abfd->start_address);
 
 
   send_srec (srec, reclen, abfd->start_address);
 

-  SERIAL_FLUSH_INPUT (mips_desc);
+  serial_flush_input (mips_desc);

 }
 
 /*
 }
 
 /*


@@ -2987,12 +2746,8 @@ mips_load_srec (args)
  */
 
 static int
  */
 
 static int

-mips_make_srec (buf, type, memaddr, myaddr, len)
-     char *buf;
-     int type;
-     CORE_ADDR memaddr;
-     unsigned char *myaddr;
-     int len;
+mips_make_srec (char *buf, int type, CORE_ADDR memaddr, unsigned char *myaddr,
+               int len)

 {
   unsigned char checksum;
   int i;
 {
   unsigned char checksum;
   int i;


@@ -3059,11 +2814,7 @@ static char encoding[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01
    pointer non-NULL). The function returns the number of encoded
    characters written into the buffer. */
 static int
    pointer non-NULL). The function returns the number of encoded
    characters written into the buffer. */
 static int

-pmon_makeb64 (v, p, n, chksum)
-     unsigned long v;
-     char *p;
-     int n;
-     int *chksum;
+pmon_makeb64 (unsigned long v, char *p, int n, int *chksum)

 {
   int count = (n / 6);
 
 {
   int count = (n / 6);
 


@@ -3107,11 +2858,7 @@ pmon_makeb64 (v, p, n, chksum)
 /* Shorthand function (that could be in-lined) to output the zero-fill
    escape sequence into the data stream. */
 static int
 /* Shorthand function (that could be in-lined) to output the zero-fill
    escape sequence into the data stream. */
 static int

-pmon_zeroset (recsize, buff, amount, chksum)
-     int recsize;
-     char **buff;
-     int *amount;
-     unsigned int *chksum;
+pmon_zeroset (int recsize, char **buff, int *amount, unsigned int *chksum)

 {
   int count;
 
 {
   int count;
 


@@ -3123,10 +2870,7 @@ pmon_zeroset (recsize, buff, amount, chksum)
 }
 
 static int
 }
 
 static int

-pmon_checkset (recsize, buff, value)
-     int recsize;
-     char **buff;
-     int *value;
+pmon_checkset (int recsize, char **buff, int *value)

 {
   int count;
 
 {
   int count;
 


@@ -3156,14 +2900,9 @@ pmon_checkset (recsize, buff, value)
    is for PMON 5.x on the Cogent Vr4300 board. */
 
 static void
    is for PMON 5.x on the Cogent Vr4300 board. */
 
 static void

-pmon_make_fastrec (outbuf, inbuf, inptr, inamount, recsize, csum, zerofill)
-     char **outbuf;
-     unsigned char *inbuf;
-     int *inptr;
-     int inamount;
-     int *recsize;
-     unsigned int *csum;
-     unsigned int *zerofill;
+pmon_make_fastrec (char **outbuf, unsigned char *inbuf, int *inptr,
+                  int inamount, int *recsize, unsigned int *csum,
+                  unsigned int *zerofill)

 {
   int count = 0;
   char *p = *outbuf;
 {
   int count = 0;
   char *p = *outbuf;


@@ -3218,15 +2957,15 @@ pmon_make_fastrec (outbuf, inbuf, inptr, inamount, recsize, csum, zerofill)
 }
 
 static int
 }
 
 static int

-pmon_check_ack (mesg)
-     char *mesg;
+pmon_check_ack (char *mesg)

 {
 #if defined(DOETXACK)
   int c;
 
   if (!tftp_in_use)
     {
 {
 #if defined(DOETXACK)
   int c;
 
   if (!tftp_in_use)
     {

-      c = SERIAL_READCHAR (udp_in_use ? udp_desc : mips_desc, 2);
+      c = serial_readchar (udp_in_use ? udp_desc : mips_desc,
+                          remote_timeout);

       if ((c == SERIAL_TIMEOUT) || (c != 0x06))
        {
          fprintf_unfiltered (gdb_stderr,
       if ((c == SERIAL_TIMEOUT) || (c != 0x06))
        {
          fprintf_unfiltered (gdb_stderr,


@@ -3242,7 +2981,7 @@ pmon_check_ack (mesg)
    which is either a serial port or a UDP socket.  */
 
 static void
    which is either a serial port or a UDP socket.  */
 
 static void

-pmon_start_download ()
+pmon_start_download (void)

 {
   if (tftp_in_use)
     {
 {
   if (tftp_in_use)
     {


@@ -3274,9 +3013,27 @@ mips_expect_download (char *string)
 }
 
 static void
 }
 
 static void

-pmon_end_download (final, bintotal)
-     int final;
-     int bintotal;
+pmon_check_entry_address (char *entry_address, int final)
+{
+  char hexnumber[9];           /* includes '\0' space */
+  mips_expect_timeout (entry_address, tftp_in_use ? 15 : remote_timeout);
+  sprintf (hexnumber, "%x", final);
+  mips_expect (hexnumber);
+  mips_expect ("\r\n");
+}
+
+static int
+pmon_check_total (int bintotal)
+{
+  char hexnumber[9];           /* includes '\0' space */
+  mips_expect ("\r\ntotal = 0x");
+  sprintf (hexnumber, "%x", bintotal);
+  mips_expect (hexnumber);
+  return mips_expect_download (" bytes\r\n");
+}
+
+static void
+pmon_end_download (int final, int bintotal)

 {
   char hexnumber[9];           /* includes '\0' space */
 
 {
   char hexnumber[9];           /* includes '\0' space */
 


@@ -3303,7 +3060,7 @@ pmon_end_download (final, bintotal)
       strcat (cmd, tftp_name);
       strcat (cmd, "\r");
       mips_send_command (cmd, 0);
       strcat (cmd, tftp_name);
       strcat (cmd, "\r");
       mips_send_command (cmd, 0);

-      free (cmd);
+      xfree (cmd);

       if (!mips_expect_download ("Downloading from "))
        return;
       if (!mips_expect_download (tftp_name))
       if (!mips_expect_download ("Downloading from "))
        return;
       if (!mips_expect_download (tftp_name))


@@ -3315,43 +3072,37 @@ pmon_end_download (final, bintotal)
   /* Wait for the stuff that PMON prints after the load has completed.
      The timeout value for use in the tftp case (15 seconds) was picked
      arbitrarily but might be too small for really large downloads. FIXME. */
   /* Wait for the stuff that PMON prints after the load has completed.
      The timeout value for use in the tftp case (15 seconds) was picked
      arbitrarily but might be too small for really large downloads. FIXME. */

-  if (mips_monitor == MON_LSI)
+  switch (mips_monitor)

     {
     {

+    case MON_LSI:

       pmon_check_ack ("termination");
       pmon_check_ack ("termination");

-      mips_expect_timeout ("Entry address is ", tftp_in_use ? 15 : 2);
+      pmon_check_entry_address ("Entry address is ", final);
+      if (!pmon_check_total (bintotal))
+       return;
+      break;
+    default:
+      pmon_check_entry_address ("Entry Address  = ", final);
+      pmon_check_ack ("termination");
+      if (!pmon_check_total (bintotal))
+       return;
+      break;

     }
     }

-  else
-    mips_expect_timeout ("Entry Address  = ", tftp_in_use ? 15 : 2);
-
-  sprintf (hexnumber, "%x", final);
-  mips_expect (hexnumber);
-  mips_expect ("\r\n");
-  if (mips_monitor != MON_LSI)
-    pmon_check_ack ("termination");
-  mips_expect ("\r\ntotal = 0x");
-  sprintf (hexnumber, "%x", bintotal);
-  mips_expect (hexnumber);
-  if (!mips_expect_download (" bytes\r\n"))
-    return;

 
   if (tftp_in_use)
     remove (tftp_localname);   /* Remove temporary file */
 }
 
 static void
 
   if (tftp_in_use)
     remove (tftp_localname);   /* Remove temporary file */
 }
 
 static void

-pmon_download (buffer, length)
-     char *buffer;
-     int length;
+pmon_download (char *buffer, int length)

 {
   if (tftp_in_use)
     fwrite (buffer, 1, length, tftp_file);
   else
 {
   if (tftp_in_use)
     fwrite (buffer, 1, length, tftp_file);
   else

-    SERIAL_WRITE (udp_in_use ? udp_desc : mips_desc, buffer, length);
+    serial_write (udp_in_use ? udp_desc : mips_desc, buffer, length);

 }
 
 static void
 }
 
 static void

-pmon_load_fast (file)
-     char *file;
+pmon_load_fast (char *file)

 {
   bfd *abfd;
   asection *s;
 {
   bfd *abfd;
   asection *s;


@@ -3398,11 +3149,11 @@ pmon_load_fast (file)
   for (s = abfd->sections; s && !finished; s = s->next)
     if (s->flags & SEC_LOAD)   /* only deal with loadable sections */
       {
   for (s = abfd->sections; s && !finished; s = s->next)
     if (s->flags & SEC_LOAD)   /* only deal with loadable sections */
       {

-       bintotal += s->_raw_size;
-       final = (s->vma + s->_raw_size);
+       bintotal += bfd_get_section_size (s);
+       final = (s->vma + bfd_get_section_size (s));

 
        printf_filtered ("%s\t: 0x%4x .. 0x%4x  ", s->name, (unsigned int) s->vma,
 
        printf_filtered ("%s\t: 0x%4x .. 0x%4x  ", s->name, (unsigned int) s->vma,

-                        (unsigned int) (s->vma + s->_raw_size));
+                        (unsigned int) (s->vma + bfd_get_section_size (s)));

        gdb_flush (gdb_stdout);
 
        /* Output the starting address */
        gdb_flush (gdb_stdout);
 
        /* Output the starting address */


@@ -3423,11 +3174,13 @@ pmon_load_fast (file)
 
            reclen = 0;
 
 
            reclen = 0;
 

-           for (i = 0; ((i < s->_raw_size) && !finished); i += binamount)
+           for (i = 0;
+                i < bfd_get_section_size (s) && !finished;
+                i += binamount)

              {
                int binptr = 0;
 
              {
                int binptr = 0;
 

-               binamount = min (BINCHUNK, s->_raw_size - i);
+               binamount = min (BINCHUNK, bfd_get_section_size (s) - i);

 
                bfd_get_section_contents (abfd, s, binbuf, i, binamount);
 
 
                bfd_get_section_contents (abfd, s, binbuf, i, binamount);
 


@@ -3435,7 +3188,8 @@ pmon_load_fast (file)
                   the line: */
                for (; ((binamount - binptr) > 0);)
                  {
                   the line: */
                for (; ((binamount - binptr) > 0);)
                  {

-                   pmon_make_fastrec (&bp, binbuf, &binptr, binamount, &reclen, &csum, &zerofill);
+                   pmon_make_fastrec (&bp, binbuf, &binptr, binamount, 
+                                      &reclen, &csum, &zerofill);

                    if (reclen >= (MAXRECSIZE - CHECKSIZE))
                      {
                        reclen = pmon_checkset (reclen, &bp, &csum);
                    if (reclen >= (MAXRECSIZE - CHECKSIZE))
                      {
                        reclen = pmon_checkset (reclen, &bp, &csum);


@@ -3447,6 +3201,9 @@ pmon_load_fast (file)
                            break;
                          }
 
                            break;
                          }
 

+                       if (deprecated_ui_load_progress_hook)
+                         deprecated_ui_load_progress_hook (s->name, i);
+

                        if (hashmark)
                          {
                            putchar_unfiltered ('#');
                        if (hashmark)
                          {
                            putchar_unfiltered ('#');


@@ -3485,7 +3242,7 @@ pmon_load_fast (file)
 
   if (finished)
     {                          /* Ignore the termination message: */
 
   if (finished)
     {                          /* Ignore the termination message: */

-      SERIAL_FLUSH_INPUT (udp_in_use ? udp_desc : mips_desc);
+      serial_flush_input (udp_in_use ? udp_desc : mips_desc);

     }
   else
     {                          /* Deal with termination message: */
     }
   else
     {                          /* Deal with termination message: */


@@ -3498,9 +3255,7 @@ pmon_load_fast (file)
 /* mips_load -- download a file. */
 
 static void
 /* mips_load -- download a file. */
 
 static void

-mips_load (file, from_tty)
-     char *file;
-     int from_tty;
+mips_load (char *file, int from_tty)

 {
   /* Get the board out of remote debugging mode.  */
   if (mips_exit_debug ())
 {
   /* Get the board out of remote debugging mode.  */
   if (mips_exit_debug ())


@@ -3519,12 +3274,13 @@ mips_load (file, from_tty)
       /* Work around problem where PMON monitor updates the PC after a load
          to a different value than GDB thinks it has. The following ensures
          that the write_pc() WILL update the PC value: */
       /* Work around problem where PMON monitor updates the PC after a load
          to a different value than GDB thinks it has. The following ensures
          that the write_pc() WILL update the PC value: */

-      register_valid[PC_REGNUM] = 0;
+      regcache_set_valid_p (get_current_regcache (),
+                           gdbarch_pc_regnum (current_gdbarch), 0);

     }
   if (exec_bfd)
     write_pc (bfd_get_start_address (exec_bfd));
 
     }
   if (exec_bfd)
     write_pc (bfd_get_start_address (exec_bfd));
 

-  inferior_pid = 0;            /* No process now */
+  inferior_ptid = null_ptid;   /* No process now */

 
 /* This is necessary because many things were based on the PC at the time that
    we attached to the monitor, which is no longer valid now that we have loaded
 
 /* This is necessary because many things were based on the PC at the time that
    we attached to the monitor, which is no longer valid now that we have loaded


@@ -3539,9 +3295,7 @@ mips_load (file, from_tty)
 /* Pass the command argument as a packet to PMON verbatim.  */
 
 static void
 /* Pass the command argument as a packet to PMON verbatim.  */
 
 static void

-pmon_command (args, from_tty)
-     char *args;
-     int from_tty;
+pmon_command (char *args, int from_tty)

 {
   char buf[DATA_MAXLEN + 1];
   int rlen;
 {
   char buf[DATA_MAXLEN + 1];
   int rlen;


@@ -3555,8 +3309,10 @@ pmon_command (args, from_tty)
   printf_filtered ("Received packet: %s\n", buf);
 }
 \f
   printf_filtered ("Received packet: %s\n", buf);
 }
 \f

+extern initialize_file_ftype _initialize_remote_mips; /* -Wmissing-prototypes */
+

 void
 void

-_initialize_remote_mips ()
+_initialize_remote_mips (void)

 {
   /* Initialize the fields in mips_ops that are common to all four targets.  */
   mips_ops.to_longname = "Remote MIPS debugging over serial line";
 {
   /* Initialize the fields in mips_ops that are common to all four targets.  */
   mips_ops.to_longname = "Remote MIPS debugging over serial line";


@@ -3566,14 +3322,19 @@ _initialize_remote_mips ()
   mips_ops.to_fetch_registers = mips_fetch_registers;
   mips_ops.to_store_registers = mips_store_registers;
   mips_ops.to_prepare_to_store = mips_prepare_to_store;
   mips_ops.to_fetch_registers = mips_fetch_registers;
   mips_ops.to_store_registers = mips_store_registers;
   mips_ops.to_prepare_to_store = mips_prepare_to_store;

-  mips_ops.to_xfer_memory = mips_xfer_memory;
+  mips_ops.deprecated_xfer_memory = mips_xfer_memory;

   mips_ops.to_files_info = mips_files_info;
   mips_ops.to_insert_breakpoint = mips_insert_breakpoint;
   mips_ops.to_remove_breakpoint = mips_remove_breakpoint;
   mips_ops.to_files_info = mips_files_info;
   mips_ops.to_insert_breakpoint = mips_insert_breakpoint;
   mips_ops.to_remove_breakpoint = mips_remove_breakpoint;

+  mips_ops.to_insert_watchpoint = mips_insert_watchpoint;
+  mips_ops.to_remove_watchpoint = mips_remove_watchpoint;
+  mips_ops.to_stopped_by_watchpoint = mips_stopped_by_watchpoint;
+  mips_ops.to_can_use_hw_breakpoint = mips_can_use_watchpoint;

   mips_ops.to_kill = mips_kill;
   mips_ops.to_load = mips_load;
   mips_ops.to_create_inferior = mips_create_inferior;
   mips_ops.to_mourn_inferior = mips_mourn_inferior;
   mips_ops.to_kill = mips_kill;
   mips_ops.to_load = mips_load;
   mips_ops.to_create_inferior = mips_create_inferior;
   mips_ops.to_mourn_inferior = mips_mourn_inferior;

+  mips_ops.to_log_command = serial_log_command;

   mips_ops.to_stratum = process_stratum;
   mips_ops.to_has_all_memory = 1;
   mips_ops.to_has_memory = 1;
   mips_ops.to_stratum = process_stratum;
   mips_ops.to_has_all_memory = 1;
   mips_ops.to_has_memory = 1;


@@ -3624,47 +3385,60 @@ of the TFTP temporary file, if it differs from the filename seen by the board.";
   add_target (&ddb_ops);
   add_target (&lsi_ops);
 
   add_target (&ddb_ops);
   add_target (&lsi_ops);
 

-  add_show_from_set (
-                     add_set_cmd ("timeout", no_class, var_zinteger,
-                                  (char *) &mips_receive_wait,
-                      "Set timeout in seconds for remote MIPS serial I/O.",
-                                  &setlist),
-                     &showlist);
-
-  add_show_from_set (
-                 add_set_cmd ("retransmit-timeout", no_class, var_zinteger,
-                              (char *) &mips_retransmit_wait,
-                              "Set retransmit timeout in seconds for remote MIPS serial I/O.\n\
+  add_setshow_zinteger_cmd ("timeout", no_class, &mips_receive_wait, _("\
+Set timeout in seconds for remote MIPS serial I/O."), _("\
+Show timeout in seconds for remote MIPS serial I/O."), NULL,
+                           NULL,
+                           NULL, /* FIXME: i18n: */
+                           &setlist, &showlist);
+
+  add_setshow_zinteger_cmd ("retransmit-timeout", no_class,
+                           &mips_retransmit_wait, _("\
+Set retransmit timeout in seconds for remote MIPS serial I/O."), _("\
+Show retransmit timeout in seconds for remote MIPS serial I/O."), _("\

 This is the number of seconds to wait for an acknowledgement to a packet\n\
 This is the number of seconds to wait for an acknowledgement to a packet\n\

-before resending the packet.", &setlist),
-                     &showlist);
-
-  add_show_from_set (
-                  add_set_cmd ("syn-garbage-limit", no_class, var_zinteger,
-                               (char *) &mips_syn_garbage,
-                               "Set the maximum number of characters to ignore when scanning for a SYN.\n\
+before resending the packet."),
+                           NULL,
+                           NULL, /* FIXME: i18n: */
+                           &setlist, &showlist);
+
+  add_setshow_zinteger_cmd ("syn-garbage-limit", no_class,
+                           &mips_syn_garbage,  _("\
+Set the maximum number of characters to ignore when scanning for a SYN."), _("\
+Show the maximum number of characters to ignore when scanning for a SYN."), _("\

 This is the maximum number of characters GDB will ignore when trying to\n\
 This is the maximum number of characters GDB will ignore when trying to\n\

-synchronize with the remote system.  A value of -1 means that there is no limit\n\
-(Note that these characters are printed out even though they are ignored.)",
-                               &setlist),
-                     &showlist);
-
-  add_show_from_set
-    (add_set_cmd ("monitor-prompt", class_obscure, var_string,
-                 (char *) &mips_monitor_prompt,
-                 "Set the prompt that GDB expects from the monitor.",
-                 &setlist),
-     &showlist);
-
-  add_show_from_set (
-              add_set_cmd ("monitor-warnings", class_obscure, var_zinteger,
-                           (char *) &monitor_warnings,
-                           "Set printing of monitor warnings.\n"
-               "When enabled, monitor warnings about hardware breakpoints "
-                           "will be displayed.",
-                           &setlist),
-                     &showlist);
-
-  add_com ("pmon <command>", class_obscure, pmon_command,
-          "Send a packet to PMON (must be in debug mode).");
+synchronize with the remote system.  A value of -1 means that there is no\n\
+limit. (Note that these characters are printed out even though they are\n\
+ignored.)"),
+                           NULL,
+                           NULL, /* FIXME: i18n: */
+                           &setlist, &showlist);
+
+  add_setshow_string_cmd ("monitor-prompt", class_obscure,
+                         &mips_monitor_prompt, _("\
+Set the prompt that GDB expects from the monitor."), _("\
+Show the prompt that GDB expects from the monitor."), NULL,
+                         NULL,
+                         NULL, /* FIXME: i18n: */
+                         &setlist, &showlist);
+
+  add_setshow_zinteger_cmd ("monitor-warnings", class_obscure,
+                           &monitor_warnings, _("\
+Set printing of monitor warnings."), _("\
+Show printing of monitor warnings."), _("\
+When enabled, monitor warnings about hardware breakpoints will be displayed."),
+                           NULL,
+                           NULL, /* FIXME: i18n: */
+                           &setlist, &showlist);
+
+  add_com ("pmon", class_obscure, pmon_command,
+          _("Send a packet to PMON (must be in debug mode)."));
+
+  add_setshow_boolean_cmd ("mask-address", no_class, &mask_address_p, _("\
+Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON targets."), _("\
+Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON targets."), _("\
+Use \"on\" to enable the masking and \"off\" to disable it."),
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setlist, &showlist);

 }
 }