* main.c (main): Make sure command loop is used with cygwin32.

[binutils.git] / gdb / remote.c

diff --git a/gdb/remote.c b/gdb/remote.c
index 6fffc54c7f80c8ffa40a9ea8babfeb97385a04e0..65caedb62990302964c15e41ed1adb4f41643eb8 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -1,5 +1,5 @@
 /* Remote target communications for serial-line targets in custom GDB protocol
 /* Remote target communications for serial-line targets in custom GDB protocol

-   Copyright 1988, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1988, 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.

 
 This file is part of GDB.
 
 
 This file is part of GDB.
 


@@ -15,7 +15,7 @@ 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
 
 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 /* Remote communication protocol.
 
 
 /* Remote communication protocol.
 


@@ -25,7 +25,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
        $ <data> # CSUM1 CSUM2
 
        <data> must be ASCII alphanumeric and cannot include characters
        $ <data> # CSUM1 CSUM2
 
        <data> must be ASCII alphanumeric and cannot include characters

-       '$' or '#'
+       '$' or '#'.  If <data> starts with two characters followed by
+       ':', then the existing stubs interpret this as a sequence number.

 
        CSUM1 and CSUM2 are ascii hex representation of an 8-bit 
        checksum of <data>, the most significant nibble is sent first.
 
        CSUM1 and CSUM2 are ascii hex representation of an 8-bit 
        checksum of <data>, the most significant nibble is sent first.


@@ -37,10 +38,21 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
        -       - if CSUM is incorrect
 
    <data> is as follows:
        -       - if CSUM is incorrect
 
    <data> is as follows:

-   All values are encoded in ascii hex digits.
+   Most values are encoded in ascii hex digits.  Signal numbers are according
+   to the numbering in target.h.

 
        Request         Packet
 
 
        Request         Packet
 

+       set thread      Hct...          Set thread for subsequent operations.
+                                       c = 'c' for thread used in step and 
+                                       continue; t... can be -1 for all
+                                       threads.
+                                       c = 'g' for thread used in other
+                                       operations.  If zero, pick a thread,
+                                       any thread.
+       reply           OK              for success
+                       ENN             for an error.
+

        read registers  g
        reply           XX....X         Each byte of register data
                                        is described by two hex digits.
        read registers  g
        reply           XX....X         Each byte of register data
                                        is described by two hex digits.


@@ -54,6 +66,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
        reply           OK              for success
                        ENN             for an error
 
        reply           OK              for success
                        ENN             for an error
 

+        write reg      Pn...=r...      Write register n... with value r...,
+                                       which contains two hex digits for each
+                                       byte in the register (target byte
+                                       order).
+       reply           OK              for success
+                       ENN             for an error
+       (not supported by all stubs).
+

        read mem        mAA..AA,LLLL    AA..AA is address, LLLL is length.
        reply           XX..XX          XX..XX is mem contents
                                        Can be fewer bytes than requested
        read mem        mAA..AA,LLLL    AA..AA is address, LLLL is length.
        reply           XX..XX          XX..XX is mem contents
                                        Can be fewer bytes than requested


@@ -69,7 +89,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
                                        where only part of the data was
                                        written).
 
                                        where only part of the data was
                                        written).
 

-       cont            cAA..AA         AA..AA is address to resume
+       continue        cAA..AA         AA..AA is address to resume

                                        If AA..AA is omitted,
                                        resume at same address.
 
                                        If AA..AA is omitted,
                                        resume at same address.
 


@@ -77,34 +97,54 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
                                        If AA..AA is omitted,
                                        resume at same address.
 
                                        If AA..AA is omitted,
                                        resume at same address.
 

+       continue with   Csig;AA         Continue with signal sig (hex signal
+       signal                          number).
+
+       step with       Ssig;AA         Like 'C' but step not continue.
+       signal
+

        last signal     ?               Reply the current reason for stopping.
                                         This is the same reply as is generated
                                        for step or cont : SAA where AA is the
                                        signal number.
 
        last signal     ?               Reply the current reason for stopping.
                                         This is the same reply as is generated
                                        for step or cont : SAA where AA is the
                                        signal number.
 

+       detach          D               Reply OK.
+

        There is no immediate reply to step or cont.
        The reply comes when the machine stops.
        There is no immediate reply to step or cont.
        The reply comes when the machine stops.

-       It is           SAA             AA is the "signal number"
+       It is           SAA             AA is the signal number.

 
 

-       or...           TAAn...:r...;n:r...;n...:r...;
+       or...           TAAn...:r...;n...:r...;n...:r...;

                                        AA = signal number
                                        AA = signal number

-                                       n... = register number
-                                       r... = register contents
-       or...           WAA             The process extited, and AA is
+                                       n... = register number (hex)
+                                         r... = register contents
+                                       n... = `thread'
+                                         r... = thread process ID.  This is
+                                                a hex integer.
+                                       n... = other string not starting 
+                                           with valid hex digit.
+                                         gdb should ignore this n,r pair
+                                         and go on to the next.  This way
+                                         we can extend the protocol.
+       or...           WAA             The process exited, and AA is

                                        the exit status.  This is only
                                        applicable for certains sorts of
                                        targets.
                                        the exit status.  This is only
                                        applicable for certains sorts of
                                        targets.

-       or...           NAATT;DD;BB     Relocate the object file.
-                                       AA = signal number
-                                       TT = text address
-                                       DD = data address
-                                       BB = bss address
-                                       This is used by the NLM stub,
-                                       which is why it only has three
-                                       addresses rather than one per
-                                       section: the NLM stub always
-                                       sees only three sections, even
-                                       though gdb may see more.
+       or...           XAA             The process terminated with signal
+                                       AA.
+        or...           OXX..XX        XX..XX  is hex encoding of ASCII data. This
+                                       can happen at any time while the program is
+                                       running and the debugger should
+                                       continue to wait for 'W', 'T', etc.
+
+       thread alive    TXX             Find out if the thread XX is alive.
+       reply           OK              thread is still alive
+                       ENN             thread is dead
+       
+       remote restart  RXX             Restart the remote server
+
+       extended ops    !               Use the extended remote protocol.
+                                       Sticky -- only needs to be set once.

 
        kill request    k
 
 
        kill request    k
 


@@ -116,10 +156,27 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
                                        we can extend the protocol and GDB
                                        can tell whether the stub it is
                                        talking to uses the old or the new.
                                        we can extend the protocol and GDB
                                        can tell whether the stub it is
                                        talking to uses the old or the new.

-*/
+       search          tAA:PP,MM       Search backwards starting at address
+                                       AA for a match with pattern PP and
+                                       mask MM.  PP and MM are 4 bytes.
+                                       Not supported by all stubs.
+
+       general query   qXXXX           Request info about XXXX.
+       general set     QXXXX=yyyy      Set value of XXXX to yyyy.
+       query sect offs qOffsets        Get section offsets.  Reply is
+                                       Text=xxx;Data=yyy;Bss=zzz
+
+       Responses can be run-length encoded to save space.  A '*' means that
+       the next character is an ASCII encoding giving a repeat count which
+       stands for that many repititions of the character preceding the '*'.
+       The encoding is n+29, yielding a printable character where n >=3 
+       (which is where rle starts to win).  Don't use an n > 126.
+
+       So 
+       "0* " means the same as "0000".  */

 
 #include "defs.h"
 
 #include "defs.h"

-#include <string.h>
+#include "gdb_string.h"

 #include <fcntl.h>
 #include "frame.h"
 #include "inferior.h"
 #include <fcntl.h>
 #include "frame.h"
 #include "inferior.h"


@@ -127,14 +184,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "target.h"
 #include "wait.h"
 #include "symfile.h"
 #include "target.h"
 #include "wait.h"

-#include "terminal.h"
+/*#include "terminal.h"*/

 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"

+#include "gdbthread.h"

 
 #include "dcache.h"
 
 
 #include "dcache.h"
 

-#if !defined(DONT_USE_REMOTE)

 #ifdef USG
 #include <sys/types.h>
 #endif
 #ifdef USG
 #include <sys/types.h>
 #endif


@@ -144,84 +201,101 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Prototypes for local functions */
 
 
 /* Prototypes for local functions */
 

-static int
-remote_write_bytes PARAMS ((CORE_ADDR memaddr, unsigned char *myaddr, int len));
+static int remote_write_bytes PARAMS ((CORE_ADDR memaddr,
+                                      char *myaddr, int len));

 
 

-static int
-remote_read_bytes PARAMS ((CORE_ADDR memaddr, unsigned char *myaddr, int len));
+static int remote_read_bytes PARAMS ((CORE_ADDR memaddr,
+                                     char *myaddr, int len));

 
 

-static void
-remote_files_info PARAMS ((struct target_ops *ignore));
+static void remote_files_info PARAMS ((struct target_ops *ignore));

 
 

-static int
-remote_xfer_memory PARAMS ((CORE_ADDR memaddr, char *myaddr, int len,
-                           int should_write, struct target_ops *target));
+static int remote_xfer_memory PARAMS ((CORE_ADDR memaddr, char *myaddr,
+                                      int len, int should_write,
+                                      struct target_ops *target));

 
 

-static void 
-remote_prepare_to_store PARAMS ((void));
+static void remote_prepare_to_store PARAMS ((void));

 
 

-static void
-remote_fetch_registers PARAMS ((int regno));
+static void remote_fetch_registers PARAMS ((int regno));

 
 

-static void
-remote_resume PARAMS ((int pid, int step, int siggnal));
+static void remote_resume PARAMS ((int pid, int step,
+                                  enum target_signal siggnal));

 
 

-static int
-remote_start_remote PARAMS ((char *dummy));
+static int remote_start_remote PARAMS ((char *dummy));

 
 

-static void
-remote_open PARAMS ((char *name, int from_tty));
+static void remote_open PARAMS ((char *name, int from_tty));

 
 

-static void
-remote_close PARAMS ((int quitting));
+static void extended_remote_open PARAMS ((char *name, int from_tty));

 
 

-static void
-remote_store_registers PARAMS ((int regno));
+static void remote_open_1 PARAMS ((char *, int, struct target_ops *));

 
 

-static void
-getpkt PARAMS ((char *buf, int forever));
+static void remote_close PARAMS ((int quitting));

 
 

-static void
-putpkt PARAMS ((char *buf));
+static void remote_store_registers PARAMS ((int regno));

 
 

-static void
-remote_send PARAMS ((char *buf));
+static void remote_mourn PARAMS ((void));

 
 

-static int
-readchar PARAMS ((void));
+static void extended_remote_restart PARAMS ((void));

 
 

-static int
-remote_wait PARAMS ((int pid, WAITTYPE *status));
+static void extended_remote_mourn PARAMS ((void));

 
 

-static int
-tohex PARAMS ((int nib));
+static void extended_remote_create_inferior PARAMS ((char *, char *, char **));

 
 

-static int
-fromhex PARAMS ((int a));
+static void remote_mourn_1 PARAMS ((struct target_ops *));

 
 

-static void
-remote_detach PARAMS ((char *args, int from_tty));
+static void getpkt PARAMS ((char *buf, int forever));

 
 

-static void
-remote_interrupt PARAMS ((int signo));
+static int putpkt PARAMS ((char *buf));

 
 

-static void
-remote_interrupt_twice PARAMS ((int signo));
+static void remote_send PARAMS ((char *buf));

 
 

-static void
-interrupt_query PARAMS ((void));
+static int readchar PARAMS ((int timeout));
+
+static int remote_wait PARAMS ((int pid, struct target_waitstatus *status));
+
+static void remote_kill PARAMS ((void));
+
+static int tohex PARAMS ((int nib));
+
+static int fromhex PARAMS ((int a));
+
+static void remote_detach PARAMS ((char *args, int from_tty));
+
+static void remote_interrupt PARAMS ((int signo));
+
+static void remote_interrupt_twice PARAMS ((int signo));
+
+static void interrupt_query PARAMS ((void));
+
+static void set_thread PARAMS ((int, int));
+
+static int remote_thread_alive PARAMS ((int));
+
+static void get_offsets PARAMS ((void));
+
+static int read_frame PARAMS ((char *));
+
+static int remote_insert_breakpoint PARAMS ((CORE_ADDR, char *));
+
+static int remote_remove_breakpoint PARAMS ((CORE_ADDR, char *));

 
 extern struct target_ops remote_ops;   /* Forward decl */
 
 extern struct target_ops remote_ops;   /* Forward decl */

+extern struct target_ops extended_remote_ops;  /* Forward decl */

 
 /* This was 5 seconds, which is a long time to sit and wait.
    Unless this is going though some terminal server or multiplexer or
    other form of hairy serial connection, I would think 2 seconds would
    be plenty.  */
 
 /* This was 5 seconds, which is a long time to sit and wait.
    Unless this is going though some terminal server or multiplexer or
    other form of hairy serial connection, I would think 2 seconds would
    be plenty.  */

-static int timeout = 2;

 
 

-#if 0
-int icache;
-#endif
+/* Changed to allow option to set timeout value.
+   was static int remote_timeout = 2; */
+extern int remote_timeout;
+
+/* This variable chooses whether to send a ^C or a break when the user
+   requests program interruption.  Although ^C is usually what remote
+   systems expect, and that is the default here, sometimes a break is
+   preferable instead.  */
+
+static int remote_break;

 
 /* Descriptor for I/O to remote machine.  Initialize it to NULL so that
    remote_open knows that we don't have a file open when the program
 
 /* Descriptor for I/O to remote machine.  Initialize it to NULL so that
    remote_open knows that we don't have a file open when the program


@@ -240,10 +314,95 @@ serial_t remote_desc = NULL;
 #define MAXBUFBYTES ((PBUFSIZ-32)/2)
 
 /* Round up PBUFSIZ to hold all the registers, at least.  */
 #define MAXBUFBYTES ((PBUFSIZ-32)/2)
 
 /* Round up PBUFSIZ to hold all the registers, at least.  */

+/* The blank line after the #if seems to be required to work around a
+   bug in HP's PA compiler.  */

 #if REGISTER_BYTES > MAXBUFBYTES
 #if REGISTER_BYTES > MAXBUFBYTES

-#undef PBUFSIZ
+
+#undef PBUFSIZ

 #define        PBUFSIZ (REGISTER_BYTES * 2 + 32)
 #endif
 #define        PBUFSIZ (REGISTER_BYTES * 2 + 32)
 #endif

+
+/* This variable sets the number of bytes to be written to the target
+   in a single packet.  Normally PBUFSIZ is satisfactory, but some
+   targets need smaller values (perhaps because the receiving end
+   is slow).  */
+
+static int remote_write_size = PBUFSIZ;
+
+/* Should we try the 'P' request?  If this is set to one when the stub
+   doesn't support 'P', the only consequence is some unnecessary traffic.  */
+static int stub_supports_P = 1;
+
+\f
+/* These are the threads which we last sent to the remote system.  -1 for all
+   or -2 for not sent yet.  */
+int general_thread;
+int cont_thread;
+
+static void
+set_thread (th, gen)
+     int th;
+     int gen;
+{
+  char buf[PBUFSIZ];
+  int state = gen ? general_thread : cont_thread;
+  if (state == th)
+    return;
+  buf[0] = 'H';
+  buf[1] = gen ? 'g' : 'c';
+  if (th == 42000)
+    {
+      buf[2] = '0';
+      buf[3] = '\0';
+    }
+  else if (th < 0)
+    sprintf (&buf[2], "-%x", -th);
+  else
+    sprintf (&buf[2], "%x", th);
+  putpkt (buf);
+  getpkt (buf, 0);
+  if (gen)
+    general_thread = th;
+  else
+    cont_thread = th;
+}
+\f
+/*  Return nonzero if the thread TH is still alive on the remote system.  */
+
+static int
+remote_thread_alive (th)
+     int th;
+{
+  char buf[PBUFSIZ];
+
+  buf[0] = 'T';
+  if (th < 0)
+    sprintf (&buf[1], "-%x", -th);
+  else
+    sprintf (&buf[1], "%x", th);
+  putpkt (buf);
+  getpkt (buf, 0);
+  return (buf[0] == 'O' && buf[1] == 'K');
+}
+
+/*  Restart the remote side; this is an extended protocol operation.  */
+
+static void
+extended_remote_restart ()
+{
+  char buf[PBUFSIZ];
+
+  /* Send the restart command; for reasons I don't understand the
+     remote side really expects a number after the "R".  */
+  buf[0] = 'R';
+  sprintf (&buf[1], "%x", 0);
+  putpkt (buf);
+
+  /* Now query for status so this looks just like we restarted
+     gdbserver from scratch.  */
+  putpkt ("?");
+  getpkt (buf, 0);
+}

 \f
 /* Clean up connection to a remote debugger.  */
 
 \f
 /* Clean up connection to a remote debugger.  */
 


@@ -257,6 +416,57 @@ remote_close (quitting)
   remote_desc = NULL;
 }
 
   remote_desc = NULL;
 }
 

+/* Query the remote side for the text, data and bss offsets. */
+
+static void
+get_offsets ()
+{
+  char buf[PBUFSIZ];
+  int nvals;
+  CORE_ADDR text_addr, data_addr, bss_addr;
+  struct section_offsets *offs;
+
+  putpkt ("qOffsets");
+
+  getpkt (buf, 0);
+
+  if (buf[0] == '\000')
+    return;                    /* Return silently.  Stub doesn't support this
+                                  command. */
+  if (buf[0] == 'E')
+    {
+      warning ("Remote failure reply: %s", buf);
+      return;
+    }
+
+  nvals = sscanf (buf, "Text=%lx;Data=%lx;Bss=%lx", &text_addr, &data_addr,
+                 &bss_addr);
+  if (nvals != 3)
+    error ("Malformed response to offset query, %s", buf);
+
+  if (symfile_objfile == NULL)
+    return;
+
+  offs = (struct section_offsets *) alloca (sizeof (struct section_offsets)
+                                           + symfile_objfile->num_sections
+                                           * sizeof (offs->offsets));
+  memcpy (offs, symfile_objfile->section_offsets,
+         sizeof (struct section_offsets)
+         + symfile_objfile->num_sections
+         * sizeof (offs->offsets));
+
+  ANOFFSET (offs, SECT_OFF_TEXT) = text_addr;
+
+  /* This is a temporary kludge to force data and bss to use the same offsets
+     because that's what nlmconv does now.  The real solution requires changes
+     to the stub and remote.c that I don't have time to do right now.  */
+
+  ANOFFSET (offs, SECT_OFF_DATA) = data_addr;
+  ANOFFSET (offs, SECT_OFF_BSS) = data_addr;
+
+  objfile_relocate (symfile_objfile, offs);
+}
+

 /* Stub for catch_errors.  */
 
 static int
 /* Stub for catch_errors.  */
 
 static int


@@ -266,9 +476,13 @@ remote_start_remote (dummy)
   immediate_quit = 1;          /* Allow user to interrupt it */
 
   /* Ack any packet which the remote side has already sent.  */
   immediate_quit = 1;          /* Allow user to interrupt it */
 
   /* Ack any packet which the remote side has already sent.  */

-  /* I'm not sure this \r is needed; we don't use it any other time we
-     send an ack.  */
-  SERIAL_WRITE (remote_desc, "+\r", 2);
+  SERIAL_WRITE (remote_desc, "+", 1);
+
+  /* Let the stub know that we want it to return the thread.  */
+  set_thread (-1, 0);
+
+  get_offsets ();              /* Get text, data & bss offsets */
+

   putpkt ("?");                        /* initiate a query from remote machine */
   immediate_quit = 0;
 
   putpkt ("?");                        /* initiate a query from remote machine */
   immediate_quit = 0;
 


@@ -279,21 +493,49 @@ remote_start_remote (dummy)
 /* Open a connection to a remote debugger.
    NAME is the filename used for communication.  */
 
 /* Open a connection to a remote debugger.
    NAME is the filename used for communication.  */
 

+static void
+remote_open (name, from_tty)
+     char *name;
+     int from_tty;
+{
+  remote_open_1 (name, from_tty, &remote_ops);
+}
+
+/* Open a connection to a remote debugger using the extended
+   remote gdb protocol.  NAME is the filename used for communication.  */
+
+static void
+extended_remote_open (name, from_tty)
+     char *name;
+     int from_tty;
+{
+  char buf[PBUFSIZ];
+
+  /* Do the basic remote open stuff.  */
+  remote_open_1 (name, from_tty, &extended_remote_ops);
+
+  /* Now tell the remote that we're using the extended protocol.  */
+  putpkt ("!");
+  getpkt (buf, 0);
+
+}
+
+/* Generic code for opening a connection to a remote target.  */

 static DCACHE *remote_dcache;
 
 static void
 static DCACHE *remote_dcache;
 
 static void

-remote_open (name, from_tty)
+remote_open_1 (name, from_tty, target)

      char *name;
      int from_tty;
      char *name;
      int from_tty;

+     struct target_ops *target;

 {
   if (name == 0)
 {
   if (name == 0)

-    error (
-"To open a remote debug connection, you need to specify what serial\n\
+    error ("To open a remote debug connection, you need to specify what serial\n\

 device is attached to the remote system (e.g. /dev/ttya).");
 
   target_preopen (from_tty);
 
 device is attached to the remote system (e.g. /dev/ttya).");
 
   target_preopen (from_tty);
 

-  unpush_target (&remote_ops);
+  unpush_target (target);

 
   remote_dcache = dcache_init (remote_read_bytes, remote_write_bytes);
 
 
   remote_dcache = dcache_init (remote_read_bytes, remote_write_bytes);
 


@@ -301,12 +543,16 @@ device is attached to the remote system (e.g. /dev/ttya).");
   if (!remote_desc)
     perror_with_name (name);
 
   if (!remote_desc)
     perror_with_name (name);
 

-  if (SERIAL_SETBAUDRATE (remote_desc, baud_rate))
+  if (baud_rate != -1)

     {
     {

-      SERIAL_CLOSE (remote_desc);
-      perror_with_name (name);
+      if (SERIAL_SETBAUDRATE (remote_desc, baud_rate))
+       {
+         SERIAL_CLOSE (remote_desc);
+         perror_with_name (name);
+       }

     }
 
     }
 

+

   SERIAL_RAW (remote_desc);
 
   /* If there is something sitting in the buffer we might take it as a
   SERIAL_RAW (remote_desc);
 
   /* If there is something sitting in the buffer we might take it as a


@@ -319,32 +565,51 @@ device is attached to the remote system (e.g. /dev/ttya).");
       puts_filtered (name);
       puts_filtered ("\n");
     }
       puts_filtered (name);
       puts_filtered ("\n");
     }

-  push_target (&remote_ops);   /* Switch to using remote target now */
+  push_target (target);        /* Switch to using remote target now */
+
+  /* Start out by trying the 'P' request to set registers.  We set this each
+     time that we open a new target so that if the user switches from one
+     stub to another, we can (if the target is closed and reopened) cope.  */
+  stub_supports_P = 1;

 
 

+  general_thread = -2;
+  cont_thread = -2;
+
+  /* Without this, some commands which require an active target (such as kill)
+     won't work.  This variable serves (at least) double duty as both the pid
+     of the target process (if it has such), and as a flag indicating that a
+     target is active.  These functions should be split out into seperate
+     variables, especially since GDB will someday have a notion of debugging
+     several processes.  */
+
+  inferior_pid = 42000;

   /* Start the remote connection; if error (0), discard this target.
      In particular, if the user quits, be sure to discard it
      (we'd be in an inconsistent state otherwise).  */
   if (!catch_errors (remote_start_remote, (char *)0, 
   /* Start the remote connection; if error (0), discard this target.
      In particular, if the user quits, be sure to discard it
      (we'd be in an inconsistent state otherwise).  */
   if (!catch_errors (remote_start_remote, (char *)0, 

-       "Couldn't establish connection to remote target\n", RETURN_MASK_ALL))
+                    "Couldn't establish connection to remote target\n", RETURN_MASK_ALL))

     pop_target();
 }
 
     pop_target();
 }
 

-/* remote_detach()
-   takes a program previously attached to and detaches it.
-   We better not have left any breakpoints
-   in the program or it'll die when it hits one.
-   Close the open connection to the remote debugger.
-   Use this when you want to detach and do something else
-   with your gdb.  */
+/* This takes a program previously attached to and detaches it.  After
+   this is done, GDB can be used to debug some other program.  We
+   better not have left any breakpoints in the target program or it'll
+   die when it hits one.  */

 
 static void
 remote_detach (args, from_tty)
      char *args;
      int from_tty;
 {
 
 static void
 remote_detach (args, from_tty)
      char *args;
      int from_tty;
 {

+  char buf[PBUFSIZ];
+

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

-  
+
+  /* Tell the remote target to detach.  */
+  strcpy (buf, "D");
+  remote_send (buf);
+

   pop_target ();
   if (from_tty)
     puts_filtered ("Ending remote debugging.\n");
   pop_target ();
   if (from_tty)
     puts_filtered ("Ending remote debugging.\n");


@@ -360,9 +625,8 @@ fromhex (a)
     return a - '0';
   else if (a >= 'a' && a <= 'f')
     return a - 'a' + 10;
     return a - '0';
   else if (a >= 'a' && a <= 'f')
     return a - 'a' + 10;

-  else
-    error ("Reply contains invalid hex digit");
-  return -1;
+  else 
+    error ("Reply contains invalid hex digit %d", a);

 }
 
 /* Convert number NIB to a hex digit.  */
 }
 
 /* Convert number NIB to a hex digit.  */


@@ -379,29 +643,35 @@ tohex (nib)
 \f
 /* Tell the remote machine to resume.  */
 
 \f
 /* Tell the remote machine to resume.  */
 

+static enum target_signal last_sent_signal = TARGET_SIGNAL_0;
+int last_sent_step;
+

 static void
 remote_resume (pid, step, siggnal)
 static void
 remote_resume (pid, step, siggnal)

-     int pid, step, siggnal;
+     int pid, step;
+     enum target_signal siggnal;

 {
   char buf[PBUFSIZ];
 
 {
   char buf[PBUFSIZ];
 

-  if (siggnal)
-    {
-      char *name;
-      target_terminal_ours_for_output ();
-      printf_filtered ("Can't send signals to a remote system.  ");
-      name = strsigno (siggnal);
-      if (name)
-       printf_filtered (name);
-      else
-       printf_filtered ("Signal %d", siggnal);
-      printf_filtered (" not sent.\n");
-      target_terminal_inferior ();
-    }
+  if (pid == -1)
+    set_thread (inferior_pid, 0);
+  else
+    set_thread (pid, 0);

 
   dcache_flush (remote_dcache);
 
 
   dcache_flush (remote_dcache);
 

-  strcpy (buf, step ? "s": "c");
+  last_sent_signal = siggnal;
+  last_sent_step = step;
+
+  if (siggnal != TARGET_SIGNAL_0)
+    {
+      buf[0] = step ? 'S' : 'C';
+      buf[1] = tohex (((int)siggnal >> 4) & 0xf);
+      buf[2] = tohex ((int)siggnal & 0xf);
+      buf[3] = '\0';
+    }
+  else
+    strcpy (buf, step ? "s": "c");

 
   putpkt (buf);
 }
 
   putpkt (buf);
 }


@@ -417,9 +687,13 @@ remote_interrupt (signo)
   signal (signo, remote_interrupt_twice);
   
   if (remote_debug)
   signal (signo, remote_interrupt_twice);
   
   if (remote_debug)

-    printf ("remote_interrupt called\n");
+    printf_unfiltered ("remote_interrupt called\n");

 
 

-  SERIAL_WRITE (remote_desc, "\003", 1); /* Send a ^C */
+  /* Send a break or a ^C, depending on user preference.  */
+  if (remote_break)
+    SERIAL_SEND_BREAK (remote_desc);
+  else
+    SERIAL_WRITE (remote_desc, "\003", 1);

 }
 
 static void (*ofunc)();
 }
 
 static void (*ofunc)();


@@ -453,6 +727,9 @@ Give up (and stop debugging it)? "))
   target_terminal_inferior ();
 }
 
   target_terminal_inferior ();
 }
 

+/* If nonzero, ignore the next kill.  */
+int kill_kludge;
+

 /* Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.
    Returns "pid" (though it's not clear what, if anything, that
 /* Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.
    Returns "pid" (though it's not clear what, if anything, that


@@ -461,11 +738,13 @@ Give up (and stop debugging it)? "))
 static int
 remote_wait (pid, status)
      int pid;
 static int
 remote_wait (pid, status)
      int pid;

-     WAITTYPE *status;
+     struct target_waitstatus *status;

 {
   unsigned char buf[PBUFSIZ];
 {
   unsigned char buf[PBUFSIZ];

+  int thread_num = -1;

 
 

-  WSETEXIT ((*status), 0);
+  status->kind = TARGET_WAITKIND_EXITED;
+  status->value.integer = 0;

 
   while (1)
     {
 
   while (1)
     {


@@ -475,157 +754,145 @@ remote_wait (pid, status)
       getpkt ((char *) buf, 1);
       signal (SIGINT, ofunc);
 
       getpkt ((char *) buf, 1);
       signal (SIGINT, ofunc);
 

-      if (buf[0] == 'E')
-       warning ("Remote failure reply: %s", buf);
-      else if (buf[0] == 'T')
+      switch (buf[0])

        {
        {

-         int i;
-         long regno;
-         char regs[MAX_REGISTER_RAW_SIZE];
-
-         /* Expedited reply, containing Signal, {regno, reg} repeat */
-         /*  format is:  'Tssn...:r...;n...:r...;n...:r...;#cc', where
-             ss = signal number
-             n... = register number
-             r... = register contents
-             */
-
-         p = &buf[3];          /* after Txx */
-
-         while (*p)
-           {
-             unsigned char *p1;
-
-             regno = strtol (p, &p1, 16); /* Read the register number */
-
-             if (p1 == p)
-               warning ("Remote sent badly formed register number: %s\nPacket: '%s'\n",
-                        p1, buf);
-
-             p = p1;
-
-             if (*p++ != ':')
-               warning ("Malformed packet (missing colon): %s\nPacket: '%s'\n",
-                        p, buf);
-
-             if (regno >= NUM_REGS)
-               warning ("Remote sent bad register number %d: %s\nPacket: '%s'\n",
-                        regno, p, buf);
+       case 'E':               /* Error of some sort */
+         warning ("Remote failure reply: %s", buf);
+         continue;
+       case 'T':               /* Status with PC, SP, FP, ... */
+         {
+           int i;
+           long regno;
+           char regs[MAX_REGISTER_RAW_SIZE];

 
 

-             for (i = 0; i < REGISTER_RAW_SIZE (regno); i++)
-               {
-                 if (p[0] == 0 || p[1] == 0)
-                   warning ("Remote reply is too short: %s", buf);
-                 regs[i] = fromhex (p[0]) * 16 + fromhex (p[1]);
-                 p += 2;
-               }
+           /* Expedited reply, containing Signal, {regno, reg} repeat */
+           /*  format is:  'Tssn...:r...;n...:r...;n...:r...;#cc', where
+               ss = signal number
+               n... = register number
+               r... = register contents
+               */

 
 

-             if (*p++ != ';')
-               warning ("Remote register badly formatted: %s", buf);
+           p = &buf[3];        /* after Txx */

 
 

-             supply_register (regno, regs);
-           }
-         break;
-       }
-      else if (buf[0] == 'N')
-       {
-         unsigned char *p1;
-         bfd_vma text_addr, data_addr, bss_addr;
-
-         /* Relocate object file.  Format is NAATT;DD;BB where AA is
-            the signal number, TT is the new text address, DD is the
-            new data address, and BB is the new bss address.  This is
-            used by the NLM stub; gdb may see more sections.  */
-         p = &buf[3];
-         text_addr = strtoul (p, &p1, 16);
-         if (p1 == p || *p1 != ';')
-           warning ("Malformed relocation packet: Packet '%s'", buf);
-         p = p1 + 1;
-         data_addr = strtoul (p, &p1, 16);
-         if (p1 == p || *p1 != ';')
-           warning ("Malformed relocation packet: Packet '%s'", buf);
-         p = p1 + 1;
-         bss_addr = strtoul (p, &p1, 16);
-         if (p1 == p)
-           warning ("Malformed relocation packet: Packet '%s'", buf);
-
-         if (symfile_objfile != NULL
-             && (ANOFFSET (symfile_objfile->section_offsets,
-                           SECT_OFF_TEXT) != text_addr
-                 || ANOFFSET (symfile_objfile->section_offsets,
-                              SECT_OFF_DATA) != data_addr
-                 || ANOFFSET (symfile_objfile->section_offsets,
-                              SECT_OFF_BSS) != bss_addr))
-           {
-             struct section_offsets *offs;
-
-             /* FIXME: This code assumes gdb-stabs.h is being used;
-                it's broken for xcoff, dwarf, sdb-coff, etc.  But
-                there is no simple canonical representation for this
-                stuff.  (Just what does "text" as seen by the stub
-                mean, anyway?).  */
-
-             offs = ((struct section_offsets *)
-                     alloca (sizeof (struct section_offsets)
-                             + (symfile_objfile->num_sections
-                                * sizeof (offs->offsets))));
-             memcpy (offs, symfile_objfile->section_offsets,
-                     (sizeof (struct section_offsets)
-                      + (symfile_objfile->num_sections
-                         * sizeof (offs->offsets))));
-             ANOFFSET (offs, SECT_OFF_TEXT) = text_addr;
-             ANOFFSET (offs, SECT_OFF_DATA) = data_addr;
-             ANOFFSET (offs, SECT_OFF_BSS) = bss_addr;
-
-             objfile_relocate (symfile_objfile, offs);
+           while (*p)

              {
              {

-               struct obj_section *s;
-               bfd *abfd;
+               unsigned char *p1;
+               char *p_temp;

 
 

-               abfd = symfile_objfile->obfd;
+               regno = strtol ((const char *) p, &p_temp, 16); /* Read the register number */
+               p1 = (unsigned char *)p_temp;

 
 

-               for (s = symfile_objfile->sections;
-                    s < symfile_objfile->sections_end; ++s)
+               if (p1 == p)

                  {
                  {

-                   flagword flags;
-
-                   flags = bfd_get_section_flags (abfd, s->sec_ptr);
-
-                   if (flags & SEC_CODE)
-                     {
-                       s->addr += text_addr;
-                       s->endaddr += text_addr;
-                     }
-                   else if (flags & (SEC_DATA | SEC_LOAD))
+                   p1 = (unsigned char *) strchr ((const char *) p, ':');
+                   if (p1 == NULL)
+                     warning ("Malformed packet (missing colon): %s\n\
+Packet: '%s'\n",
+                              p, buf);
+                   if (strncmp ((const char *) p, "thread", p1 - p) == 0)

                      {
                      {

-                       s->addr += data_addr;
-                       s->endaddr += data_addr;
+                       thread_num = strtol ((const char *) ++p1, &p_temp, 16);
+                       p = (unsigned char *)p_temp;

                      }
                      }

-                   else if (flags & SEC_ALLOC)
+                 }
+               else
+                 {
+                   p = p1;
+
+                   if (*p++ != ':')
+                     warning ("Malformed packet (missing colon): %s\n\
+Packet: '%s'\n",
+                              p, buf);
+
+                   if (regno >= NUM_REGS)
+                     warning ("Remote sent bad register number %ld: %s\n\
+Packet: '%s'\n",
+                              regno, p, buf);
+
+                   for (i = 0; i < REGISTER_RAW_SIZE (regno); i++)

                      {
                      {

-                       s->addr += bss_addr;
-                       s->endaddr += bss_addr;
+                       if (p[0] == 0 || p[1] == 0)
+                         warning ("Remote reply is too short: %s", buf);
+                       regs[i] = fromhex (p[0]) * 16 + fromhex (p[1]);
+                       p += 2;

                      }
                      }

+                   supply_register (regno, regs);

                  }
                  }

+
+               if (*p++ != ';')
+                 warning ("Remote register badly formatted: %s", buf);

              }
              }

+         }
+         /* fall through */
+       case 'S':               /* Old style status, just signal only */
+         status->kind = TARGET_WAITKIND_STOPPED;
+         status->value.sig = (enum target_signal)
+           (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
+
+         goto got_status;
+       case 'W':               /* Target exited */
+         {
+           /* The remote process exited.  */
+           status->kind = TARGET_WAITKIND_EXITED;
+           status->value.integer = (fromhex (buf[1]) << 4) + fromhex (buf[2]);
+           goto got_status;
+         }
+       case 'X':
+         status->kind = TARGET_WAITKIND_SIGNALLED;
+         status->value.sig = (enum target_signal)
+           (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
+         kill_kludge = 1;
+
+         goto got_status;
+       case 'O':               /* Console output */
+         for (p = buf + 1; *p; p +=2) 
+           {
+             char tb[2];
+             char c = fromhex (p[0]) * 16 + fromhex (p[1]);
+             tb[0] = c;
+             tb[1] = 0;
+             if (target_output_hook)
+               target_output_hook (tb);
+             else 
+               fputs_filtered (tb, gdb_stdout);
+           }
+         continue;
+       case '\0':
+         if (last_sent_signal != TARGET_SIGNAL_0)
+           {
+             /* Zero length reply means that we tried 'S' or 'C' and
+                the remote system doesn't support it.  */
+             target_terminal_ours_for_output ();
+             printf_filtered
+               ("Can't send signals to this remote system.  %s not sent.\n",
+                target_signal_to_name (last_sent_signal));
+             last_sent_signal = TARGET_SIGNAL_0;
+             target_terminal_inferior ();
+
+             strcpy ((char *) buf, last_sent_step ? "s" : "c");
+             putpkt ((char *) buf);
+             continue;

            }
            }

-         break;
+         /* else fallthrough */
+       default:
+         warning ("Invalid remote reply: %s", buf);
+         continue;

        }
        }

-      else if (buf[0] == 'W')
+    }
+ got_status:
+  if (thread_num != -1)
+    {
+      /* Initial thread value can only be acquired via wait, so deal with
+        this marker which is used before the first thread value is
+        acquired.  */
+      if (inferior_pid == 42000)

        {
        {

-         /* The remote process exited.  */
-         WSETEXIT (*status, (fromhex (buf[1]) << 4) + fromhex (buf[2]));
-         return 0;
+         inferior_pid = thread_num;
+         add_thread (inferior_pid);

        }
        }

-      else if (buf[0] == 'S')
-       break;
-      else
-       warning ("Invalid remote reply: %s", buf);
+      return thread_num;

     }
     }

-
-  WSETSTOP ((*status), (((fromhex (buf[1])) << 4) + (fromhex (buf[2]))));
-
-  return 0;
+  return inferior_pid;

 }
 
 /* Number of bytes of registers this stub implements.  */
 }
 
 /* Number of bytes of registers this stub implements.  */


@@ -643,6 +910,8 @@ remote_fetch_registers (regno)
   char *p;
   char regs[REGISTER_BYTES];
 
   char *p;
   char regs[REGISTER_BYTES];
 

+  set_thread (inferior_pid, 1);
+

   sprintf (buf, "g");
   remote_send (buf);
 
   sprintf (buf, "g");
   remote_send (buf);
 


@@ -656,7 +925,7 @@ remote_fetch_registers (regno)
         && (buf[0] < 'a' || buf[0] > 'f'))
     {
       if (remote_debug)
         && (buf[0] < 'a' || buf[0] > 'f'))
     {
       if (remote_debug)

-       printf ("Bad register packet; fetching a new packet\n");
+       printf_unfiltered ("Bad register packet; fetching a new packet\n");

       getpkt (buf, 0);
     }
 
       getpkt (buf, 0);
     }
 


@@ -694,8 +963,9 @@ remote_fetch_registers (regno)
     supply_register (i, &regs[REGISTER_BYTE(i)]);
 }
 
     supply_register (i, &regs[REGISTER_BYTE(i)]);
 }
 

-/* Prepare to store registers.  Since we send them all, we have to
-   read out the ones we don't want to change first.  */
+/* Prepare to store registers.  Since we may send them all (using a
+   'G' request), we have to read out the ones we don't want to change
+   first.  */

 
 static void 
 remote_prepare_to_store ()
 
 static void 
 remote_prepare_to_store ()


@@ -704,10 +974,9 @@ remote_prepare_to_store ()
   read_register_bytes (0, (char *)NULL, REGISTER_BYTES);
 }
 
   read_register_bytes (0, (char *)NULL, REGISTER_BYTES);
 }
 

-/* Store the remote registers from the contents of the block REGISTERS. 
-   FIXME, eventually just store one register if that's all that is needed.  */
+/* Store register REGNO, or all registers if REGNO == -1, from the contents
+   of REGISTERS.  FIXME: ignores errors.  */

 
 

-/* ARGSUSED */

 static void
 remote_store_registers (regno)
      int regno;
 static void
 remote_store_registers (regno)
      int regno;


@@ -716,8 +985,37 @@ remote_store_registers (regno)
   int i;
   char *p;
 
   int i;
   char *p;
 

+  set_thread (inferior_pid, 1);
+
+  if (regno >= 0 && stub_supports_P)
+    {
+      /* Try storing a single register.  */
+      char *regp;
+
+      sprintf (buf, "P%x=", regno);
+      p = buf + strlen (buf);
+      regp = &registers[REGISTER_BYTE (regno)];
+      for (i = 0; i < REGISTER_RAW_SIZE (regno); ++i)
+       {
+         *p++ = tohex ((regp[i] >> 4) & 0xf);
+         *p++ = tohex (regp[i] & 0xf);
+       }
+      *p = '\0';
+      remote_send (buf);
+      if (buf[0] != '\0')
+       {
+         /* The stub understands the 'P' request.  We are done.  */
+         return;
+       }
+
+      /* The stub does not support the 'P' request.  Use 'G' instead,
+        and don't try using 'P' in the future (it will just waste our
+        time).  */
+      stub_supports_P = 0;
+    }
+

   buf[0] = 'G';
   buf[0] = 'G';

-  
+

   /* Command describes registers byte by byte,
      each byte encoded as two hex characters.  */
 
   /* Command describes registers byte by byte,
      each byte encoded as two hex characters.  */
 


@@ -733,37 +1031,27 @@ remote_store_registers (regno)
   remote_send (buf);
 }
 
   remote_send (buf);
 }
 

-#if 0
-
-/* Use of the data cache is disabled because it loses for looking at
+/* 
+   Use of the data cache *used* to be disabled because it loses for looking at

    and changing hardware I/O ports and the like.  Accepting `volatile'
    and changing hardware I/O ports and the like.  Accepting `volatile'

-   would perhaps be one way to fix it, but a better way which would
-   win for more cases would be to use the executable file for the text
-   segment, like the `icache' code below but done cleanly (in some
-   target-independent place, perhaps in target_xfer_memory, perhaps
-   based on assigning each target a speed or perhaps by some simpler
-   mechanism).  */
+   would perhaps be one way to fix it.  Another idea would be to use the
+   executable file for the text segment (for all SEC_CODE sections?
+   For all SEC_READONLY sections?).  This has problems if you want to
+   actually see what the memory contains (e.g. self-modifying code,
+   clobbered memory, user downloaded the wrong thing).  
+
+   Because it speeds so much up, it's now enabled, if you're playing
+   with registers you turn it of (set remotecache 0)
+*/

 
 /* Read a word from remote address ADDR and return it.
    This goes through the data cache.  */
 
 
 /* Read a word from remote address ADDR and return it.
    This goes through the data cache.  */
 

+#if 0  /* unused? */

 static int
 remote_fetch_word (addr)
      CORE_ADDR addr;
 {
 static int
 remote_fetch_word (addr)
      CORE_ADDR addr;
 {

-#if 0
-  if (icache)
-    {
-      extern CORE_ADDR text_start, text_end;
-
-      if (addr >= text_start && addr < text_end)
-       {
-         int buffer;
-         xfer_core_file (addr, &buffer, sizeof (int));
-         return buffer;
-       }
-    }
-#endif

   return dcache_fetch (remote_dcache, addr);
 }
 
   return dcache_fetch (remote_dcache, addr);
 }
 


@@ -777,7 +1065,8 @@ remote_store_word (addr, word)
 {
   dcache_poke (remote_dcache, addr, word);
 }
 {
   dcache_poke (remote_dcache, addr, word);
 }

-#endif /* 0 */
+#endif /* 0 (unused?) */
+

 \f
 /* Write memory data directly to the remote machine.
    This does not inform the data cache; the data cache uses this.
 \f
 /* Write memory data directly to the remote machine.
    This does not inform the data cache; the data cache uses this.


@@ -790,37 +1079,52 @@ remote_store_word (addr, word)
 static int
 remote_write_bytes (memaddr, myaddr, len)
      CORE_ADDR memaddr;
 static int
 remote_write_bytes (memaddr, myaddr, len)
      CORE_ADDR memaddr;

-     unsigned char *myaddr;
+     char *myaddr;

      int len;
 {
   char buf[PBUFSIZ];
   int i;
   char *p;
      int len;
 {
   char buf[PBUFSIZ];
   int i;
   char *p;

+  int done;
+  /* Chop the transfer down if necessary */

 
 

-  sprintf (buf, "M%x,%x:", memaddr, len);
+  done = 0;
+  while (done < len)
+    {
+      int todo = len - done;
+      int cando = min(remote_write_size, PBUFSIZ) / 2 - 32; /* num bytes that will fit */

 
 

-  /* We send target system values byte by byte, in increasing byte addresses,
-     each byte encoded as two hex characters.  */
+      if (todo > cando)
+       todo = cando;

 
 

-  p = buf + strlen (buf);
-  for (i = 0; i < len; i++)
-    {
-      *p++ = tohex ((myaddr[i] >> 4) & 0xf);
-      *p++ = tohex (myaddr[i] & 0xf);
-    }
-  *p = '\0';
+      /* FIXME-32x64: Need a version of print_address_numeric which puts the
+        result in a buffer like sprintf.  */
+      sprintf (buf, "M%lx,%x:", (unsigned long) memaddr + done, todo);

 
 

-  putpkt (buf);
-  getpkt (buf, 0);
+      /* We send target system values byte by byte, in increasing byte addresses,
+        each byte encoded as two hex characters.  */

 
 

-  if (buf[0] == 'E')
-    {
-      /* There is no correspondance between what the remote protocol uses
-        for errors and errno codes.  We would like a cleaner way of
-        representing errors (big enough to include errno codes, bfd_error
-        codes, and others).  But for now just return EIO.  */
-      errno = EIO;
-      return 0;
+      p = buf + strlen (buf);
+      for (i = 0; i < todo; i++)
+       {
+         *p++ = tohex ((myaddr[i + done] >> 4) & 0xf);
+         *p++ = tohex (myaddr[i + done] & 0xf);
+       }
+      *p = '\0';
+
+      putpkt (buf);
+      getpkt (buf, 0);
+
+      if (buf[0] == 'E')
+       {
+         /* There is no correspondance between what the remote protocol uses
+            for errors and errno codes.  We would like a cleaner way of
+            representing errors (big enough to include errno codes, bfd_error
+            codes, and others).  But for now just return EIO.  */
+         errno = EIO;
+         return 0;
+       }
+      done += todo;

     }
   return len;
 }
     }
   return len;
 }


@@ -836,44 +1140,60 @@ remote_write_bytes (memaddr, myaddr, len)
 static int
 remote_read_bytes (memaddr, myaddr, len)
      CORE_ADDR memaddr;
 static int
 remote_read_bytes (memaddr, myaddr, len)
      CORE_ADDR memaddr;

-     unsigned char *myaddr;
+     char *myaddr;

      int len;
 {
   char buf[PBUFSIZ];
   int i;
   char *p;
      int len;
 {
   char buf[PBUFSIZ];
   int i;
   char *p;

+  int done;
+  /* Chop transfer down if neccessary */

 
 

+#if 0
+  /* FIXME: This is wrong for larger packets */

   if (len > PBUFSIZ / 2 - 1)
     abort ();
   if (len > PBUFSIZ / 2 - 1)
     abort ();

-
-  sprintf (buf, "m%x,%x", memaddr, len);
-  putpkt (buf);
-  getpkt (buf, 0);
-
-  if (buf[0] == 'E')
+#endif
+  done = 0;
+  while (done < len)

     {
     {

-      /* There is no correspondance between what the remote protocol uses
-        for errors and errno codes.  We would like a cleaner way of
-        representing errors (big enough to include errno codes, bfd_error
-        codes, and others).  But for now just return EIO.  */
-      errno = EIO;
-      return 0;
-    }
+      int todo = len - done;
+      int cando = PBUFSIZ / 2 - 32; /* number of bytes that will fit. */
+      if (todo > cando)
+       todo = cando;
+
+      /* FIXME-32x64: Need a version of print_address_numeric which puts the
+        result in a buffer like sprintf.  */
+      sprintf (buf, "m%lx,%x", (unsigned long) memaddr + done, todo);
+      putpkt (buf);
+      getpkt (buf, 0);
+
+      if (buf[0] == 'E')
+       {
+         /* There is no correspondance between what the remote protocol uses
+            for errors and errno codes.  We would like a cleaner way of
+            representing errors (big enough to include errno codes, bfd_error
+            codes, and others).  But for now just return EIO.  */
+         errno = EIO;
+         return 0;
+       }

 
   /* Reply describes memory byte by byte,
      each byte encoded as two hex characters.  */
 
 
   /* Reply describes memory byte by byte,
      each byte encoded as two hex characters.  */
 

-  p = buf;
-  for (i = 0; i < len; i++)
-    {
-      if (p[0] == 0 || p[1] == 0)
-       /* Reply is short.  This means that we were able to read only part
-          of what we wanted to.  */
-       break;
-      myaddr[i] = fromhex (p[0]) * 16 + fromhex (p[1]);
-      p += 2;
+      p = buf;
+      for (i = 0; i < todo; i++)
+       {
+         if (p[0] == 0 || p[1] == 0)
+           /* Reply is short.  This means that we were able to read only part
+              of what we wanted to.  */
+           return i + done;
+         myaddr[i + done] = fromhex (p[0]) * 16 + fromhex (p[1]);
+         p += 2;
+       }
+      done += todo;

     }
     }

-  return i;
+  return len;

 }
 \f
 /* Read or write LEN bytes from inferior memory at MEMADDR, transferring
 }
 \f
 /* Read or write LEN bytes from inferior memory at MEMADDR, transferring


@@ -889,34 +1209,84 @@ remote_xfer_memory(memaddr, myaddr, len, should_write, target)
      int should_write;
      struct target_ops *target;                        /* ignored */
 {
      int should_write;
      struct target_ops *target;                        /* ignored */
 {

-  int xfersize;
-  int bytes_xferred;
-  int total_xferred = 0;
+  return dcache_xfer_memory (remote_dcache, memaddr, myaddr, len, should_write);
+}

 
 

-  while (len > 0)
-    {
-      if (len > MAXBUFBYTES)
-       xfersize = MAXBUFBYTES;
-      else
-       xfersize = len;
+   
+#if 0
+/* Enable after 4.12.  */

 
 

-      if (should_write)
-        bytes_xferred = remote_write_bytes (memaddr, myaddr, xfersize);
-      else
-       bytes_xferred = remote_read_bytes (memaddr, myaddr, xfersize);
+void
+remote_search (len, data, mask, startaddr, increment, lorange, hirange
+              addr_found, data_found)
+     int len;
+     char *data;
+     char *mask;
+     CORE_ADDR startaddr;
+     int increment;
+     CORE_ADDR lorange;
+     CORE_ADDR hirange;
+     CORE_ADDR *addr_found;
+     char *data_found;
+{
+  if (increment == -4 && len == 4)
+    {
+      long mask_long, data_long;
+      long data_found_long;
+      CORE_ADDR addr_we_found;
+      char buf[PBUFSIZ];
+      long returned_long[2];
+      char *p;
+
+      mask_long = extract_unsigned_integer (mask, len);
+      data_long = extract_unsigned_integer (data, len);
+      sprintf (buf, "t%x:%x,%x", startaddr, data_long, mask_long);
+      putpkt (buf);
+      getpkt (buf, 0);
+      if (buf[0] == '\0')
+       {
+         /* The stub doesn't support the 't' request.  We might want to
+            remember this fact, but on the other hand the stub could be
+            switched on us.  Maybe we should remember it only until
+            the next "target remote".  */
+         generic_search (len, data, mask, startaddr, increment, lorange,
+                         hirange, addr_found, data_found);
+         return;
+       }

 
 

-      /* If we get an error, we are done xferring.  */
-      if (bytes_xferred == 0)
-       break;
+      if (buf[0] == 'E')
+       /* There is no correspondance between what the remote protocol uses
+          for errors and errno codes.  We would like a cleaner way of
+          representing errors (big enough to include errno codes, bfd_error
+          codes, and others).  But for now just use EIO.  */
+       memory_error (EIO, startaddr);
+      p = buf;
+      addr_we_found = 0;
+      while (*p != '\0' && *p != ',')
+       addr_we_found = (addr_we_found << 4) + fromhex (*p++);
+      if (*p == '\0')
+       error ("Protocol error: short return for search");
+
+      data_found_long = 0;
+      while (*p != '\0' && *p != ',')
+       data_found_long = (data_found_long << 4) + fromhex (*p++);
+      /* Ignore anything after this comma, for future extensions.  */
+
+      if (addr_we_found < lorange || addr_we_found >= hirange)
+       {
+         *addr_found = 0;
+         return;
+       }

 
 

-      memaddr += bytes_xferred;
-      myaddr  += bytes_xferred;
-      len     -= bytes_xferred;
-      total_xferred += bytes_xferred;
+      *addr_found = addr_we_found;
+      *data_found = store_unsigned_integer (data_we_found, len);
+      return;

     }
     }

-  return total_xferred;
+  generic_search (len, data, mask, startaddr, increment, lorange,
+                 hirange, addr_found, data_found);

 }
 }

-
+#endif /* 0 */
+\f

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


@@ -930,16 +1300,24 @@ remote_files_info (ignore)
 /* Read a single character from the remote end, masking it down to 7 bits. */
 
 static int
 /* Read a single character from the remote end, masking it down to 7 bits. */
 
 static int

-readchar ()
+readchar (timeout)
+     int timeout;

 {
   int ch;
 
   ch = SERIAL_READCHAR (remote_desc, timeout);
 
 {
   int ch;
 
   ch = SERIAL_READCHAR (remote_desc, timeout);
 

-  if (ch < 0)
-    return ch;
-
-  return ch & 0x7f;
+  switch (ch)
+    {
+    case SERIAL_EOF:
+      error ("Remote connection closed");
+    case SERIAL_ERROR:
+      perror_with_name ("Remote communication error");
+    case SERIAL_TIMEOUT:
+      return ch;
+    default:
+      return ch & 0x7f;
+    }

 }
 
 /* Send the command in BUF to the remote machine,
 }
 
 /* Send the command in BUF to the remote machine,


@@ -950,7 +1328,6 @@ static void
 remote_send (buf)
      char *buf;
 {
 remote_send (buf)
      char *buf;
 {

-

   putpkt (buf);
   getpkt (buf, 0);
 
   putpkt (buf);
   getpkt (buf, 0);
 


@@ -961,7 +1338,7 @@ remote_send (buf)
 /* Send a packet to the remote machine, with error checking.
    The data of the packet is in BUF.  */
 
 /* Send a packet to the remote machine, with error checking.
    The data of the packet is in BUF.  */
 

-static void
+static int

 putpkt (buf)
      char *buf;
 {
 putpkt (buf)
      char *buf;
 {


@@ -970,12 +1347,13 @@ putpkt (buf)
   char buf2[PBUFSIZ];
   int cnt = strlen (buf);
   int ch;
   char buf2[PBUFSIZ];
   int cnt = strlen (buf);
   int ch;

+  int tcount = 0;

   char *p;
 
   /* Copy the packet into buffer BUF2, encapsulating it
      and giving it a checksum.  */
 
   char *p;
 
   /* Copy the packet into buffer BUF2, encapsulating it
      and giving it a checksum.  */
 

-  if (cnt > sizeof(buf2) - 5)          /* Prosanity check */
+  if (cnt > (int) sizeof (buf2) - 5)           /* Prosanity check */

     abort();
 
   p = buf2;
     abort();
 
   p = buf2;


@@ -994,10 +1372,13 @@ putpkt (buf)
 
   while (1)
     {
 
   while (1)
     {

+      int started_error_output = 0;
+

       if (remote_debug)
        {
          *p = '\0';
       if (remote_debug)
        {
          *p = '\0';

-         printf ("Sending packet: %s...", buf2);  fflush(stdout);
+         printf_unfiltered ("Sending packet: %s...", buf2);
+         gdb_flush(gdb_stdout);

        }
       if (SERIAL_WRITE (remote_desc, buf2, p - buf2))
        perror_with_name ("putpkt: write failed");
        }
       if (SERIAL_WRITE (remote_desc, buf2, p - buf2))
        perror_with_name ("putpkt: write failed");


@@ -1005,33 +1386,158 @@ putpkt (buf)
       /* read until either a timeout occurs (-2) or '+' is read */
       while (1)
        {
       /* read until either a timeout occurs (-2) or '+' is read */
       while (1)
        {

-         ch = readchar ();
+         ch = readchar (remote_timeout);
+
+         if (remote_debug)
+           {
+             switch (ch)
+               {
+               case '+':
+               case SERIAL_TIMEOUT:
+               case '$':
+                 if (started_error_output)
+                   {
+                     putchar_unfiltered ('\n');
+                     started_error_output = 0;
+                   }
+               }
+           }

 
          switch (ch)
            {
            case '+':
              if (remote_debug)
 
          switch (ch)
            {
            case '+':
              if (remote_debug)

-               printf("Ack\n");
-             return;
+               printf_unfiltered("Ack\n");
+             return 1;

            case SERIAL_TIMEOUT:
            case SERIAL_TIMEOUT:

+             tcount ++;
+             if (tcount > 3)
+               return 0;

              break;            /* Retransmit buffer */
              break;            /* Retransmit buffer */

-           case SERIAL_ERROR:
-             perror_with_name ("putpkt: couldn't read ACK");
-           case SERIAL_EOF:
-             error ("putpkt: EOF while trying to read ACK");
+           case '$':
+             {
+               char junkbuf[PBUFSIZ];
+
+             /* It's probably an old response, and we're out of sync.  Just
+                gobble up the packet and ignore it.  */
+               getpkt (junkbuf, 0);
+               continue;               /* Now, go look for + */
+             }

            default:
              if (remote_debug)
            default:
              if (remote_debug)

-               printf ("%02X %c ", ch&0xFF, ch);
+               {
+                 if (!started_error_output)
+                   {
+                     started_error_output = 1;
+                     printf_unfiltered ("putpkt: Junk: ");
+                   }
+                 putchar_unfiltered (ch & 0177);
+               }

              continue;
            }
          break;                /* Here to retransmit */
        }
 
              continue;
            }
          break;                /* Here to retransmit */
        }
 

+#if 0
+      /* This is wrong.  If doing a long backtrace, the user should be
+        able to get out next time we call QUIT, without anything as violent
+        as interrupt_query.  If we want to provide a way out of here
+        without getting to the next QUIT, it should be based on hitting
+        ^C twice as in remote_wait.  */

       if (quit_flag)
        {
          quit_flag = 0;
          interrupt_query ();
        }
       if (quit_flag)
        {
          quit_flag = 0;
          interrupt_query ();
        }

+#endif
+    }
+}
+
+/* Come here after finding the start of the frame.  Collect the rest into BUF,
+   verifying the checksum, length, and handling run-length compression.
+   Returns 0 on any error, 1 on success.  */
+
+static int
+read_frame (buf)
+     char *buf;
+{
+  unsigned char csum;
+  char *bp;
+  int c;
+
+  csum = 0;
+  bp = buf;
+
+  while (1)
+    {
+      c = readchar (remote_timeout);
+
+      switch (c)
+       {
+       case SERIAL_TIMEOUT:
+         if (remote_debug)
+           puts_filtered ("Timeout in mid-packet, retrying\n");
+         return 0;
+       case '$':
+         if (remote_debug)
+           puts_filtered ("Saw new packet start in middle of old one\n");
+         return 0;             /* Start a new packet, count retries */
+       case '#':
+         {
+           unsigned char pktcsum;
+
+           *bp = '\000';
+
+           pktcsum = fromhex (readchar (remote_timeout)) << 4;
+           pktcsum |= fromhex (readchar (remote_timeout));
+
+           if (csum == pktcsum)
+             return 1;
+
+           if (remote_debug) 
+             {
+               printf_filtered ("Bad checksum, sentsum=0x%x, csum=0x%x, buf=",
+                                pktcsum, csum);
+               puts_filtered (buf);
+               puts_filtered ("\n");
+             }
+           return 0;
+         }
+       case '*':               /* Run length encoding */
+         csum += c;
+         c = readchar (remote_timeout);
+         csum += c;
+         c = c - ' ' + 3;      /* Compute repeat count */
+
+
+         if (c > 0 && c < 255 && bp + c - 1 < buf + PBUFSIZ - 1)
+           {
+             memset (bp, *(bp - 1), c);
+             bp += c;
+             continue;
+           }
+
+         *bp = '\0';
+         printf_filtered ("Repeat count %d too large for buffer: ", c);
+         puts_filtered (buf);
+         puts_filtered ("\n");
+         return 0;
+
+       default:
+         if (bp < buf + PBUFSIZ - 1)
+           {
+             *bp++ = c;
+             csum += c;
+             continue;
+           }
+
+         *bp = '\0';
+         puts_filtered ("Remote packet too long: ");
+         puts_filtered (buf);
+         puts_filtered ("\n");
+
+         return 0;
+       }

     }
 }
 
     }
 }
 


@@ -1045,111 +1551,96 @@ getpkt (buf, forever)
      char *buf;
      int forever;
 {
      char *buf;
      int forever;
 {

-  char *bp;
-  unsigned char csum;
-  int c = 0;
-  unsigned char c1, c2;
-  int retries = 0;
-#define MAX_RETRIES    10
+  int c;
+  int tries;
+  int timeout;
+  int val;

 
 

-  while (1)
+  strcpy (buf,"timeout");
+
+  if (forever)

     {
     {

-      if (quit_flag)
-       {
-         quit_flag = 0;
-         interrupt_query ();
-       }
+#ifdef MAINTENANCE_CMDS
+      timeout = watchdog > 0 ? watchdog : -1;
+#else
+      timeout = -1;
+#endif
+    }

 
 

+  else
+    timeout = remote_timeout;
+
+#define MAX_TRIES 3
+
+  for (tries = 1; tries <= MAX_TRIES; tries++)
+    {

       /* This can loop forever if the remote side sends us characters
         continuously, but if it pauses, we'll get a zero from readchar
         because of timeout.  Then we'll count that as a retry.  */
 
       /* This can loop forever if the remote side sends us characters
         continuously, but if it pauses, we'll get a zero from readchar
         because of timeout.  Then we'll count that as a retry.  */
 

-      c = readchar();
-      if (c > 0 && c != '$')
-       continue;
+      /* Note that we will only wait forever prior to the start of a packet.
+        After that, we expect characters to arrive at a brisk pace.  They
+        should show up within remote_timeout intervals.  */

 
 

-      if (c == SERIAL_TIMEOUT)
+      do

        {
        {

-         if (forever)
-           continue;
-         if (++retries >= MAX_RETRIES)
-           if (remote_debug) puts_filtered ("Timed out.\n");
-         goto out;
-       }
-
-      if (c == SERIAL_EOF)
-       error ("Remote connection closed");
-      if (c == SERIAL_ERROR)
-       perror_with_name ("Remote communication error");
-
-      /* Force csum to be zero here because of possible error retry.  */
-      csum = 0;
-      bp = buf;
+         c = readchar (timeout);

 
 

-      while (1)
-       {
-         c = readchar ();

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

+#ifdef MAINTENANCE_CMDS
+             if (forever)      /* Watchdog went off.  Kill the target. */
+               {
+                 target_mourn_inferior ();
+                 error ("Watchdog has expired.  Target detached.\n");
+               }
+#endif

              if (remote_debug)
              if (remote_debug)

-               puts_filtered ("Timeout in mid-packet, retrying\n");
-             goto whole;               /* Start a new packet, count retries */
-           } 
-         if (c == '$')
-           {
-             if (remote_debug)
-               puts_filtered ("Saw new packet start in middle of old one\n");
-             goto whole;               /* Start a new packet, count retries */
+               puts_filtered ("Timed out.\n");
+             goto retry;

            }
            }

-         if (c == '#')
-           break;
-         if (bp >= buf+PBUFSIZ-1)
-         {
-           *bp = '\0';
-           puts_filtered ("Remote packet too long: ");
-           puts_filtered (buf);
-           puts_filtered ("\n");
-           goto whole;
-         }
-         *bp++ = c;
-         csum += c;

        }
        }

-      *bp = 0;
+      while (c != '$');

 
 

-      c1 = fromhex (readchar ());
-      c2 = fromhex (readchar ());
-      if ((csum & 0xff) == (c1 << 4) + c2)
-       break;
-      printf_filtered ("Bad checksum, sentsum=0x%x, csum=0x%x, buf=",
-             (c1 << 4) + c2, csum & 0xff);
-      puts_filtered (buf);
-      puts_filtered ("\n");
+      /* We've found the start of a packet, now collect the data.  */

 
 

-      /* Try the whole thing again.  */
-whole:
-      if (++retries < MAX_RETRIES)
-       {
-         SERIAL_WRITE (remote_desc, "-", 1);
-       }
-      else
+      val = read_frame (buf);
+
+      if (val == 1)

        {
        {

-         printf ("Ignoring packet error, continuing...\n");
-         break;
+         if (remote_debug)
+           fprintf_unfiltered (gdb_stderr, "Packet received: %s\n", buf);
+         SERIAL_WRITE (remote_desc, "+", 1);
+         return;

        }
        }

+
+      /* Try the whole thing again.  */
+    retry:
+      SERIAL_WRITE (remote_desc, "-", 1);

     }
 
     }
 

-out:
+  /* We have tried hard enough, and just can't receive the packet.  Give up. */

 
 

+  printf_unfiltered ("Ignoring packet error, continuing...\n");

   SERIAL_WRITE (remote_desc, "+", 1);
   SERIAL_WRITE (remote_desc, "+", 1);

-
-  if (remote_debug)
-    fprintf (stderr,"Packet received: %s\n", buf);

 }
 \f
 static void
 remote_kill ()
 {
 }
 \f
 static void
 remote_kill ()
 {

-  putpkt ("k");
+  /* For some mysterious reason, wait_for_inferior calls kill instead of
+     mourn after it gets TARGET_WAITKIND_SIGNALLED.  Work around it.  */
+  if (kill_kludge)
+    {
+      kill_kludge = 0;
+      target_mourn_inferior ();
+      return;
+    }
+
+  /* Use catch_errors so the user can quit from gdb even when we aren't on
+     speaking terms with the remote system.  */
+  catch_errors (putpkt, "k", "", RETURN_MASK_ERROR);
+

   /* Don't wait for it to die.  I'm not really sure it matters whether
      we do or not.  For the existing stubs, kill is a noop.  */
   target_mourn_inferior ();
   /* Don't wait for it to die.  I'm not really sure it matters whether
      we do or not.  For the existing stubs, kill is a noop.  */
   target_mourn_inferior ();


@@ -1158,26 +1649,90 @@ remote_kill ()
 static void
 remote_mourn ()
 {
 static void
 remote_mourn ()
 {

-  unpush_target (&remote_ops);
+  remote_mourn_1 (&remote_ops);
+}
+
+static void
+extended_remote_mourn ()
+{
+  /* We do _not_ want to mourn the target like this; this will
+     remove the extended remote target  from the target stack,
+     and the next time the user says "run" it'll fail. 
+
+     FIXME: What is the right thing to do here?  */
+#if 0
+  remote_mourn_1 (&extended_remote_ops);
+#endif
+}
+
+/* Worker function for remote_mourn.  */
+static void
+remote_mourn_1 (target)
+     struct target_ops *target;
+{
+  unpush_target (target);

   generic_mourn_inferior ();
 }
   generic_mourn_inferior ();
 }

-\f
-#ifdef REMOTE_BREAKPOINT

 
 

+/* In the extended protocol we want to be able to do things like
+   "run" and have them basically work as expected.  So we need
+   a special create_inferior function. 
+
+   FIXME: One day add support for changing the exec file
+   we're debugging, arguments and an environment.  */
+
+static void
+extended_remote_create_inferior (exec_file, args, env)
+     char *exec_file;
+     char *args;
+     char **env;
+{
+  /* Rip out the breakpoints; we'll reinsert them after restarting
+     the remote server.  */
+  remove_breakpoints ();
+
+  /* Now restart the remote server.  */
+  extended_remote_restart ();
+
+  /* Now put the breakpoints back in.  This way we're safe if the
+     restart function works via a unix fork on the remote side.  */
+  insert_breakpoints ();
+
+  /* Clean up from the last time we were running.  */
+  clear_proceed_status ();
+
+  /* Let the remote process run.  */
+  proceed (-1, TARGET_SIGNAL_0, 0);
+}
+
+\f

 /* On some machines, e.g. 68k, we may use a different breakpoint instruction
 /* On some machines, e.g. 68k, we may use a different breakpoint instruction

-   than other targets.  */
-static unsigned char break_insn[] = REMOTE_BREAKPOINT;
+   than other targets; in those use REMOTE_BREAKPOINT instead of just
+   BREAKPOINT.  Also, bi-endian targets may define LITTLE_REMOTE_BREAKPOINT
+   and BIG_REMOTE_BREAKPOINT.  If none of these are defined, we just call
+   the standard routines that are in mem-break.c.  */
+
+/* FIXME, these ought to be done in a more dynamic fashion.  For instance,
+   the choice of breakpoint instruction affects target program design and
+   vice versa, and by making it user-tweakable, the special code here
+   goes away and we need fewer special GDB configurations.  */
+
+#if defined (LITTLE_REMOTE_BREAKPOINT) && defined (BIG_REMOTE_BREAKPOINT) && !defined(REMOTE_BREAKPOINT)
+#define REMOTE_BREAKPOINT
+#endif

 
 

-/* Check that it fits in BREAKPOINT_MAX bytes.  */
-static unsigned char check_break_insn_size[BREAKPOINT_MAX] = REMOTE_BREAKPOINT;
+#ifdef REMOTE_BREAKPOINT

 
 

-#else /* No REMOTE_BREAKPOINT.  */
+/* If the target isn't bi-endian, just pretend it is.  */
+#if !defined (LITTLE_REMOTE_BREAKPOINT) && !defined (BIG_REMOTE_BREAKPOINT)
+#define LITTLE_REMOTE_BREAKPOINT REMOTE_BREAKPOINT
+#define BIG_REMOTE_BREAKPOINT REMOTE_BREAKPOINT
+#endif

 
 

-/* Same old breakpoint instruction.  This code does nothing different
-   than mem-break.c.  */
-static unsigned char break_insn[] = BREAKPOINT;
+static unsigned char big_break_insn[] = BIG_REMOTE_BREAKPOINT;
+static unsigned char little_break_insn[] = LITTLE_REMOTE_BREAKPOINT;

 
 

-#endif /* No REMOTE_BREAKPOINT.  */
+#endif /* REMOTE_BREAKPOINT */

 
 /* Insert a breakpoint on targets that don't have any better breakpoint
    support.  We read the contents of the target location and stash it,
 
 /* Insert a breakpoint on targets that don't have any better breakpoint
    support.  We read the contents of the target location and stash it,


@@ -1192,14 +1747,25 @@ remote_insert_breakpoint (addr, contents_cache)
      CORE_ADDR addr;
      char *contents_cache;
 {
      CORE_ADDR addr;
      char *contents_cache;
 {

+#ifdef REMOTE_BREAKPOINT

   int val;
 
   int val;
 

-  val = target_read_memory (addr, contents_cache, sizeof break_insn);
+  val = target_read_memory (addr, contents_cache, sizeof big_break_insn);

 
   if (val == 0)
 
   if (val == 0)

-    val = target_write_memory (addr, (char *)break_insn, sizeof break_insn);
+    {
+      if (TARGET_BYTE_ORDER == BIG_ENDIAN)
+       val = target_write_memory (addr, (char *) big_break_insn,
+                                  sizeof big_break_insn);
+      else
+       val = target_write_memory (addr, (char *) little_break_insn,
+                                  sizeof little_break_insn);
+    }

 
   return val;
 
   return val;

+#else
+  return memory_insert_breakpoint (addr, contents_cache);
+#endif /* REMOTE_BREAKPOINT */

 }
 
 static int
 }
 
 static int


@@ -1207,7 +1773,11 @@ remote_remove_breakpoint (addr, contents_cache)
      CORE_ADDR addr;
      char *contents_cache;
 {
      CORE_ADDR addr;
      char *contents_cache;
 {

-  return target_write_memory (addr, contents_cache, sizeof break_insn);
+#ifdef REMOTE_BREAKPOINT
+  return target_write_memory (addr, contents_cache, sizeof big_break_insn);
+#else
+  return memory_remove_breakpoint (addr, contents_cache);
+#endif /* REMOTE_BREAKPOINT */

 }
 \f
 /* Define the target subroutine names */
 }
 \f
 /* Define the target subroutine names */


@@ -1228,10 +1798,8 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",  /* to_doc */
   remote_prepare_to_store,     /* to_prepare_to_store */
   remote_xfer_memory,          /* to_xfer_memory */
   remote_files_info,           /* to_files_info */
   remote_prepare_to_store,     /* to_prepare_to_store */
   remote_xfer_memory,          /* to_xfer_memory */
   remote_files_info,           /* to_files_info */

-

   remote_insert_breakpoint,    /* to_insert_breakpoint */
   remote_remove_breakpoint,    /* to_remove_breakpoint */
   remote_insert_breakpoint,    /* to_insert_breakpoint */
   remote_remove_breakpoint,    /* to_remove_breakpoint */

-

   NULL,                                /* to_terminal_init */
   NULL,                                /* to_terminal_inferior */
   NULL,                                /* to_terminal_ours_for_output */
   NULL,                                /* to_terminal_init */
   NULL,                                /* to_terminal_inferior */
   NULL,                                /* to_terminal_ours_for_output */


@@ -1244,6 +1812,54 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",  /* to_doc */
   remote_mourn,                        /* to_mourn_inferior */
   0,                           /* to_can_run */
   0,                           /* to_notice_signals */
   remote_mourn,                        /* to_mourn_inferior */
   0,                           /* to_can_run */
   0,                           /* to_notice_signals */

+  remote_thread_alive,         /* to_thread_alive */
+  0,                           /* to_stop */
+  process_stratum,             /* to_stratum */
+  NULL,                                /* to_next */
+  1,                           /* to_has_all_memory */
+  1,                           /* to_has_memory */
+  1,                           /* to_has_stack */
+  1,                           /* to_has_registers */
+  1,                           /* to_has_execution */
+  NULL,                                /* sections */
+  NULL,                                /* sections_end */
+  OPS_MAGIC                    /* to_magic */
+};
+
+struct target_ops extended_remote_ops = {
+  "extended-remote",                   /* to_shortname */
+  "Extended remote serial target in gdb-specific protocol",/* to_longname */
+  "Use a remote computer via a serial line, using a gdb-specific protocol.\n\
+Specify the serial device it is connected to (e.g. /dev/ttya).",  /* to_doc */
+  extended_remote_open,                        /* to_open */
+  remote_close,                        /* to_close */
+  NULL,                                /* to_attach */
+  remote_detach,               /* to_detach */
+  remote_resume,               /* to_resume */
+  remote_wait,                 /* to_wait */
+  remote_fetch_registers,      /* to_fetch_registers */
+  remote_store_registers,      /* to_store_registers */
+  remote_prepare_to_store,     /* to_prepare_to_store */
+  remote_xfer_memory,          /* to_xfer_memory */
+  remote_files_info,           /* to_files_info */
+
+  remote_insert_breakpoint,    /* to_insert_breakpoint */
+  remote_remove_breakpoint,    /* to_remove_breakpoint */
+
+  NULL,                                /* to_terminal_init */
+  NULL,                                /* to_terminal_inferior */
+  NULL,                                /* to_terminal_ours_for_output */
+  NULL,                                /* to_terminal_ours */
+  NULL,                                /* to_terminal_info */
+  remote_kill,                 /* to_kill */
+  generic_load,                        /* to_load */
+  NULL,                                /* to_lookup_symbol */
+  extended_remote_create_inferior,/* to_create_inferior */
+  extended_remote_mourn,       /* to_mourn_inferior */
+  0,                           /* to_can_run */
+  0,                           /* to_notice_signals */
+  remote_thread_alive,         /* to_thread_alive */
+  0,                           /* to_stop */

   process_stratum,             /* to_stratum */
   NULL,                                /* to_next */
   1,                           /* to_has_all_memory */
   process_stratum,             /* to_stratum */
   NULL,                                /* to_next */
   1,                           /* to_has_all_memory */


@@ -1255,12 +1871,25 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",  /* to_doc */
   NULL,                                /* sections_end */
   OPS_MAGIC                    /* to_magic */
 };
   NULL,                                /* sections_end */
   OPS_MAGIC                    /* to_magic */
 };

-#endif /* Use remote.  */

 
 void
 _initialize_remote ()
 {
 
 void
 _initialize_remote ()
 {

-#if !defined(DONT_USE_REMOTE)

   add_target (&remote_ops);
   add_target (&remote_ops);

-#endif
+  add_target (&extended_remote_ops);
+
+  add_show_from_set (add_set_cmd ("remotetimeout", no_class,
+                                 var_integer, (char *)&remote_timeout,
+                                 "Set timeout value for remote read.\n", &setlist),
+                    &showlist);
+
+  add_show_from_set (add_set_cmd ("remotebreak", no_class,
+                                 var_integer, (char *)&remote_break,
+                                 "Set whether to send break if interrupted.\n", &setlist),
+                    &showlist);
+
+  add_show_from_set (add_set_cmd ("remotewritesize", no_class,
+                                 var_integer, (char *)&remote_write_size,
+                                 "Set the maximum number of bytes in each memory write packet.\n", &setlist),
+                    &showlist);

 }
 }