2003-04-28 Andrew Cagney <cagney@redhat.com>

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

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index b4d7ad0d65897f92e06b547861db1c63f52a93d1..a23f72d4606629f59f970fc002142113808e5cda 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, 1994, 1995, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002 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>.
 


@@ -30,17 +33,9 @@
 #include "target.h"
 #include "remote-utils.h"
 #include "gdb_string.h"
 #include "target.h"
 #include "remote-utils.h"
 #include "gdb_string.h"

+#include "gdb_stat.h"

 #include "regcache.h"
 #include "regcache.h"

-
-#include <sys/types.h>
-#include <sys/stat.h>

 #include <ctype.h>
 #include <ctype.h>

-
-/* Microsoft C's stat.h doesn't define all the POSIX file modes.  */
-#ifndef S_IROTH
-#define S_IROTH S_IREAD
-#endif
-

 \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


@@ -92,9 +87,11 @@ 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);
 


@@ -367,10 +364,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


@@ -460,11 +457,11 @@ static void
 close_ports (void)
 {
   mips_is_open = 0;
 close_ports (void)
 {
   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;


@@ -500,7 +497,7 @@ 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);
+  throw_exception (RETURN_ERROR);

 }
 
 /* putc_readable - print a character, displaying non-printable chars in
 }
 
 /* putc_readable - print a character, displaying non-printable chars in


@@ -556,10 +553,10 @@ mips_expect_timeout (const char *string, int timeout)
     {
       int c;
 
     {
       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)
        {


@@ -612,7 +609,7 @@ mips_getstring (char *string, int n)
   immediate_quit++;
   while (n > 0)
     {
   immediate_quit++;
   while (n > 0)
     {

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

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


@@ -631,13 +628,13 @@ mips_getstring (char *string, int n)
 }
 
 /* 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


@@ -661,7 +658,7 @@ mips_readchar (int 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 */
     {


@@ -887,7 +884,7 @@ mips_send_packet (const char *s, int 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));
 


@@ -1147,7 +1144,7 @@ mips_receive_packet (char *buff, int throw_error, int 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));


@@ -1187,7 +1184,7 @@ mips_receive_packet (char *buff, int throw_error, int 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));


@@ -1286,13 +1283,13 @@ mips_request (int cmd,
 }
 
 static void
 }
 
 static void

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

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

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

 {
   mips_exiting = 0;
 }
 {
   mips_exiting = 0;
 }


@@ -1300,7 +1297,7 @@ mips_exit_cleanups (PTR arg)
 static void
 mips_send_command (const char *cmd, int prompt)
 {
 static void
 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)


@@ -1321,7 +1318,7 @@ mips_enter_debug (void)
     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


@@ -1403,14 +1400,14 @@ mips_initialize (void)
       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 */
          {


@@ -1424,9 +1421,9 @@ mips_initialize (void)
                   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
              {


@@ -1446,9 +1443,9 @@ mips_initialize (void)
 
                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. */
                  }


@@ -1497,8 +1494,10 @@ mips_initialize (void)
      the request itself succeeds or fails.  */
 
   mips_request ('r', 0, 0, &err, mips_receive_wait, NULL);
      the request itself succeeds or fails.  */
 
   mips_request ('r', 0, 0, &err, mips_receive_wait, NULL);

-  set_current_frame (create_new_frame (read_fp (), read_pc ()));
-  select_frame (get_current_frame (), 0);
+  /* FIXME: cagney/2002-11-29: Force the update of selected frame.
+     This shouldn't be necessary, only many many places still refer to
+     selected_frame directly (instead of using get_selected_frame().  */
+  get_selected_frame (); /* Hack!!!  */

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


@@ -1544,20 +1543,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


@@ -1567,7 +1566,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;


@@ -1615,17 +1614,15 @@ device is attached to the target board (e.g., /dev/ttya).\n"
   if (ptype)
     mips_set_processor_type_command (xstrdup (ptype), 0);
 
   if (ptype)
     mips_set_processor_type_command (xstrdup (ptype), 0);
 

-/* 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 ();
   registers_changed ();
   stop_pc = read_pc ();
 
   flush_cached_frames ();
   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);
+  print_stack_frame (get_selected_frame (), -1, 1);

   xfree (serial_port_name);
 }
 
   xfree (serial_port_name);
 }
 


@@ -1711,7 +1708,7 @@ mips_detach (char *args, int from_tty)
    where PMON does return a reply.  */
 
 static void
    where PMON does return a reply.  */
 
 static void

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

 {
   int err;
 
 {
   int err;
 


@@ -1743,8 +1740,8 @@ mips_signal_from_protocol (int 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 (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;


@@ -1764,7 +1761,7 @@ mips_wait (int pid, struct target_waitstatus *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.  */
     }
 
   /* No timeout; we sit here as long as the program continues to execute.  */


@@ -1794,7 +1791,7 @@ mips_wait (int pid, struct target_waitstatus *status)
                    &rpc, &rfp, &rsp, flags);
   if (nfields >= 3)
     {
                    &rpc, &rfp, &rsp, flags);
   if (nfields >= 3)
     {

-      char buf[MAX_REGISTER_RAW_SIZE];
+      char *buf = alloca (max_register_size (current_gdbarch));

 
       store_unsigned_integer (buf, REGISTER_RAW_SIZE (PC_REGNUM), rpc);
       supply_register (PC_REGNUM, buf);
 
       store_unsigned_integer (buf, REGISTER_RAW_SIZE (PC_REGNUM), rpc);
       supply_register (PC_REGNUM, buf);


@@ -1895,7 +1892,7 @@ mips_wait (int pid, struct target_waitstatus *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


@@ -1975,7 +1972,7 @@ mips_fetch_registers (int regno)
     }
 
   {
     }
 
   {

-    char buf[MAX_REGISTER_RAW_SIZE];
+    char *buf = alloca (max_register_size (current_gdbarch));

 
     /* 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.  */


@@ -2071,8 +2068,7 @@ static int mask_address_p = 1;
 
 static int
 mips_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
 
 static int
 mips_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,

-                 struct mem_attrib *attrib ATTRIBUTE_UNUSED,
-                 struct target_ops *target ATTRIBUTE_UNUSED)
+                 struct mem_attrib *attrib, struct target_ops *target)

 {
   int i;
   CORE_ADDR addr;
 {
   int i;
   CORE_ADDR addr;


@@ -2190,7 +2186,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);
+         throw_exception (RETURN_QUIT);

        }
 
       target_terminal_inferior ();
        }
 
       target_terminal_inferior ();


@@ -2199,7 +2195,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)


@@ -2208,7 +2204,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 ();
     }


@@ -2237,7 +2233,7 @@ 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);
 }
 
   proceed (entry_pt, TARGET_SIGNAL_DEFAULT, 0);
 }


@@ -2778,7 +2774,7 @@ send_srec (char *srec, int len, CORE_ADDR addr)
     {
       int ch;
 
     {
       int ch;
 

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

 
       ch = mips_readchar (remote_timeout);
 
 
       ch = mips_readchar (remote_timeout);
 


@@ -2850,6 +2846,9 @@ mips_load_srec (char *args)
              reclen = mips_make_srec (srec, '3', s->vma + i, buffer, numbytes);
              send_srec (srec, reclen, s->vma + i);
 
              reclen = mips_make_srec (srec, '3', s->vma + i, buffer, numbytes);
              send_srec (srec, reclen, s->vma + i);
 

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

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


@@ -2871,7 +2870,7 @@ mips_load_srec (char *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);

 }
 
 /*
 }
 
 /*


@@ -3137,7 +3136,7 @@ pmon_check_ack (char *mesg)
 
   if (!tftp_in_use)
     {
 
   if (!tftp_in_use)
     {

-      c = SERIAL_READCHAR (udp_in_use ? udp_desc : mips_desc,
+      c = serial_readchar (udp_in_use ? udp_desc : mips_desc,

                           remote_timeout);
       if ((c == SERIAL_TIMEOUT) || (c != 0x06))
        {
                           remote_timeout);
       if ((c == SERIAL_TIMEOUT) || (c != 0x06))
        {


@@ -3271,7 +3270,7 @@ 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


@@ -3371,6 +3370,9 @@ pmon_load_fast (char *file)
                            break;
                          }
 
                            break;
                          }
 

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

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


@@ -3409,7 +3411,7 @@ pmon_load_fast (char *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: */


@@ -3441,12 +3443,12 @@ mips_load (char *file, int 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;
+      deprecated_register_valid[PC_REGNUM] = 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