diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 4ec0ec1..8d02002 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -21823,7 +21823,6 @@ acceptable commands.
 
 @menu
 * ARM::                         ARM
-* M32R/SDI::                    Renesas M32R/SDI
 * M68K::                        Motorola M68K
 * MicroBlaze::			Xilinx MicroBlaze
 * MIPS Embedded::               MIPS Embedded
@@ -21930,43 +21929,6 @@ The default value is @code{all}.
 @end table
 @end table
 
-@node M32R/SDI
-@subsection Renesas M32R/SDI
-
-The following commands are available for M32R/SDI:
-
-@table @code
-@item sdireset
-@kindex sdireset
-@cindex reset SDI connection, M32R
-This command resets the SDI connection.
-
-@item sdistatus
-@kindex sdistatus
-This command shows the SDI connection status.
-
-@item debug_chaos
-@kindex debug_chaos
-@cindex M32R/Chaos debugging
-Instructs the remote that M32R/Chaos debugging is to be used.
-
-@item use_debug_dma
-@kindex use_debug_dma
-Instructs the remote to use the DEBUG_DMA method of accessing memory.
-
-@item use_mon_code
-@kindex use_mon_code
-Instructs the remote to use the MON_CODE method of accessing memory.
-
-@item use_ib_break
-@kindex use_ib_break
-Instructs the remote to set breakpoints by IB break.
-
-@item use_dbt_break
-@kindex use_dbt_break
-Instructs the remote to set breakpoints by DBT.
-@end table
-
 @node M68K
 @subsection M68k
 
@@ -22013,59 +21975,8 @@ Show MicroBlaze-specific debugging level.
 @node MIPS Embedded
 @subsection @acronym{MIPS} Embedded
 
-@cindex @acronym{MIPS} boards
-@value{GDBN} can use the @acronym{MIPS} remote debugging protocol to talk to a
-@acronym{MIPS} board attached to a serial line.  This is available when
-you configure @value{GDBN} with @samp{--target=mips-elf}.
-
-@need 1000
-Use these @value{GDBN} commands to specify the connection to your target board:
-
-@table @code
-@item target mips @var{port}
-@kindex target mips @var{port}
-To run a program on the board, start up @code{@value{GDBP}} with the
-name of your program as the argument.  To connect to the board, use the
-command @samp{target mips @var{port}}, where @var{port} is the name of
-the serial port connected to the board.  If the program has not already
-been downloaded to the board, you may use the @code{load} command to
-download it.  You can then use all the usual @value{GDBN} commands.
-
-For example, this sequence connects to the target board through a serial
-port, and loads and runs a program called @var{prog} through the
-debugger:
-
-@smallexample
-host$ @value{GDBP} @var{prog}
-@value{GDBN} is free software and @dots{}
-(@value{GDBP}) target mips /dev/ttyb
-(@value{GDBP}) load @var{prog}
-(@value{GDBP}) run
-@end smallexample
-
-@item target mips @var{hostname}:@var{portnumber}
-On some @value{GDBN} host configurations, you can specify a TCP
-connection (for instance, to a serial line managed by a terminal
-concentrator) instead of a serial port, using the syntax
-@samp{@var{hostname}:@var{portnumber}}.
-
-@item target pmon @var{port}
-@kindex target pmon @var{port}
-PMON ROM monitor.
-
-@item target ddb @var{port}
-@kindex target ddb @var{port}
-NEC's DDB variant of PMON for Vr4300.
-
-@item target lsi @var{port}
-@kindex target lsi @var{port}
-LSI variant of PMON.
-
-@end table
-
-
 @noindent
-@value{GDBN} also supports these special commands for @acronym{MIPS} targets:
+@value{GDBN} supports these special commands for @acronym{MIPS} targets:
 
 @table @code
 @item set mipsfpu double
@@ -22095,78 +22006,6 @@ and @samp{set mipsfpu off} will select no floating point.
 
 As usual, you can inquire about the @code{mipsfpu} variable with
 @samp{show mipsfpu}.
-
-@item set timeout @var{seconds}
-@itemx set retransmit-timeout @var{seconds}
-@itemx show timeout
-@itemx show retransmit-timeout
-@cindex @code{timeout}, @acronym{MIPS} protocol
-@cindex @code{retransmit-timeout}, @acronym{MIPS} protocol
-@kindex set timeout
-@kindex show timeout
-@kindex set retransmit-timeout
-@kindex show retransmit-timeout
-You can control the timeout used while waiting for a packet, in the @acronym{MIPS}
-remote protocol, with the @code{set timeout @var{seconds}} command.  The
-default is 5 seconds.  Similarly, you can control the timeout used while
-waiting for an acknowledgment of a packet with the @code{set
-retransmit-timeout @var{seconds}} command.  The default is 3 seconds.
-You can inspect both values with @code{show timeout} and @code{show
-retransmit-timeout}.  (These commands are @emph{only} available when
-@value{GDBN} is configured for @samp{--target=mips-elf}.)
-
-The timeout set by @code{set timeout} does not apply when @value{GDBN}
-is waiting for your program to stop.  In that case, @value{GDBN} waits
-forever because it has no way of knowing how long the program is going
-to run before stopping.
-
-@item set syn-garbage-limit @var{num}
-@kindex set syn-garbage-limit@r{, @acronym{MIPS} remote}
-@cindex synchronize with remote @acronym{MIPS} target
-Limit the maximum number of characters @value{GDBN} should ignore when
-it tries to synchronize with the remote target.  The default is 10
-characters.  Setting the limit to -1 means there's no limit.
-
-@item show syn-garbage-limit
-@kindex show syn-garbage-limit@r{, @acronym{MIPS} remote}
-Show the current limit on the number of characters to ignore when
-trying to synchronize with the remote system.
-
-@item set monitor-prompt @var{prompt}
-@kindex set monitor-prompt@r{, @acronym{MIPS} remote}
-@cindex remote monitor prompt
-Tell @value{GDBN} to expect the specified @var{prompt} string from the
-remote monitor.  The default depends on the target:
-@table @asis
-@item pmon target
-@samp{PMON}
-@item ddb target
-@samp{NEC010}
-@item lsi target
-@samp{PMON>}
-@end table
-
-@item show monitor-prompt
-@kindex show monitor-prompt@r{, @acronym{MIPS} remote}
-Show the current strings @value{GDBN} expects as the prompt from the
-remote monitor.
-
-@item set monitor-warnings
-@kindex set monitor-warnings@r{, @acronym{MIPS} remote}
-Enable or disable monitor warnings about hardware breakpoints.  This
-has effect only for the @code{lsi} target.  When on, @value{GDBN} will
-display warning messages whose codes are returned by the @code{lsi}
-PMON monitor for breakpoint commands.
-
-@item show monitor-warnings
-@kindex show monitor-warnings@r{, @acronym{MIPS} remote}
-Show the current setting of printing monitor warnings.
-
-@item pmon @var{command}
-@kindex pmon@r{, @acronym{MIPS} remote}
-@cindex send PMON command
-This command allows sending an arbitrary @var{command} string to the
-monitor.  The monitor must be in debug mode for this to work.
 @end table
 
 @node PowerPC Embedded
diff --git a/gdb/NEWS b/gdb/NEWS
index be15902..7abd95c 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -27,6 +27,16 @@ skip -rfunction regular-expression
   glob-style file names and regular expressions for function names.
   Additionally, a file spec and a function spec may now be combined.
 
+* Support for various remote target protocols and ROM monitors has
+  been removed:
+
+  target m32rsdi	Remote M32R debugging over SDI
+  target mips		MIPS remote debugging protocol
+  target pmon		PMON ROM monitor
+  target ddb		NEC's DDB variant of PMON for Vr4300
+  target rockhopper	NEC RockHopper variant of PMON
+  target lsi		LSI variant of PMO
+
 *** Changes in GDB 7.11
 
 * GDB now supports debugging kernel-based threads on FreeBSD.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 602ef43..ccd5c23 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -716,7 +716,6 @@ ALL_TARGET_OBS = \
 	sol2-tdep.o \
 	solib-frv.o solib-svr4.o \
 	solib-darwin.o solib-dsbt.o \
-	remote-m32r-sdi.o remote-mips.o \
 	xcoffread.o \
 	symfile-mem.o \
 	windows-tdep.o \
@@ -1733,7 +1732,6 @@ ALLDEPFILES = \
 	ppcobsd-nat.c ppcobsd-tdep.c \
 	procfs.c \
 	ravenscar-thread.c \
-	remote-m32r-sdi.c remote-mips.c \
 	remote-sim.c \
 	dcache.c \
 	rl78-tdep.c \
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index c2b9c40..cd8e05d 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -285,7 +285,7 @@ m32c-*-*)
 
 m32r*-*-linux*)
 	# Target: Renesas M32R running GNU/Linux
-	gdb_target_obs="m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o \
+	gdb_target_obs="m32r-tdep.o m32r-linux-tdep.o \
 			glibc-tdep.o solib-svr4.o symfile-mem.o \
 			linux-tdep.o"
 	gdb_sim=../sim/m32r/libsim.a
@@ -293,7 +293,7 @@ m32r*-*-linux*)
 	;;
 m32r*-*-*)
 	# Target: Renesas m32r processor
-	gdb_target_obs="m32r-tdep.o remote-m32r-sdi.o"
+	gdb_target_obs="m32r-tdep.o"
 	gdb_sim=../sim/m32r/libsim.a
 	;;
 
@@ -364,12 +364,12 @@ mips64*-*-openbsd*)
 	;;
 mips*-sde*-elf*)
 	# Target: MIPS SDE
-	gdb_target_obs="mips-tdep.o mips-sde-tdep.o remote-mips.o"
+	gdb_target_obs="mips-tdep.o mips-sde-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	;;
 mips*-*-elf)
 	# Target: MIPS ELF
-	gdb_target_obs="mips-tdep.o remote-mips.o"
+	gdb_target_obs="mips-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	;;
 mips*-*-*)
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 178a163..c2bf0c0 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -6981,25 +6981,6 @@ set_mipsfpu_auto_command (char *args, int from_tty)
   mips_fpu_type_auto = 1;
 }
 
-/* Attempt to identify the particular processor model by reading the
-   processor id.  NOTE: cagney/2003-11-15: Firstly it isn't clear that
-   the relevant processor still exists (it dates back to '94) and
-   secondly this is not the way to do this.  The processor type should
-   be set by forcing an architecture change.  */
-
-void
-deprecated_mips_set_processor_regs_hack (void)
-{
-  struct regcache *regcache = get_current_regcache ();
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-  ULONGEST prid;
-
-  regcache_cooked_read_unsigned (regcache, MIPS_PRID_REGNUM, &prid);
-  if ((prid & ~0xf) == 0x700)
-    tdep->mips_processor_reg_names = mips_r3041_reg_names;
-}
-
 /* Just like reinit_frame_cache, but with the right arguments to be
    callable as an sfunc.  */
 
diff --git a/gdb/mips-tdep.h b/gdb/mips-tdep.h
index 2e4d194..4e547b4 100644
--- a/gdb/mips-tdep.h
+++ b/gdb/mips-tdep.h
@@ -144,9 +144,6 @@ enum
   MIPS_LAST_EMBED_REGNUM = 89	/* Last one.  */
 };
 
-/* Defined in mips-tdep.c and used in remote-mips.c.  */
-extern void deprecated_mips_set_processor_regs_hack (void);
-
 /* Instruction sizes and other useful constants.  */
 enum
 {
diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c
deleted file mode 100644
index 2d3a1ad..0000000
--- a/gdb/remote-m32r-sdi.c
+++ /dev/null
@@ -1,1722 +0,0 @@
-/* Remote debugging interface for M32R/SDI.
-
-   Copyright (C) 2003-2016 Free Software Foundation, Inc.
-
-   Contributed by Renesas Technology Co.
-   Written by Kei Sakamoto <sakamoto.kei@renesas.com>.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "inferior.h"
-#include "infrun.h"
-#include "target.h"
-#include "regcache.h"
-#include "gdbthread.h"
-#include <ctype.h>
-#include <signal.h>
-#ifdef __MINGW32__
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <sys/types.h>
-#include "gdb_sys_time.h"
-#include <time.h>
-#include "gdb_bfd.h"
-#include "cli/cli-utils.h"
-#include "symfile.h"
-#include "serial.h"
-
-/* Descriptor for I/O to remote machine.  */
-
-static struct serial *sdi_desc = NULL;
-
-#define SDI_TIMEOUT 30
-
-
-#define SDIPORT 3232
-
-static char chip_name[64];
-
-static int step_mode;
-static unsigned long last_pc_addr = 0xffffffff;
-static unsigned char last_pc_addr_data[2];
-
-static int mmu_on = 0;
-
-static int use_ib_breakpoints = 1;
-
-#define MAX_BREAKPOINTS 1024
-static int max_ib_breakpoints;
-static unsigned long bp_address[MAX_BREAKPOINTS];
-static unsigned char bp_data[MAX_BREAKPOINTS][4];
-
-/* dbt -> nop */
-static const unsigned char dbt_bp_entry[] = {
-  0x10, 0xe0, 0x70, 0x00
-};
-
-#define MAX_ACCESS_BREAKS 4
-static int max_access_breaks;
-static unsigned long ab_address[MAX_ACCESS_BREAKS];
-static unsigned int ab_type[MAX_ACCESS_BREAKS];
-static unsigned int ab_size[MAX_ACCESS_BREAKS];
-static CORE_ADDR hit_watchpoint_addr = 0;
-
-static int interrupted = 0;
-
-/* Forward data declarations */
-extern struct target_ops m32r_ops;
-
-/* This is the ptid we use while we're connected to the remote.  Its
-   value is arbitrary, as the target doesn't have a notion of
-   processes or threads, but we need something non-null to place in
-   inferior_ptid.  */
-static ptid_t remote_m32r_ptid;
-
-/* Commands */
-#define SDI_OPEN                 1
-#define SDI_CLOSE                2
-#define SDI_RELEASE              3
-#define SDI_READ_CPU_REG         4
-#define SDI_WRITE_CPU_REG        5
-#define SDI_READ_MEMORY          6
-#define SDI_WRITE_MEMORY         7
-#define SDI_EXEC_CPU             8
-#define SDI_STOP_CPU             9
-#define SDI_WAIT_FOR_READY      10
-#define SDI_GET_ATTR            11
-#define SDI_SET_ATTR            12
-#define SDI_STATUS              13
-
-/* Attributes */
-#define SDI_ATTR_NAME            1
-#define SDI_ATTR_BRK             2
-#define SDI_ATTR_ABRK            3
-#define SDI_ATTR_CACHE           4
-#define SDI_CACHE_TYPE_M32102    0
-#define SDI_CACHE_TYPE_CHAOS     1
-#define SDI_ATTR_MEM_ACCESS      5
-#define SDI_MEM_ACCESS_DEBUG_DMA 0
-#define SDI_MEM_ACCESS_MON_CODE  1
-
-/* Registers */
-#define SDI_REG_R0               0
-#define SDI_REG_R1               1
-#define SDI_REG_R2               2
-#define SDI_REG_R3               3
-#define SDI_REG_R4               4
-#define SDI_REG_R5               5
-#define SDI_REG_R6               6
-#define SDI_REG_R7               7
-#define SDI_REG_R8               8
-#define SDI_REG_R9               9
-#define SDI_REG_R10             10
-#define SDI_REG_R11             11
-#define SDI_REG_R12             12
-#define SDI_REG_FP              13
-#define SDI_REG_LR              14
-#define SDI_REG_SP              15
-#define SDI_REG_PSW             16
-#define SDI_REG_CBR             17
-#define SDI_REG_SPI             18
-#define SDI_REG_SPU             19
-#define SDI_REG_CR4             20
-#define SDI_REG_EVB             21
-#define SDI_REG_BPC             22
-#define SDI_REG_CR7             23
-#define SDI_REG_BBPSW           24
-#define SDI_REG_CR9             25
-#define SDI_REG_CR10            26
-#define SDI_REG_CR11            27
-#define SDI_REG_CR12            28
-#define SDI_REG_WR              29
-#define SDI_REG_BBPC            30
-#define SDI_REG_PBP             31
-#define SDI_REG_ACCH            32
-#define SDI_REG_ACCL            33
-#define SDI_REG_ACC1H           34
-#define SDI_REG_ACC1L           35
-
-
-/* Low level communication functions.  */
-
-/* Check an ack packet from the target.  */
-static int
-get_ack (void)
-{
-  int c;
-
-  if (!sdi_desc)
-    return -1;
-
-  c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-
-  if (c < 0)
-    return -1;
-
-  if (c != '+')			/* error */
-    return -1;
-
-  return 0;
-}
-
-/* Send data to the target and check an ack packet.  */
-static int
-send_data (const void *buf, int len)
-{
-  if (!sdi_desc)
-    return -1;
-
-  if (serial_write (sdi_desc, buf, len) != 0)
-    return -1;
-
-  if (get_ack () == -1)
-    return -1;
-
-  return len;
-}
-
-/* Receive data from the target.  */
-static int
-recv_data (void *buf, int len)
-{
-  int total = 0;
-  int c;
-
-  if (!sdi_desc)
-    return -1;
-
-  while (total < len)
-    {
-      c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-
-      if (c < 0)
-	return -1;
-
-      ((unsigned char *) buf)[total++] = c;
-    }
-
-  return len;
-}
-
-/* Store unsigned long parameter on packet.  */
-static void
-store_long_parameter (void *buf, long val)
-{
-  val = htonl (val);
-  memcpy (buf, &val, 4);
-}
-
-static int
-send_cmd (unsigned char cmd)
-{
-  unsigned char buf[1];
-
-  buf[0] = cmd;
-  return send_data (buf, 1);
-}
-
-static int
-send_one_arg_cmd (unsigned char cmd, unsigned char arg1)
-{
-  unsigned char buf[2];
-
-  buf[0] = cmd;
-  buf[1] = arg1;
-  return send_data (buf, 2);
-}
-
-static int
-send_two_arg_cmd (unsigned char cmd, unsigned char arg1, unsigned long arg2)
-{
-  unsigned char buf[6];
-
-  buf[0] = cmd;
-  buf[1] = arg1;
-  store_long_parameter (buf + 2, arg2);
-  return send_data (buf, 6);
-}
-
-static int
-send_three_arg_cmd (unsigned char cmd, unsigned long arg1, unsigned long arg2,
-		    unsigned long arg3)
-{
-  unsigned char buf[13];
-
-  buf[0] = cmd;
-  store_long_parameter (buf + 1, arg1);
-  store_long_parameter (buf + 5, arg2);
-  store_long_parameter (buf + 9, arg3);
-  return send_data (buf, 13);
-}
-
-static unsigned char
-recv_char_data (void)
-{
-  unsigned char val = 0; /* -Wall */
-
-  recv_data (&val, 1);
-  return val;
-}
-
-static unsigned long
-recv_long_data (void)
-{
-  unsigned long val = 0; /* -Wall */
-
-  recv_data (&val, 4);
-  return ntohl (val);
-}
-
-
-/* Check if MMU is on.  */
-static void
-check_mmu_status (void)
-{
-  unsigned long val;
-
-  /* Read PC address.  */
-  if (send_one_arg_cmd (SDI_READ_CPU_REG, SDI_REG_BPC) == -1)
-    return;
-  val = recv_long_data ();
-  if ((val & 0xc0000000) == 0x80000000)
-    {
-      mmu_on = 1;
-      return;
-    }
-
-  /* Read EVB address.  */
-  if (send_one_arg_cmd (SDI_READ_CPU_REG, SDI_REG_EVB) == -1)
-    return;
-  val = recv_long_data ();
-  if ((val & 0xc0000000) == 0x80000000)
-    {
-      mmu_on = 1;
-      return;
-    }
-
-  mmu_on = 0;
-}
-
-
-/* This is called not only when we first attach, but also when the
-   user types "run" after having attached.  */
-static void
-m32r_create_inferior (struct target_ops *ops, char *execfile,
-		      char *args, char **env, int from_tty)
-{
-  CORE_ADDR entry_pt;
-
-  if (args && *args)
-    error (_("Cannot pass arguments to remote STDEBUG process"));
-
-  if (execfile == 0 || exec_bfd == 0)
-    error (_("No executable file specified"));
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_create_inferior(%s,%s)\n", execfile,
-			args);
-
-  entry_pt = bfd_get_start_address (exec_bfd);
-
-  /* The "process" (board) is already stopped awaiting our commands, and
-     the program is already downloaded.  We just set its PC and go.  */
-
-  clear_proceed_status (0);
-
-  /* Tell wait_for_inferior that we've started a new process.  */
-  init_wait_for_inferior ();
-
-  /* Set up the "saved terminal modes" of the inferior
-     based on what modes we are starting it with.  */
-  target_terminal_init ();
-
-  /* Install inferior's terminal modes.  */
-  target_terminal_inferior ();
-
-  regcache_write_pc (get_current_regcache (), entry_pt);
-}
-
-/* Open a connection to a remote debugger.
-   NAME is the filename used for communication.  */
-
-static void
-m32r_open (const char *args, int from_tty)
-{
-  struct hostent *host_ent;
-  struct sockaddr_in server_addr;
-  char hostname[256];
-  const char *port_str;
-  int port;
-  int i, n;
-  int yes = 1;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_open(%d)\n", from_tty);
-
-  target_preopen (from_tty);
-
-  push_target (&m32r_ops);
-
-  if (args == NULL)
-    xsnprintf (hostname, sizeof (hostname), "localhost:%d", SDIPORT);
-  else
-    {
-      port_str = strchr (args, ':');
-      if (port_str == NULL)
-	xsnprintf (hostname, sizeof (hostname), "%s:%d", args, SDIPORT);
-      else
-	xsnprintf (hostname, sizeof (hostname), "%s", args);
-    }
-
-  sdi_desc = serial_open (hostname);
-  if (!sdi_desc)
-    error (_("Connection refused."));
-
-  if (get_ack () == -1)
-    error (_("Cannot connect to SDI target."));
-
-  if (send_cmd (SDI_OPEN) == -1)
-    error (_("Cannot connect to SDI target."));
-
-  /* Get maximum number of ib breakpoints.  */
-  send_one_arg_cmd (SDI_GET_ATTR, SDI_ATTR_BRK);
-  max_ib_breakpoints = recv_char_data ();
-  if (remote_debug)
-    printf_filtered ("Max IB Breakpoints = %d\n", max_ib_breakpoints);
-
-  /* Initialize breakpoints.  */
-  for (i = 0; i < MAX_BREAKPOINTS; i++)
-    bp_address[i] = 0xffffffff;
-
-  /* Get maximum number of access breaks.  */
-  send_one_arg_cmd (SDI_GET_ATTR, SDI_ATTR_ABRK);
-  max_access_breaks = recv_char_data ();
-  if (remote_debug)
-    printf_filtered ("Max Access Breaks = %d\n", max_access_breaks);
-
-  /* Initialize access breask.  */
-  for (i = 0; i < MAX_ACCESS_BREAKS; i++)
-    ab_address[i] = 0x00000000;
-
-  check_mmu_status ();
-
-  /* Get the name of chip on target board.  */
-  send_one_arg_cmd (SDI_GET_ATTR, SDI_ATTR_NAME);
-  recv_data (chip_name, 64);
-
-  if (from_tty)
-    printf_filtered ("Remote %s connected to %s\n", target_shortname,
-		     chip_name);
-}
-
-/* Close out all files and local state before this target loses control.  */
-
-static void
-m32r_close (struct target_ops *self)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_close()\n");
-
-  if (sdi_desc)
-    {
-      send_cmd (SDI_CLOSE);
-      serial_close (sdi_desc);
-      sdi_desc = NULL;
-    }
-
-  inferior_ptid = null_ptid;
-  delete_thread_silent (remote_m32r_ptid);
-  return;
-}
-
-/* Tell the remote machine to resume.  */
-
-static void
-m32r_resume (struct target_ops *ops,
-	     ptid_t ptid, int step, enum gdb_signal sig)
-{
-  unsigned long pc_addr, bp_addr, ab_addr;
-  int ib_breakpoints;
-  unsigned char buf[13];
-  int i;
-
-  if (remote_debug)
-    {
-      if (step)
-	fprintf_unfiltered (gdb_stdlog, "\nm32r_resume(step)\n");
-      else
-	fprintf_unfiltered (gdb_stdlog, "\nm32r_resume(cont)\n");
-    }
-
-  check_mmu_status ();
-
-  pc_addr = regcache_read_pc (get_current_regcache ());
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "pc <= 0x%lx\n", pc_addr);
-
-  /* At pc address there is a parallel instruction with +2 offset,
-     so we have to make it a serial instruction or avoid it.  */
-  if (pc_addr == last_pc_addr)
-    {
-      /* Avoid a parallel nop.  */
-      if (last_pc_addr_data[0] == 0xf0 && last_pc_addr_data[1] == 0x00)
-	{
-	  pc_addr += 2;
-	  /* Now we can forget this instruction.  */
-	  last_pc_addr = 0xffffffff;
-	}
-      /* Clear a parallel bit.  */
-      else
-	{
-	  buf[0] = SDI_WRITE_MEMORY;
-	  if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-	    store_long_parameter (buf + 1, pc_addr);
-	  else
-	    store_long_parameter (buf + 1, pc_addr - 1);
-	  store_long_parameter (buf + 5, 1);
-	  buf[9] = last_pc_addr_data[0] & 0x7f;
-	  send_data (buf, 10);
-	}
-    }
-
-  /* Set PC.  */
-  send_two_arg_cmd (SDI_WRITE_CPU_REG, SDI_REG_BPC, pc_addr);
-
-  /* step mode.  */
-  step_mode = step;
-  if (step)
-    {
-      /* Set PBP.  */
-      send_two_arg_cmd (SDI_WRITE_CPU_REG, SDI_REG_PBP, pc_addr | 1);
-    }
-  else
-    {
-      /* Unset PBP.  */
-      send_two_arg_cmd (SDI_WRITE_CPU_REG, SDI_REG_PBP, 0x00000000);
-    }
-
-  if (use_ib_breakpoints)
-    ib_breakpoints = max_ib_breakpoints;
-  else
-    ib_breakpoints = 0;
-
-  /* Set ib breakpoints.  */
-  for (i = 0; i < ib_breakpoints; i++)
-    {
-      bp_addr = bp_address[i];
-
-      if (bp_addr == 0xffffffff)
-	continue;
-
-      /* Set PBP.  */
-      if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-	send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8000 + 4 * i, 4,
-			    0x00000006);
-      else
-	send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8000 + 4 * i, 4,
-			    0x06000000);
-
-      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8080 + 4 * i, 4, bp_addr);
-    }
-
-  /* Set dbt breakpoints.  */
-  for (i = ib_breakpoints; i < MAX_BREAKPOINTS; i++)
-    {
-      bp_addr = bp_address[i];
-
-      if (bp_addr == 0xffffffff)
-	continue;
-
-      if (!mmu_on)
-	bp_addr &= 0x7fffffff;
-
-      /* Write DBT instruction.  */
-      buf[0] = SDI_WRITE_MEMORY;
-      store_long_parameter (buf + 1, (bp_addr & 0xfffffffc));
-      store_long_parameter (buf + 5, 4);
-      if ((bp_addr & 2) == 0 && bp_addr != (pc_addr & 0xfffffffc))
-	{
-	  if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-	    {
-	      buf[9] = dbt_bp_entry[0];
-	      buf[10] = dbt_bp_entry[1];
-	      buf[11] = dbt_bp_entry[2];
-	      buf[12] = dbt_bp_entry[3];
-	    }
-	  else
-	    {
-	      buf[9] = dbt_bp_entry[3];
-	      buf[10] = dbt_bp_entry[2];
-	      buf[11] = dbt_bp_entry[1];
-	      buf[12] = dbt_bp_entry[0];
-	    }
-	}
-      else
-	{
-	  if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-	    {
-	      if ((bp_addr & 2) == 0)
-		{
-		  buf[9] = dbt_bp_entry[0];
-		  buf[10] = dbt_bp_entry[1];
-		  buf[11] = bp_data[i][2] & 0x7f;
-		  buf[12] = bp_data[i][3];
-		}
-	      else
-		{
-		  buf[9] = bp_data[i][0];
-		  buf[10] = bp_data[i][1];
-		  buf[11] = dbt_bp_entry[0];
-		  buf[12] = dbt_bp_entry[1];
-		}
-	    }
-	  else
-	    {
-	      if ((bp_addr & 2) == 0)
-		{
-		  buf[9] = bp_data[i][0];
-		  buf[10] = bp_data[i][1] & 0x7f;
-		  buf[11] = dbt_bp_entry[1];
-		  buf[12] = dbt_bp_entry[0];
-		}
-	      else
-		{
-		  buf[9] = dbt_bp_entry[1];
-		  buf[10] = dbt_bp_entry[0];
-		  buf[11] = bp_data[i][2];
-		  buf[12] = bp_data[i][3];
-		}
-	    }
-	}
-      send_data (buf, 13);
-    }
-
-  /* Set access breaks.  */
-  for (i = 0; i < max_access_breaks; i++)
-    {
-      ab_addr = ab_address[i];
-
-      if (ab_addr == 0x00000000)
-	continue;
-
-      /* DBC register.  */
-      if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-	{
-	  switch (ab_type[i])
-	    {
-	    case 0:		/* write watch */
-	      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-				  0x00000086);
-	      break;
-	    case 1:		/* read watch */
-	      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-				  0x00000046);
-	      break;
-	    case 2:		/* access watch */
-	      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-				  0x00000006);
-	      break;
-	    }
-	}
-      else
-	{
-	  switch (ab_type[i])
-	    {
-	    case 0:		/* write watch */
-	      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-				  0x86000000);
-	      break;
-	    case 1:		/* read watch */
-	      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-				  0x46000000);
-	      break;
-	    case 2:		/* access watch */
-	      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-				  0x06000000);
-	      break;
-	    }
-	}
-
-      /* DBAH register.  */
-      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8180 + 4 * i, 4, ab_addr);
-
-      /* DBAL register.  */
-      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8200 + 4 * i, 4,
-			  0xffffffff);
-
-      /* DBD register.  */
-      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8280 + 4 * i, 4,
-			  0x00000000);
-
-      /* DBDM register.  */
-      send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8300 + 4 * i, 4,
-			  0x00000000);
-    }
-
-  /* Resume program.  */
-  send_cmd (SDI_EXEC_CPU);
-
-  /* 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_ptid = remote_m32r_ptid;
-  add_thread_silent (remote_m32r_ptid);
-
-  return;
-}
-
-/* Wait until the remote machine stops, then return,
-   storing status in STATUS just as `wait' would.  */
-
-static void
-gdb_cntrl_c (int signo)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "interrupt\n");
-  interrupted = 1;
-}
-
-static ptid_t
-m32r_wait (struct target_ops *ops,
-	   ptid_t ptid, struct target_waitstatus *status, int options)
-{
-  static sighandler_t prev_sigint;
-  unsigned long bp_addr, pc_addr;
-  int ib_breakpoints;
-  long i;
-  unsigned char buf[13];
-  int ret, c;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_wait()\n");
-
-  status->kind = TARGET_WAITKIND_EXITED;
-  status->value.sig = GDB_SIGNAL_0;
-
-  interrupted = 0;
-  prev_sigint = signal (SIGINT, gdb_cntrl_c);
-
-  /* Wait for ready.  */
-  buf[0] = SDI_WAIT_FOR_READY;
-  if (serial_write (sdi_desc, buf, 1) != 0)
-    error (_("Remote connection closed"));
-
-  while (1)
-    {
-      c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-      if (c < 0)
-	error (_("Remote connection closed"));
-
-      if (c == '-')		/* error */
-	{
-	  status->kind = TARGET_WAITKIND_STOPPED;
-	  status->value.sig = GDB_SIGNAL_HUP;
-	  return inferior_ptid;
-	}
-      else if (c == '+')	/* stopped */
-	break;
-
-      if (interrupted)
-	ret = serial_write (sdi_desc, "!", 1);	/* packet to interrupt */
-      else
-	ret = serial_write (sdi_desc, ".", 1);	/* packet to wait */
-      if (ret != 0)
-	error (_("Remote connection closed"));
-    }
-
-  status->kind = TARGET_WAITKIND_STOPPED;
-  if (interrupted)
-    status->value.sig = GDB_SIGNAL_INT;
-  else
-    status->value.sig = GDB_SIGNAL_TRAP;
-
-  interrupted = 0;
-  signal (SIGINT, prev_sigint);
-
-  check_mmu_status ();
-
-  /* Recover parallel bit.  */
-  if (last_pc_addr != 0xffffffff)
-    {
-      buf[0] = SDI_WRITE_MEMORY;
-      if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-	store_long_parameter (buf + 1, last_pc_addr);
-      else
-	store_long_parameter (buf + 1, last_pc_addr - 1);
-      store_long_parameter (buf + 5, 1);
-      buf[9] = last_pc_addr_data[0];
-      send_data (buf, 10);
-      last_pc_addr = 0xffffffff;
-    }
-
-  if (use_ib_breakpoints)
-    ib_breakpoints = max_ib_breakpoints;
-  else
-    ib_breakpoints = 0;
-
-  /* Set back pc by 2 if m32r is stopped with dbt.  */
-  last_pc_addr = 0xffffffff;
-  send_one_arg_cmd (SDI_READ_CPU_REG, SDI_REG_BPC);
-  pc_addr = recv_long_data () - 2;
-  for (i = ib_breakpoints; i < MAX_BREAKPOINTS; i++)
-    {
-      if (pc_addr == bp_address[i])
-	{
-	  send_two_arg_cmd (SDI_WRITE_CPU_REG, SDI_REG_BPC, pc_addr);
-
-	  /* If there is a parallel instruction with +2 offset at pc
-	     address, we have to take care of it later.  */
-	  if ((pc_addr & 0x2) != 0)
-	    {
-	      if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-		{
-		  if ((bp_data[i][2] & 0x80) != 0)
-		    {
-		      last_pc_addr = pc_addr;
-		      last_pc_addr_data[0] = bp_data[i][2];
-		      last_pc_addr_data[1] = bp_data[i][3];
-		    }
-		}
-	      else
-		{
-		  if ((bp_data[i][1] & 0x80) != 0)
-		    {
-		      last_pc_addr = pc_addr;
-		      last_pc_addr_data[0] = bp_data[i][1];
-		      last_pc_addr_data[1] = bp_data[i][0];
-		    }
-		}
-	    }
-	  break;
-	}
-    }
-
-  /* Remove ib breakpoints.  */
-  for (i = 0; i < ib_breakpoints; i++)
-    {
-      if (bp_address[i] != 0xffffffff)
-	send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8000 + 4 * i, 4,
-			    0x00000000);
-    }
-  /* Remove dbt breakpoints.  */
-  for (i = ib_breakpoints; i < MAX_BREAKPOINTS; i++)
-    {
-      bp_addr = bp_address[i];
-      if (bp_addr != 0xffffffff)
-	{
-	  if (!mmu_on)
-	    bp_addr &= 0x7fffffff;
-	  buf[0] = SDI_WRITE_MEMORY;
-	  store_long_parameter (buf + 1, bp_addr & 0xfffffffc);
-	  store_long_parameter (buf + 5, 4);
-	  buf[9] = bp_data[i][0];
-	  buf[10] = bp_data[i][1];
-	  buf[11] = bp_data[i][2];
-	  buf[12] = bp_data[i][3];
-	  send_data (buf, 13);
-	}
-    }
-
-  /* Remove access breaks.  */
-  hit_watchpoint_addr = 0;
-  for (i = 0; i < max_access_breaks; i++)
-    {
-      if (ab_address[i] != 0x00000000)
-	{
-	  buf[0] = SDI_READ_MEMORY;
-	  store_long_parameter (buf + 1, 0xffff8100 + 4 * i);
-	  store_long_parameter (buf + 5, 4);
-	  serial_write (sdi_desc, buf, 9);
-	  c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-	  if (c != '-' && recv_data (buf, 4) != -1)
-	    {
-	      if (gdbarch_byte_order (target_gdbarch ()) == BFD_ENDIAN_BIG)
-		{
-		  if ((buf[3] & 0x1) == 0x1)
-		    hit_watchpoint_addr = ab_address[i];
-		}
-	      else
-		{
-		  if ((buf[0] & 0x1) == 0x1)
-		    hit_watchpoint_addr = ab_address[i];
-		}
-	    }
-
-	  send_three_arg_cmd (SDI_WRITE_MEMORY, 0xffff8100 + 4 * i, 4,
-			      0x00000000);
-	}
-    }
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "pc => 0x%lx\n", pc_addr);
-
-  return inferior_ptid;
-}
-
-/* Terminate the open connection to the remote debugger.
-   Use this when you want to detach and do something else
-   with your gdb.  */
-static void
-m32r_detach (struct target_ops *ops, const char *args, int from_tty)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_detach(%d)\n", from_tty);
-
-  m32r_resume (ops, inferior_ptid, 0, GDB_SIGNAL_0);
-
-  /* Calls m32r_close to do the real work.  */
-  unpush_target (ops);
-  if (from_tty)
-    fprintf_unfiltered (gdb_stdlog, "Ending remote %s debugging\n",
-			target_shortname);
-}
-
-/* Return the id of register number REGNO.  */
-
-static int
-get_reg_id (int regno)
-{
-  switch (regno)
-    {
-    case 20:
-      return SDI_REG_BBPC;
-    case 21:
-      return SDI_REG_BPC;
-    case 22:
-      return SDI_REG_ACCL;
-    case 23:
-      return SDI_REG_ACCH;
-    case 24:
-      return SDI_REG_EVB;
-    }
-
-  return regno;
-}
-
-/* Fetch register REGNO, or all registers if REGNO is -1.
-   Returns errno value.  */
-static void
-m32r_fetch_register (struct target_ops *ops,
-		     struct regcache *regcache, int regno)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  unsigned long val, val2, regid;
-
-  if (regno == -1)
-    {
-      for (regno = 0;
-	   regno < gdbarch_num_regs (get_regcache_arch (regcache));
-	   regno++)
-	m32r_fetch_register (ops, regcache, regno);
-    }
-  else
-    {
-      gdb_byte buffer[MAX_REGISTER_SIZE];
-
-      regid = get_reg_id (regno);
-      send_one_arg_cmd (SDI_READ_CPU_REG, regid);
-      val = recv_long_data ();
-
-      if (regid == SDI_REG_PSW)
-	{
-	  send_one_arg_cmd (SDI_READ_CPU_REG, SDI_REG_BBPSW);
-	  val2 = recv_long_data ();
-	  val = ((0x00cf & val2) << 8) | ((0xcf00 & val) >> 8);
-	}
-
-      if (remote_debug)
-	fprintf_unfiltered (gdb_stdlog, "m32r_fetch_register(%d,0x%08lx)\n",
-			    regno, val);
-
-      /* We got the number the register holds, but gdb expects to see a
-         value in the target byte ordering.  */
-      store_unsigned_integer (buffer, 4, byte_order, val);
-      regcache_raw_supply (regcache, regno, buffer);
-    }
-  return;
-}
-
-/* Store register REGNO, or all if REGNO == 0.
-   Return errno value.  */
-static void
-m32r_store_register (struct target_ops *ops,
-		     struct regcache *regcache, int regno)
-{
-  int regid;
-  ULONGEST regval, tmp;
-
-  if (regno == -1)
-    {
-      for (regno = 0;
-	   regno < gdbarch_num_regs (get_regcache_arch (regcache));
-	   regno++)
-	m32r_store_register (ops, regcache, regno);
-    }
-  else
-    {
-      regcache_cooked_read_unsigned (regcache, regno, &regval);
-      regid = get_reg_id (regno);
-
-      if (regid == SDI_REG_PSW)
-	{
-	  unsigned long psw, bbpsw;
-
-	  send_one_arg_cmd (SDI_READ_CPU_REG, SDI_REG_PSW);
-	  psw = recv_long_data ();
-
-	  send_one_arg_cmd (SDI_READ_CPU_REG, SDI_REG_BBPSW);
-	  bbpsw = recv_long_data ();
-
-	  tmp = (0x00cf & psw) | ((0x00cf & regval) << 8);
-	  send_two_arg_cmd (SDI_WRITE_CPU_REG, SDI_REG_PSW, tmp);
-
-	  tmp = (0x0030 & bbpsw) | ((0xcf00 & regval) >> 8);
-	  send_two_arg_cmd (SDI_WRITE_CPU_REG, SDI_REG_BBPSW, tmp);
-	}
-      else
-	{
-	  send_two_arg_cmd (SDI_WRITE_CPU_REG, regid, regval);
-	}
-
-      if (remote_debug)
-	fprintf_unfiltered (gdb_stdlog, "m32r_store_register(%d,0x%08lu)\n",
-			    regno, (unsigned long) regval);
-    }
-}
-
-/* Get ready to modify the registers array.  On machines which store
-   individual registers, this doesn't need to do anything.  On machines
-   which store all the registers in one fell swoop, this makes sure
-   that registers contains all the registers from the program being
-   debugged.  */
-
-static void
-m32r_prepare_to_store (struct target_ops *self, struct regcache *regcache)
-{
-  /* Do nothing, since we can store individual regs.  */
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_prepare_to_store()\n");
-}
-
-static void
-m32r_files_info (struct target_ops *target)
-{
-  const char *file = "nothing";
-
-  if (exec_bfd)
-    {
-      file = bfd_get_filename (exec_bfd);
-      printf_filtered ("\tAttached to %s running program %s\n",
-		       chip_name, file);
-    }
-}
-
-/* Helper for m32r_xfer_partial that handles memory transfers.
-   Arguments are like target_xfer_partial.  */
-
-static enum target_xfer_status
-m32r_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
-		  ULONGEST memaddr, ULONGEST len, ULONGEST *xfered_len)
-{
-  unsigned long taddr;
-  unsigned char buf[0x2000];
-  int ret, c;
-
-  taddr = memaddr;
-
-  if (!mmu_on)
-    {
-      if ((taddr & 0xa0000000) == 0x80000000)
-	taddr &= 0x7fffffff;
-    }
-
-  if (remote_debug)
-    {
-      if (writebuf != NULL)
-	fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory(%s,%s,write)\n",
-			    paddress (target_gdbarch (), memaddr),
-			    plongest (len));
-      else
-	fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory(%s,%s,read)\n",
-			    paddress (target_gdbarch (), memaddr),
-			    plongest (len));
-    }
-
-  if (writebuf != NULL)
-    {
-      buf[0] = SDI_WRITE_MEMORY;
-      store_long_parameter (buf + 1, taddr);
-      store_long_parameter (buf + 5, len);
-      if (len < 0x1000)
-	{
-	  memcpy (buf + 9, writebuf, len);
-	  ret = send_data (buf, len + 9) - 9;
-	}
-      else
-	{
-	  if (serial_write (sdi_desc, buf, 9) != 0)
-	    {
-	      if (remote_debug)
-		fprintf_unfiltered (gdb_stdlog,
-				    "m32r_xfer_memory() failed\n");
-	      return TARGET_XFER_EOF;
-	    }
-	  ret = send_data (writebuf, len);
-	}
-    }
-  else
-    {
-      buf[0] = SDI_READ_MEMORY;
-      store_long_parameter (buf + 1, taddr);
-      store_long_parameter (buf + 5, len);
-      if (serial_write (sdi_desc, buf, 9) != 0)
-	{
-	  if (remote_debug)
-	    fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory() failed\n");
-	  return TARGET_XFER_EOF;
-	}
-
-      c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-      if (c < 0 || c == '-')
-	{
-	  if (remote_debug)
-	    fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory() failed\n");
-	  return TARGET_XFER_EOF;
-	}
-
-      ret = recv_data (readbuf, len);
-    }
-
-  if (ret <= 0)
-    {
-      if (remote_debug)
-	fprintf_unfiltered (gdb_stdlog, "m32r_xfer_memory() fails\n");
-      return TARGET_XFER_E_IO;
-    }
-
-  *xfered_len = ret;
-  return TARGET_XFER_OK;
-}
-
-/* Target to_xfer_partial implementation.  */
-
-static enum target_xfer_status
-m32r_xfer_partial (struct target_ops *ops, enum target_object object,
-		   const char *annex, gdb_byte *readbuf,
-		   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
-		   ULONGEST *xfered_len)
-{
-  switch (object)
-    {
-    case TARGET_OBJECT_MEMORY:
-      return m32r_xfer_memory (readbuf, writebuf, offset, len, xfered_len);
-
-    default:
-      return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
-					    readbuf, writebuf, offset, len,
-					    xfered_len);
-    }
-}
-
-static void
-m32r_kill (struct target_ops *ops)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_kill()\n");
-
-  inferior_ptid = null_ptid;
-  delete_thread_silent (remote_m32r_ptid);
-
-  return;
-}
-
-/* Clean up when a program exits.
-
-   The program actually lives on in the remote processor's RAM, and may be
-   run again without a download.  Don't leave it full of breakpoint
-   instructions.  */
-
-static void
-m32r_mourn_inferior (struct target_ops *ops)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_mourn_inferior()\n");
-
-  remove_breakpoints ();
-  generic_mourn_inferior ();
-}
-
-static int
-m32r_insert_breakpoint (struct target_ops *ops,
-			struct gdbarch *gdbarch,
-			struct bp_target_info *bp_tgt)
-{
-  CORE_ADDR addr = bp_tgt->placed_address = bp_tgt->reqstd_address;
-  int ib_breakpoints;
-  unsigned char buf[13];
-  int i, c;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_insert_breakpoint(%s,...)\n",
-			paddress (gdbarch, addr));
-
-  if (use_ib_breakpoints)
-    ib_breakpoints = max_ib_breakpoints;
-  else
-    ib_breakpoints = 0;
-
-  for (i = 0; i < MAX_BREAKPOINTS; i++)
-    {
-      if (bp_address[i] == 0xffffffff)
-	{
-	  bp_address[i] = addr;
-	  if (i >= ib_breakpoints)
-	    {
-	      buf[0] = SDI_READ_MEMORY;
-	      if (mmu_on)
-		store_long_parameter (buf + 1, addr & 0xfffffffc);
-	      else
-		store_long_parameter (buf + 1, addr & 0x7ffffffc);
-	      store_long_parameter (buf + 5, 4);
-	      serial_write (sdi_desc, buf, 9);
-	      c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-	      if (c != '-')
-		recv_data (bp_data[i], 4);
-	    }
-	  return 0;
-	}
-    }
-
-  error (_("Too many breakpoints"));
-  return 1;
-}
-
-static int
-m32r_remove_breakpoint (struct target_ops *ops,
-			struct gdbarch *gdbarch,
-			struct bp_target_info *bp_tgt)
-{
-  CORE_ADDR addr = bp_tgt->placed_address;
-  int i;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_remove_breakpoint(%s)\n",
-			paddress (gdbarch, addr));
-
-  for (i = 0; i < MAX_BREAKPOINTS; i++)
-    {
-      if (bp_address[i] == addr)
-	{
-	  bp_address[i] = 0xffffffff;
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static void
-m32r_load (struct target_ops *self, const char *args, int from_tty)
-{
-  struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
-  asection *section;
-  bfd *pbfd;
-  bfd_vma entry;
-  char *filename;
-  int quiet;
-  int nostart;
-  struct timeval start_time, end_time;
-  unsigned long data_count;	/* Number of bytes transferred to memory.  */
-  static sighandler_t prev_sigint;
-
-  /* for direct tcp connections, we can do a fast binary download.  */
-  quiet = 0;
-  nostart = 0;
-  filename = NULL;
-
-  while (*args != '\000')
-    {
-      char *arg = extract_arg_const (&args);
-
-      if (arg == NULL)
-	break;
-      make_cleanup (xfree, arg);
-
-      if (*arg != '-')
-	filename = arg;
-      else if (startswith ("-quiet", arg))
-	quiet = 1;
-      else if (startswith ("-nostart", arg))
-	nostart = 1;
-      else
-	error (_("Unknown option `%s'"), arg);
-    }
-
-  if (!filename)
-    filename = get_exec_file (1);
-
-  pbfd = gdb_bfd_open (filename, gnutarget, -1);
-  if (pbfd == NULL)
-    perror_with_name (filename);
-  make_cleanup_bfd_unref (pbfd);
-
-  if (!bfd_check_format (pbfd, bfd_object))
-    error (_("\"%s\" is not an object file: %s"), filename,
-	   bfd_errmsg (bfd_get_error ()));
-
-  gettimeofday (&start_time, NULL);
-  data_count = 0;
-
-  interrupted = 0;
-  prev_sigint = signal (SIGINT, gdb_cntrl_c);
-
-  for (section = pbfd->sections; section; section = section->next)
-    {
-      if (bfd_get_section_flags (pbfd, section) & SEC_LOAD)
-	{
-	  bfd_vma section_address;
-	  bfd_size_type section_size;
-	  file_ptr fptr;
-	  int n;
-
-	  section_address = bfd_section_lma (pbfd, section);
-	  section_size = bfd_get_section_size (section);
-
-	  if (!mmu_on)
-	    {
-	      if ((section_address & 0xa0000000) == 0x80000000)
-		section_address &= 0x7fffffff;
-	    }
-
-	  if (!quiet)
-	    printf_filtered ("[Loading section %s at 0x%lx (%d bytes)]\n",
-			     bfd_get_section_name (pbfd, section),
-			     (unsigned long) section_address,
-			     (int) section_size);
-
-	  fptr = 0;
-
-	  data_count += section_size;
-
-	  n = 0;
-	  while (section_size > 0)
-	    {
-	      char unsigned buf[0x1000 + 9];
-	      int count;
-
-	      count = min (section_size, 0x1000);
-
-	      buf[0] = SDI_WRITE_MEMORY;
-	      store_long_parameter (buf + 1, section_address);
-	      store_long_parameter (buf + 5, count);
-
-	      bfd_get_section_contents (pbfd, section, buf + 9, fptr, count);
-	      if (send_data (buf, count + 9) <= 0)
-		error (_("Error while downloading %s section."),
-		       bfd_get_section_name (pbfd, section));
-
-	      if (!quiet)
-		{
-		  printf_unfiltered (".");
-		  if (n++ > 60)
-		    {
-		      printf_unfiltered ("\n");
-		      n = 0;
-		    }
-		  gdb_flush (gdb_stdout);
-		}
-
-	      section_address += count;
-	      fptr += count;
-	      section_size -= count;
-
-	      if (interrupted)
-		break;
-	    }
-
-	  if (!quiet && !interrupted)
-	    {
-	      printf_unfiltered ("done.\n");
-	      gdb_flush (gdb_stdout);
-	    }
-	}
-
-      if (interrupted)
-	{
-	  printf_unfiltered ("Interrupted.\n");
-	  break;
-	}
-    }
-
-  interrupted = 0;
-  signal (SIGINT, prev_sigint);
-
-  gettimeofday (&end_time, NULL);
-
-  /* Make the PC point at the start address.  */
-  if (exec_bfd)
-    regcache_write_pc (get_current_regcache (),
-		       bfd_get_start_address (exec_bfd));
-
-  inferior_ptid = null_ptid;	/* No process now.  */
-  delete_thread_silent (remote_m32r_ptid);
-
-  /* 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 new code (and just changed the PC).  Another way to do this
-     might be to call normal_stop, except that the stack may not be valid,
-     and things would get horribly confused...  */
-
-  clear_symtab_users (0);
-
-  if (!nostart)
-    {
-      entry = bfd_get_start_address (pbfd);
-
-      if (!quiet)
-	printf_unfiltered ("[Starting %s at 0x%lx]\n", filename,
-			   (unsigned long) entry);
-    }
-
-  print_transfer_performance (gdb_stdout, data_count, 0, &start_time,
-			      &end_time);
-
-  do_cleanups (old_chain);
-}
-
-static void
-m32r_interrupt (struct target_ops *self, ptid_t ptid)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_interrupt()\n");
-
-  send_cmd (SDI_STOP_CPU);
-
-  return;
-}
-
-
-/* Tell whether this target can support a hardware breakpoint.  CNT
-   is the number of hardware breakpoints already installed.  This
-   implements the target_can_use_hardware_watchpoint macro.  */
-
-static int
-m32r_can_use_hw_watchpoint (struct target_ops *self,
-			    enum bptype type,
-			    int cnt, int othertype)
-{
-  return sdi_desc != NULL && cnt < max_access_breaks;
-}
-
-/* Set a data watchpoint.  ADDR and LEN should be obvious.  TYPE is 0
-   for a write watchpoint, 1 for a read watchpoint, or 2 for a read/write
-   watchpoint.  */
-
-static int
-m32r_insert_watchpoint (struct target_ops *self,
-			CORE_ADDR addr, int len, enum target_hw_bp_type type,
-			struct expression *cond)
-{
-  int i;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_insert_watchpoint(%s,%d,%d)\n",
-			paddress (target_gdbarch (), addr), len, type);
-
-  for (i = 0; i < MAX_ACCESS_BREAKS; i++)
-    {
-      if (ab_address[i] == 0x00000000)
-	{
-	  ab_address[i] = addr;
-	  ab_size[i] = len;
-	  ab_type[i] = type;
-	  return 0;
-	}
-    }
-
-  error (_("Too many watchpoints"));
-  return 1;
-}
-
-static int
-m32r_remove_watchpoint (struct target_ops *self, CORE_ADDR addr, int len,
-			enum target_hw_bp_type type, struct expression *cond)
-{
-  int i;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_remove_watchpoint(%s,%d,%d)\n",
-			paddress (target_gdbarch (), addr), len, type);
-
-  for (i = 0; i < MAX_ACCESS_BREAKS; i++)
-    {
-      if (ab_address[i] == addr)
-	{
-	  ab_address[i] = 0x00000000;
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static int
-m32r_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
-{
-  int rc = 0;
-
-  if (hit_watchpoint_addr != 0x00000000)
-    {
-      *addr_p = hit_watchpoint_addr;
-      rc = 1;
-    }
-  return rc;
-}
-
-static int
-m32r_stopped_by_watchpoint (struct target_ops *ops)
-{
-  CORE_ADDR addr;
-
-  return m32r_stopped_data_address (&current_target, &addr);
-}
-
-/* Check to see if a thread is still alive.  */
-
-static int
-m32r_thread_alive (struct target_ops *ops, ptid_t ptid)
-{
-  if (ptid_equal (ptid, remote_m32r_ptid))
-    /* The main task is always alive.  */
-    return 1;
-
-  return 0;
-}
-
-/* Convert a thread ID to a string.  Returns the string in a static
-   buffer.  */
-
-static char *
-m32r_pid_to_str (struct target_ops *ops, ptid_t ptid)
-{
-  static char buf[64];
-
-  if (ptid_equal (remote_m32r_ptid, ptid))
-    {
-      xsnprintf (buf, sizeof buf, "Thread <main>");
-      return buf;
-    }
-
-  return normal_pid_to_str (ptid);
-}
-
-static void
-sdireset_command (char *args, int from_tty)
-{
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_sdireset()\n");
-
-  send_cmd (SDI_OPEN);
-
-  inferior_ptid = null_ptid;
-  delete_thread_silent (remote_m32r_ptid);
-}
-
-
-static void
-sdistatus_command (char *args, int from_tty)
-{
-  unsigned char buf[4096];
-  int i, c;
-
-  if (remote_debug)
-    fprintf_unfiltered (gdb_stdlog, "m32r_sdireset()\n");
-
-  if (!sdi_desc)
-    return;
-
-  send_cmd (SDI_STATUS);
-  for (i = 0; i < 4096; i++)
-    {
-      c = serial_readchar (sdi_desc, SDI_TIMEOUT);
-      if (c < 0)
-	return;
-      buf[i] = c;
-      if (c == 0)
-	break;
-    }
-
-  printf_filtered ("%s", buf);
-}
-
-
-static void
-debug_chaos_command (char *args, int from_tty)
-{
-  unsigned char buf[3];
-
-  buf[0] = SDI_SET_ATTR;
-  buf[1] = SDI_ATTR_CACHE;
-  buf[2] = SDI_CACHE_TYPE_CHAOS;
-  send_data (buf, 3);
-}
-
-
-static void
-use_debug_dma_command (char *args, int from_tty)
-{
-  unsigned char buf[3];
-
-  buf[0] = SDI_SET_ATTR;
-  buf[1] = SDI_ATTR_MEM_ACCESS;
-  buf[2] = SDI_MEM_ACCESS_DEBUG_DMA;
-  send_data (buf, 3);
-}
-
-static void
-use_mon_code_command (char *args, int from_tty)
-{
-  unsigned char buf[3];
-
-  buf[0] = SDI_SET_ATTR;
-  buf[1] = SDI_ATTR_MEM_ACCESS;
-  buf[2] = SDI_MEM_ACCESS_MON_CODE;
-  send_data (buf, 3);
-}
-
-
-static void
-use_ib_breakpoints_command (char *args, int from_tty)
-{
-  use_ib_breakpoints = 1;
-}
-
-static void
-use_dbt_breakpoints_command (char *args, int from_tty)
-{
-  use_ib_breakpoints = 0;
-}
-
-static int
-m32r_return_one (struct target_ops *target)
-{
-  return 1;
-}
-
-/* Implementation of the to_has_execution method.  */
-
-static int
-m32r_has_execution (struct target_ops *target, ptid_t the_ptid)
-{
-  return 1;
-}
-
-/* Define the target subroutine names.  */
-
-struct target_ops m32r_ops;
-
-static void
-init_m32r_ops (void)
-{
-  m32r_ops.to_shortname = "m32rsdi";
-  m32r_ops.to_longname = "Remote M32R debugging over SDI interface";
-  m32r_ops.to_doc = "Use an M32R board using SDI debugging protocol.";
-  m32r_ops.to_open = m32r_open;
-  m32r_ops.to_close = m32r_close;
-  m32r_ops.to_detach = m32r_detach;
-  m32r_ops.to_resume = m32r_resume;
-  m32r_ops.to_wait = m32r_wait;
-  m32r_ops.to_fetch_registers = m32r_fetch_register;
-  m32r_ops.to_store_registers = m32r_store_register;
-  m32r_ops.to_prepare_to_store = m32r_prepare_to_store;
-  m32r_ops.to_xfer_partial = m32r_xfer_partial;
-  m32r_ops.to_files_info = m32r_files_info;
-  m32r_ops.to_insert_breakpoint = m32r_insert_breakpoint;
-  m32r_ops.to_remove_breakpoint = m32r_remove_breakpoint;
-  m32r_ops.to_can_use_hw_breakpoint = m32r_can_use_hw_watchpoint;
-  m32r_ops.to_insert_watchpoint = m32r_insert_watchpoint;
-  m32r_ops.to_remove_watchpoint = m32r_remove_watchpoint;
-  m32r_ops.to_stopped_by_watchpoint = m32r_stopped_by_watchpoint;
-  m32r_ops.to_stopped_data_address = m32r_stopped_data_address;
-  m32r_ops.to_kill = m32r_kill;
-  m32r_ops.to_load = m32r_load;
-  m32r_ops.to_create_inferior = m32r_create_inferior;
-  m32r_ops.to_mourn_inferior = m32r_mourn_inferior;
-  m32r_ops.to_interrupt = m32r_interrupt;
-  m32r_ops.to_log_command = serial_log_command;
-  m32r_ops.to_thread_alive = m32r_thread_alive;
-  m32r_ops.to_pid_to_str = m32r_pid_to_str;
-  m32r_ops.to_stratum = process_stratum;
-  m32r_ops.to_has_all_memory = m32r_return_one;
-  m32r_ops.to_has_memory = m32r_return_one;
-  m32r_ops.to_has_stack = m32r_return_one;
-  m32r_ops.to_has_registers = m32r_return_one;
-  m32r_ops.to_has_execution = m32r_has_execution;
-  m32r_ops.to_magic = OPS_MAGIC;
-};
-
-
-extern initialize_file_ftype _initialize_remote_m32r;
-
-void
-_initialize_remote_m32r (void)
-{
-  int i;
-
-  init_m32r_ops ();
-
-  /* Initialize breakpoints.  */
-  for (i = 0; i < MAX_BREAKPOINTS; i++)
-    bp_address[i] = 0xffffffff;
-
-  /* Initialize access breaks.  */
-  for (i = 0; i < MAX_ACCESS_BREAKS; i++)
-    ab_address[i] = 0x00000000;
-
-  add_target (&m32r_ops);
-
-  add_com ("sdireset", class_obscure, sdireset_command,
-	   _("Reset SDI connection."));
-
-  add_com ("sdistatus", class_obscure, sdistatus_command,
-	   _("Show status of SDI connection."));
-
-  add_com ("debug_chaos", class_obscure, debug_chaos_command,
-	   _("Debug M32R/Chaos."));
-
-  add_com ("use_debug_dma", class_obscure, use_debug_dma_command,
-	   _("Use debug DMA mem access."));
-  add_com ("use_mon_code", class_obscure, use_mon_code_command,
-	   _("Use mon code mem access."));
-
-  add_com ("use_ib_break", class_obscure, use_ib_breakpoints_command,
-	   _("Set breakpoints by IB break."));
-  add_com ("use_dbt_break", class_obscure, use_dbt_breakpoints_command,
-	   _("Set breakpoints by dbt."));
-
-  /* Yes, 42000 is arbitrary.  The only sense out of it, is that it
-     isn't 0.  */
-  remote_m32r_ptid = ptid_build (42000, 0, 42000);
-}
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
deleted file mode 100644
index 2f6663b..0000000
--- a/gdb/remote-mips.c
+++ /dev/null
@@ -1,3771 +0,0 @@
-/* Remote debugging interface for MIPS remote debugging protocol.
-
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
-
-   Contributed by Cygnus Support.  Written by Ian Lance Taylor
-   <ian@cygnus.com>.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "infrun.h"
-#include "bfd.h"
-#include "symfile.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "serial.h"
-#include "target.h"
-#include <sys/stat.h>
-#include "gdb_usleep.h"
-#include "regcache.h"
-#include <ctype.h>
-#include "mips-tdep.h"
-#include "gdbthread.h"
-#include "gdb_bfd.h"
-
-
-/* Breakpoint types.  Values 0, 1, and 2 must agree with the watch
-   types passed by breakpoint.c to target_insert_watchpoint.
-   Value 3 is our own invention, and is used for ordinary instruction
-   breakpoints.  Value 4 is used to mark an unused watchpoint in tables.  */
-enum break_type
-  {
-    BREAK_WRITE,		/* 0 */
-    BREAK_READ,			/* 1 */
-    BREAK_ACCESS,		/* 2 */
-    BREAK_FETCH,		/* 3 */
-    BREAK_UNUSED		/* 4 */
-  };
-
-/* Prototypes for local functions.  */
-
-static int mips_readchar (int timeout);
-
-static int mips_receive_header (unsigned char *hdr, int *pgarbage,
-				int ch, int timeout);
-
-static int mips_receive_trailer (unsigned char *trlr, int *pgarbage,
-				 int *pch, int timeout);
-
-static int mips_cksum (const unsigned char *hdr,
-		       const char *data, int len);
-
-static void mips_send_packet (const char *s, int get_ack);
-
-static void mips_send_command (const char *cmd, int prompt);
-
-static int mips_receive_packet (char *buff, int throw_error, int timeout);
-
-static ULONGEST mips_request (int cmd, ULONGEST addr, ULONGEST data,
-			      int *perr, int timeout, char *buff);
-
-static void mips_initialize (void);
-
-static void mips_close (struct target_ops *self);
-
-static int mips_map_regno (struct gdbarch *, int);
-
-static void mips_set_register (int regno, ULONGEST value);
-
-static void mips_prepare_to_store (struct target_ops *self,
-				   struct regcache *regcache);
-
-static int mips_fetch_word (CORE_ADDR addr, unsigned int *valp);
-
-static int mips_store_word (CORE_ADDR addr, unsigned int value,
-			    int *old_contents);
-
-static enum target_xfer_status mips_xfer_memory (gdb_byte *readbuf,
-						 const gdb_byte *writebuf,
-						 ULONGEST memaddr,
-						 ULONGEST len,
-						 ULONGEST *xfered_len);
-
-static void mips_files_info (struct target_ops *ignore);
-
-static void mips_mourn_inferior (struct target_ops *ops);
-
-static int pmon_makeb64 (unsigned long v, char *p, int n, unsigned int *chksum);
-
-static int pmon_zeroset (int recsize, char **buff, unsigned int *amount,
-			 unsigned int *chksum);
-
-static int pmon_checkset (int recsize, char **buff, unsigned int *value);
-
-static void pmon_make_fastrec (char **outbuf, unsigned char *inbuf,
-			       int *inptr, int inamount, int *recsize,
-			       unsigned int *csum, unsigned int *zerofill);
-
-static int pmon_check_ack (char *mesg);
-
-static void pmon_start_download (void);
-
-static void pmon_end_download (int final, int bintotal);
-
-static void pmon_download (char *buffer, int length);
-
-static void mips_load (struct target_ops *self, const char *file, int from_tty);
-
-static int mips_make_srec (char *buffer, int type, CORE_ADDR memaddr,
-			   unsigned char *myaddr, int len);
-
-static int mips_set_breakpoint (CORE_ADDR addr, int len, enum break_type type);
-
-static int mips_clear_breakpoint (CORE_ADDR addr, int len,
-				  enum break_type type);
-
-static int mips_common_breakpoint (int set, CORE_ADDR addr, int len,
-				   enum break_type type);
-
-/* Forward declarations.  */
-extern struct target_ops mips_ops;
-extern struct target_ops pmon_ops;
-extern struct target_ops ddb_ops;
-extern struct target_ops rockhopper_ops;
-/* *INDENT-OFF* */
-/* The MIPS remote debugging interface is built on top of a simple
-   packet protocol.  Each packet is organized as follows:
-
-   SYN  The first character is always a SYN (ASCII 026, or ^V).  SYN
-   may not appear anywhere else in the packet.  Any time a SYN is
-   seen, a new packet should be assumed to have begun.
-
-   TYPE_LEN
-   This byte contains the upper five bits of the logical length
-   of the data section, plus a single bit indicating whether this
-   is a data packet or an acknowledgement.  The documentation
-   indicates that this bit is 1 for a data packet, but the actual
-   board uses 1 for an acknowledgement.  The value of the byte is
-   0x40 + (ack ? 0x20 : 0) + (len >> 6)
-   (we always have 0 <= len < 1024).  Acknowledgement packets do
-   not carry data, and must have a data length of 0.
-
-   LEN1 This byte contains the lower six bits of the logical length of
-   the data section.  The value is
-   0x40 + (len & 0x3f)
-
-   SEQ  This byte contains the six bit sequence number of the packet.
-   The value is
-   0x40 + seq
-   An acknowlegment packet contains the sequence number of the
-   packet being acknowledged plus 1 modulo 64.  Data packets are
-   transmitted in sequence.  There may only be one outstanding
-   unacknowledged data packet at a time.  The sequence numbers
-   are independent in each direction.  If an acknowledgement for
-   the previous packet is received (i.e., an acknowledgement with
-   the sequence number of the packet just sent) the packet just
-   sent should be retransmitted.  If no acknowledgement is
-   received within a timeout period, the packet should be
-   retransmitted.  This has an unfortunate failure condition on a
-   high-latency line, as a delayed acknowledgement may lead to an
-   endless series of duplicate packets.
-
-   DATA The actual data bytes follow.  The following characters are
-   escaped inline with DLE (ASCII 020, or ^P):
-   SYN (026)    DLE S
-   DLE (020)    DLE D
-   ^C  (003)    DLE C
-   ^S  (023)    DLE s
-   ^Q  (021)    DLE q
-   The additional DLE characters are not counted in the logical
-   length stored in the TYPE_LEN and LEN1 bytes.
-
-   CSUM1
-   CSUM2
-   CSUM3
-   These bytes contain an 18 bit checksum of the complete
-   contents of the packet excluding the SEQ byte and the
-   CSUM[123] bytes.  The checksum is simply the twos complement
-   addition of all the bytes treated as unsigned characters.  The
-   values of the checksum bytes are:
-   CSUM1: 0x40 + ((cksum >> 12) & 0x3f)
-   CSUM2: 0x40 + ((cksum >> 6) & 0x3f)
-   CSUM3: 0x40 + (cksum & 0x3f)
-
-   It happens that the MIPS remote debugging protocol always
-   communicates with ASCII strings.  Because of this, this
-   implementation doesn't bother to handle the DLE quoting mechanism,
-   since it will never be required.  */
-/* *INDENT-ON* */
-
-
-/* The SYN character which starts each packet.  */
-#define SYN '\026'
-
-/* The 0x40 used to offset each packet (this value ensures that all of
-   the header and trailer bytes, other than SYN, are printable ASCII
-   characters).  */
-#define HDR_OFFSET 0x40
-
-/* The indices of the bytes in the packet header.  */
-#define HDR_INDX_SYN 0
-#define HDR_INDX_TYPE_LEN 1
-#define HDR_INDX_LEN1 2
-#define HDR_INDX_SEQ 3
-#define HDR_LENGTH 4
-
-/* The data/ack bit in the TYPE_LEN header byte.  */
-#define TYPE_LEN_DA_BIT 0x20
-#define TYPE_LEN_DATA 0
-#define TYPE_LEN_ACK TYPE_LEN_DA_BIT
-
-/* How to compute the header bytes.  */
-#define HDR_SET_SYN(data, len, seq) (SYN)
-#define HDR_SET_TYPE_LEN(data, len, seq) \
-  (HDR_OFFSET \
-   + ((data) ? TYPE_LEN_DATA : TYPE_LEN_ACK) \
-   + (((len) >> 6) & 0x1f))
-#define HDR_SET_LEN1(data, len, seq) (HDR_OFFSET + ((len) & 0x3f))
-#define HDR_SET_SEQ(data, len, seq) (HDR_OFFSET + (seq))
-
-/* Check that a header byte is reasonable.  */
-#define HDR_CHECK(ch) (((ch) & HDR_OFFSET) == HDR_OFFSET)
-
-/* Get data from the header.  These macros evaluate their argument
-   multiple times.  */
-#define HDR_IS_DATA(hdr) \
-  (((hdr)[HDR_INDX_TYPE_LEN] & TYPE_LEN_DA_BIT) == TYPE_LEN_DATA)
-#define HDR_GET_LEN(hdr) \
-  ((((hdr)[HDR_INDX_TYPE_LEN] & 0x1f) << 6) + (((hdr)[HDR_INDX_LEN1] & 0x3f)))
-#define HDR_GET_SEQ(hdr) ((unsigned int)(hdr)[HDR_INDX_SEQ] & 0x3f)
-
-/* The maximum data length.  */
-#define DATA_MAXLEN 1023
-
-/* The trailer offset.  */
-#define TRLR_OFFSET HDR_OFFSET
-
-/* The indices of the bytes in the packet trailer.  */
-#define TRLR_INDX_CSUM1 0
-#define TRLR_INDX_CSUM2 1
-#define TRLR_INDX_CSUM3 2
-#define TRLR_LENGTH 3
-
-/* How to compute the trailer bytes.  */
-#define TRLR_SET_CSUM1(cksum) (TRLR_OFFSET + (((cksum) >> 12) & 0x3f))
-#define TRLR_SET_CSUM2(cksum) (TRLR_OFFSET + (((cksum) >>  6) & 0x3f))
-#define TRLR_SET_CSUM3(cksum) (TRLR_OFFSET + (((cksum)      ) & 0x3f))
-
-/* Check that a trailer byte is reasonable.  */
-#define TRLR_CHECK(ch) (((ch) & TRLR_OFFSET) == TRLR_OFFSET)
-
-/* Get data from the trailer.  This evaluates its argument multiple
-   times.  */
-#define TRLR_GET_CKSUM(trlr) \
-  ((((trlr)[TRLR_INDX_CSUM1] & 0x3f) << 12) \
-   + (((trlr)[TRLR_INDX_CSUM2] & 0x3f) <<  6) \
-   + ((trlr)[TRLR_INDX_CSUM3] & 0x3f))
-
-/* The sequence number modulos.  */
-#define SEQ_MODULOS (64)
-
-/* PMON commands to load from the serial port or UDP socket.  */
-#define LOAD_CMD	"load -b -s tty0\r"
-#define LOAD_CMD_UDP	"load -b -s udp\r"
-
-/* The target vectors for the four different remote MIPS targets.
-   These are initialized with code in _initialize_remote_mips instead
-   of static initializers, to make it easier to extend the target_ops
-   vector later.  */
-struct target_ops mips_ops, pmon_ops, ddb_ops, rockhopper_ops, lsi_ops;
-
-enum mips_monitor_type
-  {
-    /* IDT/SIM monitor being used: */
-    MON_IDT,
-    /* PMON monitor being used: */
-    MON_PMON,			/* 3.0.83 [COGENT,EB,FP,NET]
-				   Algorithmics Ltd. Nov  9 1995 17:19:50 */
-    MON_DDB,			/* 2.7.473 [DDBVR4300,EL,FP,NET]
-				   Risq Modular Systems,
-				   Thu Jun 6 09:28:40 PDT 1996 */
-    MON_LSI,			/* 4.3.12 [EB,FP],
-				   LSI LOGIC Corp. Tue Feb 25 13:22:14 1997 */
-    MON_ROCKHOPPER,
-    /* Last and unused value, for sizing vectors, etc.  */
-    MON_LAST
-  };
-static enum mips_monitor_type mips_monitor = MON_LAST;
-
-/* The monitor prompt text.  If the user sets the PMON prompt
-   to some new value, the GDB `set monitor-prompt' command must also
-   be used to inform GDB about the expected prompt.  Otherwise, GDB
-   will not be able to connect to PMON in mips_initialize().
-   If the `set monitor-prompt' command is not used, the expected
-   default prompt will be set according the target:
-   target               prompt
-   -----                -----
-   pmon         PMON> 
-   ddb          NEC010>
-   lsi          PMON>
- */
-static char *mips_monitor_prompt;
-
-/* Set to 1 if the target is open.  */
-static int mips_is_open;
-
-/* Currently active target description (if mips_is_open == 1).  */
-static struct target_ops *current_ops;
-
-/* Set to 1 while the connection is being initialized.  */
-static int mips_initializing;
-
-/* Set to 1 while the connection is being brought down.  */
-static int mips_exiting;
-
-/* The next sequence number to send.  */
-static unsigned int mips_send_seq;
-
-/* The next sequence number we expect to receive.  */
-static unsigned int mips_receive_seq;
-
-/* The time to wait before retransmitting a packet, in seconds.  */
-static int mips_retransmit_wait = 3;
-
-/* The number of times to try retransmitting a packet before giving up.  */
-static int mips_send_retries = 10;
-
-/* The number of garbage characters to accept when looking for an
-   SYN for the next packet.  */
-static int mips_syn_garbage = 10;
-
-/* The time to wait for a packet, in seconds.  */
-static int mips_receive_wait = 5;
-
-/* Set if we have sent a packet to the board but have not yet received
-   a reply.  */
-static int mips_need_reply = 0;
-
-/* Handle used to access serial I/O stream.  */
-static struct serial *mips_desc;
-
-/* UDP handle used to download files to target.  */
-static struct serial *udp_desc;
-static int udp_in_use;
-
-/* TFTP filename used to download files to DDB board, in the form
-   host:filename.  */
-static char *tftp_name;		/* host:filename */
-static char *tftp_localname;	/* filename portion of above */
-static int tftp_in_use;
-static FILE *tftp_file;
-
-/* Counts the number of times the user tried to interrupt the target (usually
-   via ^C.  */
-static int interrupt_count;
-
-/* If non-zero, means that the target is running.  */
-static int mips_wait_flag = 0;
-
-/* If non-zero, monitor supports breakpoint commands.  */
-static int monitor_supports_breakpoints = 0;
-
-/* Data cache header.  */
-
-#if 0				/* not used (yet?)  */
-static DCACHE *mips_dcache;
-#endif
-
-/* Non-zero means that we've just hit a read or write watchpoint.  */
-static int hit_watchpoint;
-
-/* Table of breakpoints/watchpoints (used only on LSI PMON target).
-   The table is indexed by a breakpoint number, which is an integer
-   from 0 to 255 returned by the LSI PMON when a breakpoint is set.  */
-
-#define MAX_LSI_BREAKPOINTS 256
-struct lsi_breakpoint_info
-  {
-    enum break_type type;	/* type of breakpoint */
-    CORE_ADDR addr;		/* address of breakpoint */
-    int len;			/* length of region being watched */
-    unsigned long value;	/* value to watch */
-  }
-lsi_breakpoints[MAX_LSI_BREAKPOINTS];
-
-/* Error/warning codes returned by LSI PMON for breakpoint commands.
-   Warning values may be ORed together; error values may not.  */
-#define W_WARN	0x100		/* This bit is set if the error code
-				   is a warning */
-#define W_MSK   0x101		/* warning: Range feature is supported
-				   via mask */
-#define W_VAL   0x102		/* warning: Value check is not
-				   supported in hardware */
-#define W_QAL   0x104		/* warning: Requested qualifiers are
-				   not supported in hardware */
-
-#define E_ERR	0x200		/* This bit is set if the error code
-				   is an error */
-#define E_BPT   0x200		/* error: No such breakpoint number */
-#define E_RGE   0x201		/* error: Range is not supported */
-#define E_QAL   0x202		/* error: The requested qualifiers can
-				   not be used */
-#define E_OUT   0x203		/* error: Out of hardware resources */
-#define E_NON   0x204		/* error: Hardware breakpoint not supported */
-
-struct lsi_error
-  {
-    int code;			/* error code */
-    char *string;		/* string associated with this code */
-  };
-
-struct lsi_error lsi_warning_table[] =
-{
-  {W_MSK, "Range feature is supported via mask"},
-  {W_VAL, "Value check is not supported in hardware"},
-  {W_QAL, "Requested qualifiers are not supported in hardware"},
-  {0, NULL}
-};
-
-struct lsi_error lsi_error_table[] =
-{
-  {E_BPT, "No such breakpoint number"},
-  {E_RGE, "Range is not supported"},
-  {E_QAL, "The requested qualifiers can not be used"},
-  {E_OUT, "Out of hardware resources"},
-  {E_NON, "Hardware breakpoint not supported"},
-  {0, NULL}
-};
-
-/* Set to 1 with the 'set monitor-warnings' command to enable printing
-   of warnings returned by PMON when hardware breakpoints are used.  */
-static int monitor_warnings;
-
-/* This is the ptid we use while we're connected to the remote.  Its
-   value is arbitrary, as the remote-mips target doesn't have a notion of
-   processes or threads, but we need something non-null to place in
-   inferior_ptid.  */
-static ptid_t remote_mips_ptid;
-
-/* Close any ports which might be open.  Reset certain globals indicating
-   the state of those ports.  */
-
-static void
-close_ports (void)
-{
-  mips_is_open = 0;
-  serial_close (mips_desc);
-
-  if (udp_in_use)
-    {
-      serial_close (udp_desc);
-      udp_in_use = 0;
-    }
-  tftp_in_use = 0;
-}
-
-/* Handle low-level error that we can't recover from.  Note that just
-   error()ing out from target_wait or some such low-level place will cause
-   all hell to break loose--the rest of GDB will tend to get left in an
-   inconsistent state.  */
-
-static void ATTRIBUTE_NORETURN
-mips_error (char *string,...)
-{
-  va_list args;
-  char *fmt;
-
-  target_terminal_ours ();
-  wrap_here ("");		/* Force out any buffered output.  */
-  gdb_flush (gdb_stdout);
-  gdb_flush (gdb_stderr);
-
-  /* Clean up in such a way that mips_close won't try to talk to the
-     board (it almost surely won't work since we weren't able to talk to
-     it).  */
-  close_ports ();
-
-  if (!ptid_equal (inferior_ptid, null_ptid))
-    target_mourn_inferior ();
-
-  fmt = concat (_("Ending remote MIPS debugging: "),
-		string, (char *) NULL);
-  make_cleanup (xfree, fmt);
-
-  va_start (args, string);
-  throw_verror (TARGET_CLOSE_ERROR, fmt, args);
-  va_end (args);
-}
-
-/* putc_readable - print a character, displaying non-printable chars in
-   ^x notation or in hex.  */
-
-static void
-fputc_readable (int ch, struct ui_file *file)
-{
-  if (ch == '\n')
-    fputc_unfiltered ('\n', file);
-  else if (ch == '\r')
-    fprintf_unfiltered (file, "\\r");
-  else if (ch < 0x20)		/* ASCII control character */
-    fprintf_unfiltered (file, "^%c", ch + '@');
-  else if (ch >= 0x7f)		/* non-ASCII characters (rubout or greater) */
-    fprintf_unfiltered (file, "[%02x]", ch & 0xff);
-  else
-    fputc_unfiltered (ch, file);
-}
-
-
-/* puts_readable - print a string, displaying non-printable chars in
-   ^x notation or in hex.  */
-
-static void
-fputs_readable (const char *string, struct ui_file *file)
-{
-  int c;
-
-  while ((c = *string++) != '\0')
-    fputc_readable (c, file);
-}
-
-
-/* Read P as a hex value.  Return true if every character made sense,
-   storing the result in *RESULT.  Leave *RESULT unchanged otherwise.  */
-
-static int
-read_hex_value (const char *p, ULONGEST *result)
-{
-  ULONGEST retval;
-
-  retval = 0;
-  while (*p != 0)
-    {
-      retval <<= 4;
-      if (*p >= '0' && *p <= '9')
-	retval |= *p - '0';
-      else if (*p >= 'A' && *p <= 'F')
-	retval |= *p - 'A' + 10;
-      else if (*p >= 'a' && *p <= 'f')
-	retval |= *p - 'a' + 10;
-      else
-	return 0;
-      p++;
-    }
-  *result = retval;
-  return 1;
-}
-
-
-/* Wait until STRING shows up in mips_desc.  Returns 1 if successful, else 0 if
-   timed out.  TIMEOUT specifies timeout value in seconds.  */
-
-static int
-mips_expect_timeout (const char *string, int timeout)
-{
-  const char *p = string;
-
-  if (remote_debug)
-    {
-      fprintf_unfiltered (gdb_stdlog, "Expected \"");
-      fputs_readable (string, gdb_stdlog);
-      fprintf_unfiltered (gdb_stdlog, "\", got \"");
-    }
-
-  immediate_quit++;
-  QUIT;
-  while (1)
-    {
-      int c;
-
-      /* 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);
-
-      if (c == SERIAL_TIMEOUT)
-	{
-	  if (remote_debug)
-	    fprintf_unfiltered (gdb_stdlog, "\": FAIL\n");
-	  return 0;
-	}
-
-      if (remote_debug)
-	fputc_readable (c, gdb_stdlog);
-
-      if (c == *p++)
-	{
-	  if (*p == '\0')
-	    {
-	      immediate_quit--;
-	      if (remote_debug)
-		fprintf_unfiltered (gdb_stdlog, "\": OK\n");
-	      return 1;
-	    }
-	}
-      else
-	{
-	  p = string;
-	  if (c == *p)
-	    p++;
-	}
-    }
-}
-
-/* Wait until STRING shows up in mips_desc.  Returns 1 if successful, else 0 if
-   timed out.  The timeout value is hard-coded to 2 seconds.  Use
-   mips_expect_timeout if a different timeout value is needed.  */
-
-static int
-mips_expect (const char *string)
-{
-  return mips_expect_timeout (string, remote_timeout);
-}
-
-/* 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
-   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
-   convenient for DejaGnu when you only have one connected serial
-   port.  */
-
-static int
-mips_readchar (int timeout)
-{
-  int ch;
-  static int state = 0;
-  int mips_monitor_prompt_len = strlen (mips_monitor_prompt);
-
-  { /* FIXME this whole block is dead code!  */
-    int i;
-
-    i = timeout;
-    if (i == -1 && watchdog > 0)
-      i = watchdog;
-  }
-
-  if (state == mips_monitor_prompt_len)
-    timeout = 1;
-  ch = serial_readchar (mips_desc, timeout);
-
-  if (ch == SERIAL_TIMEOUT && timeout == -1)	/* Watchdog went off.  */
-    {
-      target_mourn_inferior ();
-      error (_("Watchdog has expired.  Target detached."));
-    }
-
-  if (ch == SERIAL_EOF)
-    mips_error (_("End of file from remote"));
-  if (ch == SERIAL_ERROR)
-    mips_error (_("Error reading from remote: %s"), safe_strerror (errno));
-  if (remote_debug > 1)
-    {
-      /* Don't use _filtered; we can't deal with a QUIT out of
-         target_wait, and I think this might be called from there.  */
-      if (ch != SERIAL_TIMEOUT)
-	fprintf_unfiltered (gdb_stdlog, "Read '%c' %d 0x%x\n", ch, ch, ch);
-      else
-	fprintf_unfiltered (gdb_stdlog, "Timed out in read\n");
-    }
-
-  /* If we have seen mips_monitor_prompt and we either time out, or
-     we see a @ (which was echoed from a packet we sent), reset the
-     board as described above.  The first character in a packet after
-     the SYN (which is not echoed) is always an @ unless the packet is
-     more than 64 characters long, which ours never are.  */
-  if ((ch == SERIAL_TIMEOUT || ch == '@')
-      && state == mips_monitor_prompt_len
-      && !mips_initializing
-      && !mips_exiting)
-    {
-      if (remote_debug > 0)
-	/* Don't use _filtered; we can't deal with a QUIT out of
-	   target_wait, and I think this might be called from there.  */
-	fprintf_unfiltered (gdb_stdlog,
-			    "Reinitializing MIPS debugging mode\n");
-
-      mips_need_reply = 0;
-      mips_initialize ();
-
-      state = 0;
-
-      /* At this point, about the only thing we can do is abort the command
-         in progress and get back to command level as quickly as possible.  */
-
-      error (_("Remote board reset, debug protocol re-initialized."));
-    }
-
-  if (ch == mips_monitor_prompt[state])
-    ++state;
-  else
-    state = 0;
-
-  return ch;
-}
-
-/* Get a packet header, putting the data in the supplied buffer.
-   PGARBAGE is a pointer to the number of garbage characters received
-   so far.  CH is the last character received.  Returns 0 for success,
-   or -1 for timeout.  */
-
-static int
-mips_receive_header (unsigned char *hdr, int *pgarbage, int ch, int timeout)
-{
-  int i;
-
-  while (1)
-    {
-      /* Wait for a SYN.  mips_syn_garbage is intended to prevent
-         sitting here indefinitely if the board sends us one garbage
-         character per second.  ch may already have a value from the
-         last time through the loop.  */
-      while (ch != SYN)
-	{
-	  ch = mips_readchar (timeout);
-	  if (ch == SERIAL_TIMEOUT)
-	    return -1;
-	  if (ch != SYN)
-	    {
-	      /* Printing the character here lets the user of gdb see
-	         what the program is outputting, if the debugging is
-	         being done on the console port.  Don't use _filtered:
-	         we can't deal with a QUIT out of target_wait and
-	         buffered target output confuses the user.  */
- 	      if (!mips_initializing || remote_debug > 0)
-  		{
-		  if (isprint (ch) || isspace (ch))
-		    {
-		      fputc_unfiltered (ch, gdb_stdtarg);
-		    }
-		  else
-		    {
-		      fputc_readable (ch, gdb_stdtarg);
-		    }
-		  gdb_flush (gdb_stdtarg);
-  		}
-	      
-	      /* Only count unprintable characters.  */
-	      if (! (isprint (ch) || isspace (ch)))
-		(*pgarbage) += 1;
-
-	      if (mips_syn_garbage > 0
-		  && *pgarbage > mips_syn_garbage)
-		mips_error (_("Debug protocol failure:  more "
-			    "than %d characters before a sync."),
-			    mips_syn_garbage);
-	    }
-	}
-
-      /* Get the packet header following the SYN.  */
-      for (i = 1; i < HDR_LENGTH; i++)
-	{
-	  ch = mips_readchar (timeout);
-	  if (ch == SERIAL_TIMEOUT)
-	    return -1;
-	  /* Make sure this is a header byte.  */
-	  if (ch == SYN || !HDR_CHECK (ch))
-	    break;
-
-	  hdr[i] = ch;
-	}
-
-      /* If we got the complete header, we can return.  Otherwise we
-         loop around and keep looking for SYN.  */
-      if (i >= HDR_LENGTH)
-	return 0;
-    }
-}
-
-/* Get a packet header, putting the data in the supplied buffer.
-   PGARBAGE is a pointer to the number of garbage characters received
-   so far.  The last character read is returned in *PCH.  Returns 0
-   for success, -1 for timeout, -2 for error.  */
-
-static int
-mips_receive_trailer (unsigned char *trlr, int *pgarbage,
-		      int *pch, int timeout)
-{
-  int i;
-  int ch;
-
-  for (i = 0; i < TRLR_LENGTH; i++)
-    {
-      ch = mips_readchar (timeout);
-      *pch = ch;
-      if (ch == SERIAL_TIMEOUT)
-	return -1;
-      if (!TRLR_CHECK (ch))
-	return -2;
-      trlr[i] = ch;
-    }
-  return 0;
-}
-
-/* Get the checksum of a packet.  HDR points to the packet header.
-   DATASTR points to the packet data.  LEN is the length of DATASTR.  */
-
-static int
-mips_cksum (const unsigned char *hdr, const char *datastr, int len)
-{
-  const unsigned char *p;
-  const unsigned char *data = (const unsigned char *) datastr;
-  int c;
-  int cksum;
-
-  cksum = 0;
-
-  /* The initial SYN is not included in the checksum.  */
-  c = HDR_LENGTH - 1;
-  p = hdr + 1;
-  while (c-- != 0)
-    cksum += *p++;
-
-  c = len;
-  p = data;
-  while (c-- != 0)
-    cksum += *p++;
-
-  return cksum;
-}
-
-/* Send a packet containing the given ASCII string.  */
-
-static void
-mips_send_packet (const char *s, int get_ack)
-{
-  /* unsigned */ int len;
-  unsigned char *packet;
-  int cksum;
-  int attempt;
-
-  len = strlen (s);
-  if (len > DATA_MAXLEN)
-    mips_error (_("MIPS protocol data packet too long: %s"), s);
-
-  packet = (unsigned char *) alloca (HDR_LENGTH + len + TRLR_LENGTH + 1);
-
-  packet[HDR_INDX_SYN] = HDR_SET_SYN (1, len, mips_send_seq);
-  packet[HDR_INDX_TYPE_LEN] = HDR_SET_TYPE_LEN (1, len, mips_send_seq);
-  packet[HDR_INDX_LEN1] = HDR_SET_LEN1 (1, len, mips_send_seq);
-  packet[HDR_INDX_SEQ] = HDR_SET_SEQ (1, len, mips_send_seq);
-
-  memcpy (packet + HDR_LENGTH, s, len);
-
-  cksum = mips_cksum (packet, (char *) packet + HDR_LENGTH, len);
-  packet[HDR_LENGTH + len + TRLR_INDX_CSUM1] = TRLR_SET_CSUM1 (cksum);
-  packet[HDR_LENGTH + len + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
-  packet[HDR_LENGTH + len + TRLR_INDX_CSUM3] = TRLR_SET_CSUM3 (cksum);
-
-  /* Increment the sequence number.  This will set mips_send_seq to
-     the sequence number we expect in the acknowledgement.  */
-  mips_send_seq = (mips_send_seq + 1) % SEQ_MODULOS;
-
-  /* We can only have one outstanding data packet, so we just wait for
-     the acknowledgement here.  Keep retransmitting the packet until
-     we get one, or until we've tried too many times.  */
-  for (attempt = 0; attempt < mips_send_retries; attempt++)
-    {
-      int garbage;
-      int ch;
-
-      if (remote_debug > 0)
-	{
-	  /* Don't use _filtered; we can't deal with a QUIT out of
-	     target_wait, and I think this might be called from there.  */
-	  packet[HDR_LENGTH + len + TRLR_LENGTH] = '\0';
-	  fprintf_unfiltered (gdb_stdlog, "Writing \"%s\"\n", packet + 1);
-	}
-
-      if (serial_write (mips_desc, packet,
-			HDR_LENGTH + len + TRLR_LENGTH) != 0)
-	mips_error (_("write to target failed: %s"), safe_strerror (errno));
-
-      if (!get_ack)
-	return;
-
-      garbage = 0;
-      ch = 0;
-      while (1)
-	{
-	  unsigned char hdr[HDR_LENGTH + 1];
-	  unsigned char trlr[TRLR_LENGTH + 1];
-	  int err;
-	  unsigned int seq;
-
-	  /* Get the packet header.  If we time out, resend the data
-	     packet.  */
-	  err = mips_receive_header (hdr, &garbage, ch, mips_retransmit_wait);
-	  if (err != 0)
-	    break;
-
-	  ch = 0;
-
-	  /* If we get a data packet, assume it is a duplicate and
-	     ignore it.  FIXME: If the acknowledgement is lost, this
-	     data packet may be the packet the remote sends after the
-	     acknowledgement.  */
-	  if (HDR_IS_DATA (hdr))
-	    {
-	      int i;
-
-	      /* Ignore any errors raised whilst attempting to ignore
-	         packet.  */
-
-	      len = HDR_GET_LEN (hdr);
-
-	      for (i = 0; i < len; i++)
-		{
-		  int rch;
-
-		  rch = mips_readchar (remote_timeout);
-		  if (rch == SYN)
-		    {
-		      ch = SYN;
-		      break;
-		    }
-		  if (rch == SERIAL_TIMEOUT)
-		    break;
-		  /* Ignore the character.  */
-		}
-
-	      if (i == len)
-		(void) mips_receive_trailer (trlr, &garbage, &ch,
-					     remote_timeout);
-
-	      /* We don't bother checking the checksum, or providing an
-	         ACK to the packet.  */
-	      continue;
-	    }
-
-	  /* If the length is not 0, this is a garbled packet.  */
-	  if (HDR_GET_LEN (hdr) != 0)
-	    continue;
-
-	  /* Get the packet trailer.  */
-	  err = mips_receive_trailer (trlr, &garbage, &ch,
-				      mips_retransmit_wait);
-
-	  /* If we timed out, resend the data packet.  */
-	  if (err == -1)
-	    break;
-
-	  /* If we got a bad character, reread the header.  */
-	  if (err != 0)
-	    continue;
-
-	  /* If the checksum does not match the trailer checksum, this
-	     is a bad packet; ignore it.  */
-	  if (mips_cksum (hdr, NULL, 0) != TRLR_GET_CKSUM (trlr))
-	    continue;
-
-	  if (remote_debug > 0)
-	    {
-	      hdr[HDR_LENGTH] = '\0';
-	      trlr[TRLR_LENGTH] = '\0';
-	      /* Don't use _filtered; we can't deal with a QUIT out of
-	         target_wait, and I think this might be called from there.  */
-	      fprintf_unfiltered (gdb_stdlog, "Got ack %d \"%s%s\"\n",
-				  HDR_GET_SEQ (hdr), hdr + 1, trlr);
-	    }
-
-	  /* If this ack is for the current packet, we're done.  */
-	  seq = HDR_GET_SEQ (hdr);
-	  if (seq == mips_send_seq)
-	    return;
-
-	  /* If this ack is for the last packet, resend the current
-	     packet.  */
-	  if ((seq + 1) % SEQ_MODULOS == mips_send_seq)
-	    break;
-
-	  /* Otherwise this is a bad ack; ignore it.  Increment the
-	     garbage count to ensure that we do not stay in this loop
-	     forever.  */
-	  ++garbage;
-	}
-    }
-
-  mips_error (_("Remote did not acknowledge packet"));
-}
-
-/* Receive and acknowledge a packet, returning the data in BUFF (which
-   should be DATA_MAXLEN + 1 bytes).  The protocol documentation
-   implies that only the sender retransmits packets, so this code just
-   waits silently for a packet.  It returns the length of the received
-   packet.  If THROW_ERROR is nonzero, call error() on errors.  If not,
-   don't print an error message and return -1.  */
-
-static int
-mips_receive_packet (char *buff, int throw_error, int timeout)
-{
-  int ch;
-  int garbage;
-  int len;
-  unsigned char ack[HDR_LENGTH + TRLR_LENGTH + 1];
-  int cksum;
-
-  ch = 0;
-  garbage = 0;
-  while (1)
-    {
-      unsigned char hdr[HDR_LENGTH];
-      unsigned char trlr[TRLR_LENGTH];
-      int i;
-      int err;
-
-      if (mips_receive_header (hdr, &garbage, ch, timeout) != 0)
-	{
-	  if (throw_error)
-	    mips_error (_("Timed out waiting for remote packet"));
-	  else
-	    return -1;
-	}
-
-      ch = 0;
-
-      /* An acknowledgement is probably a duplicate; ignore it.  */
-      if (!HDR_IS_DATA (hdr))
-	{
-	  len = HDR_GET_LEN (hdr);
-	  /* Check if the length is valid for an ACK, we may aswell
-	     try and read the remainder of the packet: */
-	  if (len == 0)
-	    {
-	      /* Ignore the error condition, since we are going to
-	         ignore the packet anyway.  */
-	      (void) mips_receive_trailer (trlr, &garbage, &ch, timeout);
-	    }
-	  /* Don't use _filtered; we can't deal with a QUIT out of
-	     target_wait, and I think this might be called from there.  */
-	  if (remote_debug > 0)
-	    fprintf_unfiltered (gdb_stdlog, "Ignoring unexpected ACK\n");
-	  continue;
-	}
-
-      len = HDR_GET_LEN (hdr);
-      for (i = 0; i < len; i++)
-	{
-	  int rch;
-
-	  rch = mips_readchar (timeout);
-	  if (rch == SYN)
-	    {
-	      ch = SYN;
-	      break;
-	    }
-	  if (rch == SERIAL_TIMEOUT)
-	    {
-	      if (throw_error)
-		mips_error (_("Timed out waiting for remote packet"));
-	      else
-		return -1;
-	    }
-	  buff[i] = rch;
-	}
-
-      if (i < len)
-	{
-	  /* Don't use _filtered; we can't deal with a QUIT out of
-	     target_wait, and I think this might be called from there.  */
-	  if (remote_debug > 0)
-	    fprintf_unfiltered (gdb_stdlog,
-				"Got new SYN after %d chars (wanted %d)\n",
-				i, len);
-	  continue;
-	}
-
-      err = mips_receive_trailer (trlr, &garbage, &ch, timeout);
-      if (err == -1)
-	{
-	  if (throw_error)
-	    mips_error (_("Timed out waiting for packet"));
-	  else
-	    return -1;
-	}
-      if (err == -2)
-	{
-	  /* Don't use _filtered; we can't deal with a QUIT out of
-	     target_wait, and I think this might be called from there.  */
-	  if (remote_debug > 0)
-	    fprintf_unfiltered (gdb_stdlog, "Got SYN when wanted trailer\n");
-	  continue;
-	}
-
-      /* If this is the wrong sequence number, ignore it.  */
-      if (HDR_GET_SEQ (hdr) != mips_receive_seq)
-	{
-	  /* Don't use _filtered; we can't deal with a QUIT out of
-	     target_wait, and I think this might be called from there.  */
-	  if (remote_debug > 0)
-	    fprintf_unfiltered (gdb_stdlog,
-				"Ignoring sequence number %d (want %d)\n",
-				HDR_GET_SEQ (hdr), mips_receive_seq);
-	  continue;
-	}
-
-      if (mips_cksum (hdr, buff, len) == TRLR_GET_CKSUM (trlr))
-	break;
-
-      if (remote_debug > 0)
-	/* Don't use _filtered; we can't deal with a QUIT out of
-	   target_wait, and I think this might be called from there.  */
-	printf_unfiltered ("Bad checksum; data %d, trailer %d\n",
-			   mips_cksum (hdr, buff, len),
-			   TRLR_GET_CKSUM (trlr));
-
-      /* The checksum failed.  Send an acknowledgement for the
-         previous packet to tell the remote to resend the packet.  */
-      ack[HDR_INDX_SYN] = HDR_SET_SYN (0, 0, mips_receive_seq);
-      ack[HDR_INDX_TYPE_LEN] = HDR_SET_TYPE_LEN (0, 0, mips_receive_seq);
-      ack[HDR_INDX_LEN1] = HDR_SET_LEN1 (0, 0, mips_receive_seq);
-      ack[HDR_INDX_SEQ] = HDR_SET_SEQ (0, 0, mips_receive_seq);
-
-      cksum = mips_cksum (ack, NULL, 0);
-
-      ack[HDR_LENGTH + TRLR_INDX_CSUM1] = TRLR_SET_CSUM1 (cksum);
-      ack[HDR_LENGTH + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
-      ack[HDR_LENGTH + TRLR_INDX_CSUM3] = TRLR_SET_CSUM3 (cksum);
-
-      if (remote_debug > 0)
-	{
-	  ack[HDR_LENGTH + TRLR_LENGTH] = '\0';
-	  /* Don't use _filtered; we can't deal with a QUIT out of
-	     target_wait, and I think this might be called from there.  */
-	  printf_unfiltered ("Writing ack %d \"%s\"\n", mips_receive_seq,
-			     ack + 1);
-	}
-
-      if (serial_write (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)
-	{
-	  if (throw_error)
-	    mips_error (_("write to target failed: %s"),
-	                safe_strerror (errno));
-	  else
-	    return -1;
-	}
-    }
-
-  if (remote_debug > 0)
-    {
-      buff[len] = '\0';
-      /* Don't use _filtered; we can't deal with a QUIT out of
-         target_wait, and I think this might be called from there.  */
-      printf_unfiltered ("Got packet \"%s\"\n", buff);
-    }
-
-  /* We got the packet.  Send an acknowledgement.  */
-  mips_receive_seq = (mips_receive_seq + 1) % SEQ_MODULOS;
-
-  ack[HDR_INDX_SYN] = HDR_SET_SYN (0, 0, mips_receive_seq);
-  ack[HDR_INDX_TYPE_LEN] = HDR_SET_TYPE_LEN (0, 0, mips_receive_seq);
-  ack[HDR_INDX_LEN1] = HDR_SET_LEN1 (0, 0, mips_receive_seq);
-  ack[HDR_INDX_SEQ] = HDR_SET_SEQ (0, 0, mips_receive_seq);
-
-  cksum = mips_cksum (ack, NULL, 0);
-
-  ack[HDR_LENGTH + TRLR_INDX_CSUM1] = TRLR_SET_CSUM1 (cksum);
-  ack[HDR_LENGTH + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
-  ack[HDR_LENGTH + TRLR_INDX_CSUM3] = TRLR_SET_CSUM3 (cksum);
-
-  if (remote_debug > 0)
-    {
-      ack[HDR_LENGTH + TRLR_LENGTH] = '\0';
-      /* Don't use _filtered; we can't deal with a QUIT out of
-         target_wait, and I think this might be called from there.  */
-      printf_unfiltered ("Writing ack %d \"%s\"\n", mips_receive_seq,
-			 ack + 1);
-    }
-
-  if (serial_write (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)
-    {
-      if (throw_error)
-	mips_error (_("write to target failed: %s"), safe_strerror (errno));
-      else
-	return -1;
-    }
-
-  return len;
-}
-
-/* Optionally send a request to the remote system and optionally wait
-   for the reply.  This implements the remote debugging protocol,
-   which is built on top of the packet protocol defined above.  Each
-   request has an ADDR argument and a DATA argument.  The following
-   requests are defined:
-
-   \0   don't send a request; just wait for a reply
-   i    read word from instruction space at ADDR
-   d    read word from data space at ADDR
-   I    write DATA to instruction space at ADDR
-   D    write DATA to data space at ADDR
-   r    read register number ADDR
-   R    set register number ADDR to value DATA
-   c    continue execution (if ADDR != 1, set pc to ADDR)
-   s    single step (if ADDR != 1, set pc to ADDR)
-
-   The read requests return the value requested.  The write requests
-   return the previous value in the changed location.  The execution
-   requests return a UNIX wait value (the approximate signal which
-   caused execution to stop is in the upper eight bits).
-
-   If PERR is not NULL, this function waits for a reply.  If an error
-   occurs, it sets *PERR to 1 and sets errno according to what the
-   target board reports.  */
-
-static ULONGEST
-mips_request (int cmd,
-	      ULONGEST addr,
-	      ULONGEST data,
-	      int *perr,
-	      int timeout,
-	      char *buff)
-{
-  int addr_size = gdbarch_addr_bit (target_gdbarch ()) / 8;
-  char myBuff[DATA_MAXLEN + 1];
-  char response_string[17];
-  int len;
-  int rpid;
-  char rcmd;
-  int rerrflg;
-  ULONGEST rresponse;
-
-  if (buff == (char *) NULL)
-    buff = myBuff;
-
-  if (cmd != '\0')
-    {
-      if (mips_need_reply)
-	internal_error (__FILE__, __LINE__,
-			_("mips_request: Trying to send "
-			  "command before reply"));
-      /* 'T' sets a register to a 64-bit value, so make sure we use
-	 the right conversion function.  */
-      if (cmd == 'T')
-	sprintf (buff, "0x0 %c 0x%s 0x%s", cmd,
-		 phex_nz (addr, addr_size), phex_nz (data, 8));
-      else
-	sprintf (buff, "0x0 %c 0x%s 0x%s", cmd,
-	         phex_nz (addr, addr_size), phex_nz (data, addr_size));
-
-      mips_send_packet (buff, 1);
-      mips_need_reply = 1;
-    }
-
-  if (perr == (int *) NULL)
-    return 0;
-
-  if (!mips_need_reply)
-    internal_error (__FILE__, __LINE__,
-		    _("mips_request: Trying to get reply before command"));
-
-  mips_need_reply = 0;
-
-  len = mips_receive_packet (buff, 1, timeout);
-  buff[len] = '\0';
-
-  if (sscanf (buff, "0x%x %c 0x%x 0x%16s",
-	      &rpid, &rcmd, &rerrflg, response_string) != 4
-      || !read_hex_value (response_string, &rresponse)
-      || (cmd != '\0' && rcmd != cmd))
-    mips_error (_("Bad response from remote board"));
-
-  if (rerrflg != 0)
-    {
-      *perr = 1;
-
-      /* FIXME: This will returns MIPS errno numbers, which may or may
-         not be the same as errno values used on other systems.  If
-         they stick to common errno values, they will be the same, but
-         if they don't, they must be translated.  */
-      errno = rresponse;
-
-      return 0;
-    }
-
-  *perr = 0;
-  return rresponse;
-}
-
-/* Cleanup associated with mips_initialize().  */
-
-static void
-mips_initialize_cleanups (void *arg)
-{
-  mips_initializing = 0;
-}
-
-/* Cleanup associated with mips_exit_debug().  */
-
-static void
-mips_exit_cleanups (void *arg)
-{
-  mips_exiting = 0;
-}
-
-/* Send a command and wait for that command to be echoed back.  Wait,
-   too, for the following prompt.  */
-
-static void
-mips_send_command (const char *cmd, int prompt)
-{
-  serial_write (mips_desc, cmd, strlen (cmd));
-  mips_expect (cmd);
-  mips_expect ("\n");
-  if (prompt)
-    mips_expect (mips_monitor_prompt);
-}
-
-/* Enter remote (dbx) debug mode: */
-
-static void
-mips_enter_debug (void)
-{
-  /* Reset the sequence numbers, ready for the new debug sequence: */
-  mips_send_seq = 0;
-  mips_receive_seq = 0;
-
-  if (mips_monitor != MON_IDT)
-    mips_send_command ("debug\r", 0);
-  else				/* Assume IDT monitor by default.  */
-    mips_send_command ("db tty0\r", 0);
-
-  gdb_usleep (1000000);
-  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
-     whilst looking for the SYN, however this avoids the "garbage"
-     being displayed to the user.  */
-  if (mips_monitor != MON_IDT)
-    mips_expect ("\r");
-
-  {
-    char buff[DATA_MAXLEN + 1];
-
-    if (mips_receive_packet (buff, 1, 3) < 0)
-      mips_error (_("Failed to initialize (didn't receive packet)."));
-  }
-}
-
-/* Exit remote (dbx) debug mode, returning to the monitor prompt: */
-
-static int
-mips_exit_debug (void)
-{
-  int err;
-  struct cleanup *old_cleanups = make_cleanup (mips_exit_cleanups, NULL);
-
-  mips_exiting = 1;
-
-  if (mips_monitor != MON_IDT && mips_monitor != MON_ROCKHOPPER)
-    {
-      /* The DDB (NEC) and MiniRISC (LSI) versions of PMON exit immediately,
-         so we do not get a reply to this command: */
-      mips_request ('x', 0, 0, NULL, mips_receive_wait, NULL);
-      mips_need_reply = 0;
-      if (!mips_expect (" break!"))
-	{
-	  do_cleanups (old_cleanups);
-	  return -1;
-	}
-    }
-  else
-    mips_request ('x', 0, 0, &err, mips_receive_wait, NULL);
-
-  if (!mips_expect (mips_monitor_prompt))
-    {
-      do_cleanups (old_cleanups);
-      return -1;
-    }
-
-  do_cleanups (old_cleanups);
-
-  return 0;
-}
-
-/* Initialize a new connection to the MIPS board, and make sure we are
-   really connected.  */
-
-static void
-mips_initialize (void)
-{
-  int err;
-  struct cleanup *old_cleanups;
-  int j;
-
-  /* What is this code doing here?  I don't see any way it can happen, and
-     it might mean mips_initializing didn't get cleared properly.
-     So I'll make it a warning.  */
-
-  if (mips_initializing)
-    {
-      warning (_("internal error: mips_initialize called twice"));
-      return;
-    }
-
-  old_cleanups = make_cleanup (mips_initialize_cleanups, NULL);
-
-  mips_wait_flag = 0;
-  mips_initializing = 1;
-
-  /* At this point, the packit protocol isn't responding.  We'll try getting
-     into the monitor, and restarting the protocol.  */
-
-  /* Force the system into the monitor.  After this we *should* be at
-     the mips_monitor_prompt.  */
-  if (mips_monitor != MON_IDT)
-    j = 0;			/* Start by checking if we are already
-				   at the prompt.  */
-  else
-    j = 1;			/* Start by sending a break.  */
-  for (; j <= 4; j++)
-    {
-      switch (j)
-	{
-	case 0:		/* First, try sending a CR.  */
-	  serial_flush_input (mips_desc);
-	  serial_write (mips_desc, "\r", 1);
-	  break;
-	case 1:		/* First, try sending a break.  */
-	  serial_send_break (mips_desc);
-	  break;
-	case 2:		/* Then, try a ^C.  */
-	  serial_write (mips_desc, "\003", 1);
-	  break;
-	case 3:		/* Then, try escaping from download.  */
-	  {
-	    if (mips_monitor != MON_IDT)
-	      {
-		char tbuff[7];
-
-		/* We shouldn't need to send multiple termination
-		   sequences, since the target performs line (or
-		   block) reads, and then processes those
-		   packets.  In-case we were downloading a large packet
-		   we flush the output buffer before inserting a
-		   termination sequence.  */
-		serial_flush_output (mips_desc);
-		sprintf (tbuff, "\r/E/E\r");
-		serial_write (mips_desc, tbuff, 6);
-	      }
-	    else
-	      {
-		char srec[10];
-		int i;
-
-		/* We are possibly in binary download mode, having
-		   aborted in the middle of an S-record.  ^C won't
-		   work because of binary mode.  The only reliable way
-		   out is to send enough termination packets (8 bytes)
-		   to fill up and then overflow the largest size
-		   S-record (255 bytes in this case).  This amounts to
-		   256/8 + 1 packets.  */
-
-		mips_make_srec (srec, '7', 0, NULL, 0);
-
-		for (i = 1; i <= 33; i++)
-		  {
-		    serial_write (mips_desc, srec, 8);
-
-		    if (serial_readchar (mips_desc, 0) >= 0)
-		      break;	/* Break immediatly if we get something from
-				   the board.  */
-		  }
-	      }
-	  }
-	  break;
-	case 4:
-	  mips_error (_("Failed to initialize."));
-	}
-
-      if (mips_expect (mips_monitor_prompt))
-	break;
-    }
-
-  if (mips_monitor != MON_IDT)
-    {
-      /* Sometimes PMON ignores the first few characters in the first
-         command sent after a load.  Sending a blank command gets
-         around that.  */
-      mips_send_command ("\r", -1);
-
-      /* Ensure the correct target state: */
-      if (mips_monitor != MON_LSI)
-	mips_send_command ("set regsize 64\r", -1);
-      mips_send_command ("set hostport tty0\r", -1);
-      mips_send_command ("set brkcmd \"\"\r", -1);
-      /* Delete all the current breakpoints: */
-      mips_send_command ("db *\r", -1);
-      /* NOTE: PMON does not have breakpoint support through the
-         "debug" mode, only at the monitor command-line.  */
-    }
-
-  mips_enter_debug ();
-
-  /* Clear all breakpoints: */
-  if ((mips_monitor == MON_IDT
-       && mips_clear_breakpoint (-1, 0, BREAK_UNUSED) == 0)
-      || mips_monitor == MON_LSI)
-    monitor_supports_breakpoints = 1;
-  else
-    monitor_supports_breakpoints = 0;
-
-  do_cleanups (old_cleanups);
-
-  /* If this doesn't call error, we have connected; we don't care if
-     the request itself succeeds or fails.  */
-
-  mips_request ('r', 0, 0, &err, mips_receive_wait, NULL);
-}
-
-/* Open a connection to the remote board.  */
-
-static void
-common_open (struct target_ops *ops, const char *name, int from_tty,
-	     enum mips_monitor_type new_monitor,
-	     const char *new_monitor_prompt)
-{
-  char *serial_port_name;
-  char *remote_name = 0;
-  char *local_name = 0;
-  char **argv;
-  struct cleanup *cleanup;
-
-  if (name == 0)
-    error (_("\
-To open a MIPS remote debugging connection, you need to specify what\n\
-serial device is attached to the target board (e.g., /dev/ttya).\n\
-If you want to use TFTP to download to the board, specify the name of a\n\
-temporary file to be used by GDB for downloads as the second argument.\n\
-This filename must be in the form host:filename, where host is the name\n\
-of the host running the TFTP server, and the file must be readable by the\n\
-world.  If the local name of the temporary file differs from the name as\n\
-seen from the board via TFTP, specify that name as the third parameter.\n"));
-
-  /* Parse the serial port name, the optional TFTP name, and the
-     optional local TFTP name.  */
-  argv = gdb_buildargv (name);
-  cleanup = make_cleanup_freeargv (argv);
-
-  serial_port_name = xstrdup (argv[0]);
-  if (argv[1])			/* Remote TFTP name specified?  */
-    {
-      remote_name = argv[1];
-      if (argv[2])		/* Local TFTP filename specified?  */
-	local_name = argv[2];
-    }
-
-  target_preopen (from_tty);
-
-  if (mips_is_open)
-    unpush_target (current_ops);
-
-  /* Open and initialize the serial port.  */
-  mips_desc = serial_open (serial_port_name);
-  if (mips_desc == NULL)
-    perror_with_name (serial_port_name);
-
-  if (baud_rate != -1)
-    {
-      if (serial_setbaudrate (mips_desc, baud_rate))
-	{
-	  serial_close (mips_desc);
-	  perror_with_name (serial_port_name);
-	}
-    }
-
-  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
-     hostname:filename, assume it's the TFTP filename that must be
-     passed to the DDB board to tell it where to get the load file.  */
-  if (remote_name)
-    {
-      if (strchr (remote_name, '#'))
-	{
-	  udp_desc = serial_open (remote_name);
-	  if (!udp_desc)
-	    perror_with_name (_("Unable to open UDP port"));
-	  udp_in_use = 1;
-	}
-      else
-	{
-	  /* Save the remote and local names of the TFTP temp file.  If
-	     the user didn't specify a local name, assume it's the same
-	     as the part of the remote name after the "host:".  */
-	  if (tftp_name)
-	    xfree (tftp_name);
-	  if (tftp_localname)
-	    xfree (tftp_localname);
-	  if (local_name == NULL)
-	    if ((local_name = strchr (remote_name, ':')) != NULL)
-	      local_name++;	/* Skip over the colon.  */
-	  if (local_name == NULL)
-	    local_name = remote_name;	/* Local name same as remote name.  */
-	  tftp_name = xstrdup (remote_name);
-	  tftp_localname = xstrdup (local_name);
-	  tftp_in_use = 1;
-	}
-    }
-
-  current_ops = ops;
-  mips_is_open = 1;
-
-  /* Reset the expected monitor prompt if it's never been set before.  */
-  if (mips_monitor_prompt == NULL)
-    mips_monitor_prompt = xstrdup (new_monitor_prompt);
-  mips_monitor = new_monitor;
-
-  mips_initialize ();
-
-  if (from_tty)
-    printf_unfiltered ("Remote MIPS debugging using %s\n", serial_port_name);
-
-  /* Switch to using remote target now.  */
-  push_target (ops);
-
-  inferior_ptid = remote_mips_ptid;
-  inferior_appeared (current_inferior (), ptid_get_pid (inferior_ptid));
-  add_thread_silent (inferior_ptid);
-
-  /* Try to figure out the processor model if possible.  */
-  deprecated_mips_set_processor_regs_hack ();
-
-  /* This is really the job of start_remote however, that makes an
-     assumption that the target is about to print out a status message
-     of some sort.  That doesn't happen here (in fact, it may not be
-     possible to get the monitor to send the appropriate packet).  */
-
-  reinit_frame_cache ();
-  registers_changed ();
-  stop_pc = regcache_read_pc (get_current_regcache ());
-  print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC, 1);
-  xfree (serial_port_name);
-
-  do_cleanups (cleanup);
-}
-
-/* Open a connection to an IDT board.  */
-
-static void
-mips_open (const char *name, int from_tty)
-{
-  const char *monitor_prompt = NULL;
-  if (gdbarch_bfd_arch_info (target_gdbarch ()) != NULL
-      && gdbarch_bfd_arch_info (target_gdbarch ())->arch == bfd_arch_mips)
-    {
-    switch (gdbarch_bfd_arch_info (target_gdbarch ())->mach)
-      {
-      case bfd_mach_mips4100:
-      case bfd_mach_mips4300:
-      case bfd_mach_mips4600:
-      case bfd_mach_mips4650:
-      case bfd_mach_mips5000:
-	monitor_prompt = "<RISQ> ";
-	break;
-      }
-    }
-  if (monitor_prompt == NULL)
-    monitor_prompt = "<IDT>";
-  common_open (&mips_ops, name, from_tty, MON_IDT, monitor_prompt);
-}
-
-/* Open a connection to a PMON board.  */
-
-static void
-pmon_open (const char *name, int from_tty)
-{
-  common_open (&pmon_ops, name, from_tty, MON_PMON, "PMON> ");
-}
-
-/* Open a connection to a DDB board.  */
-
-static void
-ddb_open (const char *name, int from_tty)
-{
-  common_open (&ddb_ops, name, from_tty, MON_DDB, "NEC010>");
-}
-
-/* Open a connection to a rockhopper board.  */
-
-static void
-rockhopper_open (const char *name, int from_tty)
-{
-  common_open (&rockhopper_ops, name, from_tty, MON_ROCKHOPPER, "NEC01>");
-}
-
-/* Open a connection to an LSI board.  */
-
-static void
-lsi_open (const char *name, int from_tty)
-{
-  int i;
-
-  /* Clear the LSI breakpoint table.  */
-  for (i = 0; i < MAX_LSI_BREAKPOINTS; i++)
-    lsi_breakpoints[i].type = BREAK_UNUSED;
-
-  common_open (&lsi_ops, name, from_tty, MON_LSI, "PMON> ");
-}
-
-/* Close a connection to the remote board.  */
-
-static void
-mips_close (struct target_ops *self)
-{
-  if (mips_is_open)
-    {
-      /* Get the board out of remote debugging mode.  */
-      (void) mips_exit_debug ();
-
-      close_ports ();
-    }
-
-  generic_mourn_inferior ();
-}
-
-/* Detach from the remote board.  */
-
-static void
-mips_detach (struct target_ops *ops, const char *args, int from_tty)
-{
-  if (args)
-    error (_("Argument given to \"detach\" when remotely debugging."));
-
-  unpush_target (ops);
-
-  if (from_tty)
-    printf_unfiltered ("Ending remote MIPS debugging.\n");
-}
-
-/* Tell the target board to resume.  This does not wait for a reply
-   from the board, except in the case of single-stepping on LSI boards,
-   where PMON does return a reply.  */
-
-static void
-mips_resume (struct target_ops *ops,
-	     ptid_t ptid, int step, enum gdb_signal siggnal)
-{
-  int err;
-
-  /* LSI PMON requires returns a reply packet "0x1 s 0x0 0x57f" after
-     a single step, so we wait for that.  */
-  mips_request (step ? 's' : 'c', 1, siggnal,
-		mips_monitor == MON_LSI && step ? &err : (int *) NULL,
-		mips_receive_wait, NULL);
-}
-
-/* Return the signal corresponding to SIG, where SIG is the number which
-   the MIPS protocol uses for the signal.  */
-
-static enum gdb_signal
-mips_signal_from_protocol (int sig)
-{
-  /* We allow a few more signals than the IDT board actually returns, on
-     the theory that there is at least *some* hope that perhaps the numbering
-     for these signals is widely agreed upon.  */
-  if (sig <= 0
-      || sig > 31)
-    return GDB_SIGNAL_UNKNOWN;
-
-  /* Don't want to use gdb_signal_from_host because we are converting
-     from MIPS signal numbers, not host ones.  Our internal numbers
-     match the MIPS numbers for the signals the board can return, which
-     are: SIGINT, SIGSEGV, SIGBUS, SIGILL, SIGFPE, SIGTRAP.  */
-  return (enum gdb_signal) sig;
-}
-
-/* Set the register designated by REGNO to the value designated by VALUE.  */
-
-static void
-mips_set_register (int regno, ULONGEST value)
-{
-  gdb_byte buf[MAX_REGISTER_SIZE];
-  struct regcache *regcache = get_current_regcache ();
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-
-  /* We got the number the register holds, but gdb expects to see a
-     value in the target byte ordering.  */
-
-  if (mips_monitor != MON_ROCKHOPPER
-      && (regno == mips_regnum (gdbarch)->pc || regno < 32))
-    /* Some 64-bit boards have monitors that only send the bottom 32 bits.
-       In such cases we can only really debug 32-bit code properly so,
-       when reading a GPR or the PC, assume that the full 64-bit
-       value is the sign extension of the lower 32 bits.  */
-    store_signed_integer (buf, register_size (gdbarch, regno), byte_order,
-                          value);
-  else
-    store_unsigned_integer (buf, register_size (gdbarch, regno), byte_order,
-                            value);
-
-  regcache_raw_supply (regcache, regno, buf);
-}
-
-/* Wait until the remote stops, and return a wait status.  */
-
-static ptid_t
-mips_wait (struct target_ops *ops,
-	   ptid_t ptid, struct target_waitstatus *status, int options)
-{
-  int rstatus;
-  int err;
-  char buff[DATA_MAXLEN];
-  ULONGEST rpc, rfp, rsp;
-  char pc_string[17], fp_string[17], sp_string[17], flags[20];
-  int nfields;
-
-  interrupt_count = 0;
-  hit_watchpoint = 0;
-
-  /* If we have not sent a single step or continue command, then the
-     board is waiting for us to do something.  Return a status
-     indicating that it is stopped.  */
-  if (!mips_need_reply)
-    {
-      status->kind = TARGET_WAITKIND_STOPPED;
-      status->value.sig = GDB_SIGNAL_TRAP;
-      return inferior_ptid;
-    }
-
-  /* No timeout; we sit here as long as the program continues to execute.  */
-  mips_wait_flag = 1;
-  rstatus = mips_request ('\000', 0, 0, &err, -1, buff);
-  mips_wait_flag = 0;
-  if (err)
-    mips_error (_("Remote failure: %s"), safe_strerror (errno));
-
-  /* On returning from a continue, the PMON monitor seems to start
-     echoing back the messages we send prior to sending back the
-     ACK.  The code can cope with this, but to try and avoid the
-     unnecessary serial traffic, and "spurious" characters displayed
-     to the user, we cheat and reset the debug protocol.  The problems
-     seems to be caused by a check on the number of arguments, and the
-     command length, within the monitor causing it to echo the command
-     as a bad packet.  */
-  if (mips_monitor == MON_PMON)
-    {
-      mips_exit_debug ();
-      mips_enter_debug ();
-    }
-
-  /* See if we got back extended status.  If so, pick out the pc, fp,
-     sp, etc...  */
-
-  nfields = sscanf (buff,
-		    "0x%*x %*c 0x%*x 0x%*x 0x%16s 0x%16s 0x%16s 0x%*x %s",
-		    pc_string, fp_string, sp_string, flags);
-  if (nfields >= 3
-      && read_hex_value (pc_string, &rpc)
-      && read_hex_value (fp_string, &rfp)
-      && read_hex_value (sp_string, &rsp))
-    {
-      struct regcache *regcache = get_current_regcache ();
-      struct gdbarch *gdbarch = get_regcache_arch (regcache);
-
-      mips_set_register (gdbarch_pc_regnum (gdbarch), rpc);
-      mips_set_register (30, rfp);
-      mips_set_register (gdbarch_sp_regnum (gdbarch), rsp);
-
-      if (nfields == 9)
-	{
-	  int i;
-
-	  for (i = 0; i <= 2; i++)
-	    if (flags[i] == 'r' || flags[i] == 'w')
-	      hit_watchpoint = 1;
-	    else if (flags[i] == '\000')
-	      break;
-	}
-    }
-
-  if (strcmp (target_shortname, "lsi") == 0)
-    {
-#if 0
-      /* If this is an LSI PMON target, see if we just hit a
-         hardrdware watchpoint.  Right now, PMON doesn't give us
-         enough information to determine which breakpoint we hit.  So
-         we have to look up the PC in our own table of breakpoints,
-         and if found, assume it's just a normal instruction fetch
-         breakpoint, not a data watchpoint.  FIXME when PMON provides
-         some way to tell us what type of breakpoint it is.  */
-      int i;
-      CORE_ADDR pc = regcache_read_pc (get_current_regcache ());
-
-      hit_watchpoint = 1;
-      for (i = 0; i < MAX_LSI_BREAKPOINTS; i++)
-	{
-	  if (lsi_breakpoints[i].addr == pc
-	      && lsi_breakpoints[i].type == BREAK_FETCH)
-	    {
-	      hit_watchpoint = 0;
-	      break;
-	    }
-	}
-#else
-      /* If a data breakpoint was hit, PMON returns the following packet:
-         0x1 c 0x0 0x57f 0x1
-         The return packet from an ordinary breakpoint doesn't have the
-         extra 0x01 field tacked onto the end.  */
-      if (nfields == 1 && rpc == 1)
-	hit_watchpoint = 1;
-#endif
-    }
-
-  /* NOTE: The following (sig) numbers are defined by PMON:
-     SPP_SIGTRAP     5       breakpoint
-     SPP_SIGINT      2
-     SPP_SIGSEGV     11
-     SPP_SIGBUS      10
-     SPP_SIGILL      4
-     SPP_SIGFPE      8
-     SPP_SIGTERM     15 */
-
-  /* Translate a MIPS waitstatus.  We use constants here rather than WTERMSIG
-     and so on, because the constants we want here are determined by the
-     MIPS protocol and have nothing to do with what host we are running on.  */
-  if ((rstatus & 0xff) == 0)
-    {
-      status->kind = TARGET_WAITKIND_EXITED;
-      status->value.integer = (((rstatus) >> 8) & 0xff);
-    }
-  else if ((rstatus & 0xff) == 0x7f)
-    {
-      status->kind = TARGET_WAITKIND_STOPPED;
-      status->value.sig = mips_signal_from_protocol (((rstatus) >> 8) & 0xff);
-
-      /* If the stop PC is in the _exit function, assume
-         we hit the 'break 0x3ff' instruction in _exit, so this
-         is not a normal breakpoint.  */
-      if (strcmp (target_shortname, "lsi") == 0)
-	{
-	  const char *func_name;
-	  CORE_ADDR func_start;
-	  CORE_ADDR pc = regcache_read_pc (get_current_regcache ());
-
-	  find_pc_partial_function (pc, &func_name, &func_start, NULL);
-	  if (func_name != NULL && strcmp (func_name, "_exit") == 0
-	      && func_start == pc)
-	    status->kind = TARGET_WAITKIND_EXITED;
-	}
-    }
-  else
-    {
-      status->kind = TARGET_WAITKIND_SIGNALLED;
-      status->value.sig = mips_signal_from_protocol (rstatus & 0x7f);
-    }
-
-  return inferior_ptid;
-}
-
-/* We have to map between the register numbers used by gdb and the
-   register numbers used by the debugging protocol.  */
-
-#define REGNO_OFFSET 96
-
-static int
-mips_map_regno (struct gdbarch *gdbarch, int regno)
-{
-  if (regno < 32)
-    return regno;
-  if (regno >= mips_regnum (gdbarch)->fp0
-      && regno < mips_regnum (gdbarch)->fp0 + 32)
-    return regno - mips_regnum (gdbarch)->fp0 + 32;
-  else if (regno == mips_regnum (gdbarch)->pc)
-    return REGNO_OFFSET + 0;
-  else if (regno == mips_regnum (gdbarch)->cause)
-    return REGNO_OFFSET + 1;
-  else if (regno == mips_regnum (gdbarch)->hi)
-    return REGNO_OFFSET + 2;
-  else if (regno == mips_regnum (gdbarch)->lo)
-    return REGNO_OFFSET + 3;
-  else if (regno == mips_regnum (gdbarch)->fp_control_status)
-    return REGNO_OFFSET + 4;
-  else if (regno == mips_regnum (gdbarch)->fp_implementation_revision)
-    return REGNO_OFFSET + 5;
-  else
-    /* FIXME: Is there a way to get the status register?  */
-    return 0;
-}
-
-/* Fetch the remote registers.  */
-
-static void
-mips_fetch_registers (struct target_ops *ops,
-		      struct regcache *regcache, int regno)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  ULONGEST val;
-  int err;
-
-  if (regno == -1)
-    {
-      for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
-	mips_fetch_registers (ops, regcache, regno);
-      return;
-    }
-
-  if (regno == gdbarch_deprecated_fp_regnum (gdbarch)
-      || regno == MIPS_ZERO_REGNUM)
-    /* gdbarch_deprecated_fp_regnum on the mips is a hack which is just
-       supposed to read zero (see also mips-nat.c).  */
-    val = 0;
-  else
-    {
-      /* If PMON doesn't support this register, don't waste serial
-         bandwidth trying to read it.  */
-      int pmon_reg = mips_map_regno (gdbarch, regno);
-
-      if (regno != 0 && pmon_reg == 0)
-	val = 0;
-      else
-	{
-	  /* Unfortunately the PMON version in the Vr4300 board has been
-	     compiled without the 64bit register access commands.  This
-	     means we cannot get hold of the full register width.  */
-	  if (mips_monitor == MON_DDB || mips_monitor == MON_ROCKHOPPER)
-	    val = mips_request ('t', pmon_reg, 0,
-				&err, mips_receive_wait, NULL);
-	  else
-	    val = mips_request ('r', pmon_reg, 0,
-				&err, mips_receive_wait, NULL);
-	  if (err)
-	    mips_error (_("Can't read register %d: %s"), regno,
-			safe_strerror (errno));
-	}
-    }
-
-  mips_set_register (regno, val);
-}
-
-/* Prepare to store registers.  The MIPS protocol can store individual
-   registers, so this function doesn't have to do anything.  */
-
-static void
-mips_prepare_to_store (struct target_ops *self, struct regcache *regcache)
-{
-}
-
-/* Store remote register(s).  */
-
-static void
-mips_store_registers (struct target_ops *ops,
-		      struct regcache *regcache, int regno)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  ULONGEST val;
-  int err;
-
-  if (regno == -1)
-    {
-      for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
-	mips_store_registers (ops, regcache, regno);
-      return;
-    }
-
-  regcache_cooked_read_unsigned (regcache, regno, &val);
-  mips_request (mips_monitor == MON_ROCKHOPPER ? 'T' : 'R',
-  		mips_map_regno (gdbarch, regno),
-		val,
-		&err, mips_receive_wait, NULL);
-  if (err)
-    mips_error (_("Can't write register %d: %s"), regno,
-                safe_strerror (errno));
-}
-
-/* Fetch a word from the target board.  Return word fetched in location
-   addressed by VALP.  Return 0 when successful; return positive error
-   code when not.  */
-
-static int
-mips_fetch_word (CORE_ADDR addr, unsigned int *valp)
-{
-  int err;
-
-  *valp = mips_request ('d', addr, 0, &err, mips_receive_wait, NULL);
-  if (err)
-    {
-      /* Data space failed; try instruction space.  */
-      *valp = mips_request ('i', addr, 0, &err,
-			    mips_receive_wait, NULL);
-    }
-  return err;
-}
-
-/* Store a word to the target board.  Returns errno code or zero for
-   success.  If OLD_CONTENTS is non-NULL, put the old contents of that
-   memory location there.  */
-
-/* FIXME! make sure only 32-bit quantities get stored!  */
-static int
-mips_store_word (CORE_ADDR addr, unsigned int val, int *old_contents)
-{
-  int err;
-  unsigned int oldcontents;
-
-  oldcontents = mips_request ('D', addr, val, &err,
-			      mips_receive_wait, NULL);
-  if (err)
-    {
-      /* Data space failed; try instruction space.  */
-      oldcontents = mips_request ('I', addr, val, &err,
-				  mips_receive_wait, NULL);
-      if (err)
-	return errno;
-    }
-  if (old_contents != NULL)
-    *old_contents = oldcontents;
-  return 0;
-}
-
-/* Helper for mips_xfer_partial that handles memory transfers.
-   Arguments are like target_xfer_partial.  Note that the protocol
-   gives us the correct value for a longword, since it transfers
-   values in ASCII.  We want the byte values, so we have to swap the
-   longword values.  */
-
-static int mask_address_p = 1;
-
-static enum target_xfer_status
-mips_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
-		  ULONGEST memaddr, ULONGEST len, ULONGEST *xfered_len)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
-  int i;
-  CORE_ADDR addr;
-  int count;
-  gdb_byte *buffer;
-  int status;
-
-  /* PMON targets do not cope well with 64 bit addresses.  Mask the
-     value down to 32 bits.  */
-  if (mask_address_p)
-    memaddr &= (CORE_ADDR) 0xffffffff;
-
-  /* Round starting address down to longword boundary.  */
-  addr = memaddr & ~3;
-  /* Round ending address up; get number of longwords that makes.  */
-  count = (((memaddr + len) - addr) + 3) / 4;
-  /* Allocate buffer of that many longwords.  */
-  buffer = (gdb_byte *) alloca (count * 4);
-
-  if (writebuf != NULL)
-    {
-      /* Fill start and end extra bytes of buffer with existing data.  */
-      if (addr != memaddr || len < 4)
-	{
-	  unsigned int val;
-
-	  if (mips_fetch_word (addr, &val))
-	    return TARGET_XFER_E_IO;
-
-	  /* Need part of initial word -- fetch it.  */
-	  store_unsigned_integer (&buffer[0], 4, byte_order, val);
-	}
-
-      if (count > 1)
-	{
-	  unsigned int val;
-
-	  /* Need part of last word -- fetch it.  FIXME: we do this even
-	     if we don't need it.  */
-	  if (mips_fetch_word (addr + (count - 1) * 4, &val))
-	    return TARGET_XFER_E_IO;
-
-	  store_unsigned_integer (&buffer[(count - 1) * 4],
-				  4, byte_order, val);
-	}
-
-      /* Copy data to be written over corresponding part of buffer.  */
-
-      memcpy ((char *) buffer + (memaddr & 3), writebuf, len);
-
-      /* Write the entire buffer.  */
-
-      for (i = 0; i < count; i++, addr += 4)
-	{
-	  int word;
-
-	  word = extract_unsigned_integer (&buffer[i * 4], 4, byte_order);
-	  status = mips_store_word (addr, word, NULL);
-	  /* Report each kilobyte (we download 32-bit words at a time).  */
-	  if (i % 256 == 255)
-	    {
-	      printf_unfiltered ("*");
-	      gdb_flush (gdb_stdout);
-	    }
-	  if (status)
-	    return TARGET_XFER_E_IO;
-	  /* FIXME: Do we want a QUIT here?  */
-	}
-      if (count >= 256)
-	printf_unfiltered ("\n");
-    }
-  else
-    {
-      /* Read all the longwords.  */
-      for (i = 0; i < count; i++, addr += 4)
-	{
-	  unsigned int val;
-
-	  if (mips_fetch_word (addr, &val))
-	    return TARGET_XFER_E_IO;
-
-	  store_unsigned_integer (&buffer[i * 4], 4, byte_order, val);
-	  QUIT;
-	}
-
-      /* Copy appropriate bytes out of the buffer.  */
-      memcpy (readbuf, buffer + (memaddr & 3), len);
-    }
-  *xfered_len = len;
-  return TARGET_XFER_OK;
-}
-
-/* Target to_xfer_partial implementation.  */
-
-static enum target_xfer_status
-mips_xfer_partial (struct target_ops *ops, enum target_object object,
-		   const char *annex, gdb_byte *readbuf,
-		   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
-		   ULONGEST *xfered_len)
-{
-  switch (object)
-    {
-    case TARGET_OBJECT_MEMORY:
-      return mips_xfer_memory (readbuf, writebuf, offset, len, xfered_len);
-
-    default:
-      return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
-					    readbuf, writebuf, offset, len,
-					    xfered_len);
-    }
-}
-
-/* Print info on this target.  */
-
-static void
-mips_files_info (struct target_ops *ignore)
-{
-  printf_unfiltered ("Debugging a MIPS board over a serial line.\n");
-}
-
-/* Kill the process running on the board.  This will actually only
-   work if we are doing remote debugging over the console input.  I
-   think that if IDT/sim had the remote debug interrupt enabled on the
-   right port, we could interrupt the process with a break signal.  */
-
-static void
-mips_kill (struct target_ops *ops)
-{
-  if (!mips_wait_flag)
-    {
-      target_mourn_inferior ();
-      return;
-    }
-
-  interrupt_count++;
-
-  if (interrupt_count >= 2)
-    {
-      interrupt_count = 0;
-
-      target_terminal_ours ();
-
-      if (query (_("Interrupted while waiting for the program.\n\
-Give up (and stop debugging it)? ")))
-	{
-	  /* Clean up in such a way that mips_close won't try to talk
-	     to the board (it almost surely won't work since we
-	     weren't able to talk to it).  */
-	  mips_wait_flag = 0;
-	  close_ports ();
-
-	  printf_unfiltered ("Ending remote MIPS debugging.\n");
-	  target_mourn_inferior ();
-	  quit ();
-	}
-
-      target_terminal_inferior ();
-    }
-
-  if (remote_debug > 0)
-    printf_unfiltered ("Sending break\n");
-
-  serial_send_break (mips_desc);
-
-  target_mourn_inferior ();
-
-#if 0
-  if (mips_is_open)
-    {
-      char cc;
-
-      /* Send a ^C.  */
-      cc = '\003';
-      serial_write (mips_desc, &cc, 1);
-      sleep (1);
-      target_mourn_inferior ();
-    }
-#endif
-}
-
-/* Start running on the target board.  */
-
-static void
-mips_create_inferior (struct target_ops *ops, char *execfile,
-		      char *args, char **env, int from_tty)
-{
-  CORE_ADDR entry_pt;
-
-  if (args && *args)
-    {
-      warning (_("\
-Can't pass arguments to remote MIPS board; arguments ignored."));
-      /* And don't try to use them on the next "run" command.  */
-      execute_command ("set args", 0);
-    }
-
-  if (execfile == 0 || exec_bfd == 0)
-    error (_("No executable file specified"));
-
-  entry_pt = (CORE_ADDR) bfd_get_start_address (exec_bfd);
-
-  init_wait_for_inferior ();
-
-  regcache_write_pc (get_current_regcache (), entry_pt);
-}
-
-/* Clean up after a process. The bulk of the work is done in mips_close(),
-   which is called when unpushing the target.  */
-
-static void
-mips_mourn_inferior (struct target_ops *ops)
-{
-  if (current_ops != NULL)
-    unpush_target (current_ops);
-}
-
-/* We can write a breakpoint and read the shadow contents in one
-   operation.  */
-
-/* Insert a breakpoint.  On targets that don't have built-in
-   breakpoint support, we read the contents of the target location and
-   stash it, then overwrite it with a breakpoint instruction.  ADDR is
-   the target location in the target machine.  BPT is the breakpoint
-   being inserted or removed, which contains memory for saving the
-   target contents.  */
-
-static int
-mips_insert_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
-			struct bp_target_info *bp_tgt)
-{
-  if (monitor_supports_breakpoints)
-    {
-      bp_tgt->placed_address = bp_tgt->reqstd_address;
-      return mips_set_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
-				  BREAK_FETCH);
-    }
-  else
-    return memory_insert_breakpoint (ops, gdbarch, bp_tgt);
-}
-
-/* Remove a breakpoint.  */
-
-static int
-mips_remove_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
-			struct bp_target_info *bp_tgt)
-{
-  if (monitor_supports_breakpoints)
-    return mips_clear_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
-				  BREAK_FETCH);
-  else
-    return memory_remove_breakpoint (ops, gdbarch, bp_tgt);
-}
-
-/* Tell whether this target can support a hardware breakpoint.  CNT
-   is the number of hardware breakpoints already installed.  This
-   implements the target_can_use_hardware_watchpoint macro.  */
-
-static int
-mips_can_use_watchpoint (struct target_ops *self,
-			 enum bptype type, int cnt, int othertype)
-{
-  return cnt < MAX_LSI_BREAKPOINTS && strcmp (target_shortname, "lsi") == 0;
-}
-
-
-/* Compute a don't care mask for the region bounding ADDR and ADDR + LEN - 1.
-   This is used for memory ref breakpoints.  */
-
-static unsigned long
-calculate_mask (CORE_ADDR addr, int len)
-{
-  unsigned long mask;
-  int i;
-
-  mask = addr ^ (addr + len - 1);
-
-  for (i = 32; i >= 0; i--)
-    if (mask == 0)
-      break;
-    else
-      mask >>= 1;
-
-  mask = (unsigned long) 0xffffffff >> i;
-
-  return mask;
-}
-
-
-/* Set a data watchpoint.  ADDR and LEN should be obvious.  TYPE is 0
-   for a write watchpoint, 1 for a read watchpoint, or 2 for a read/write
-   watchpoint.  */
-
-static int
-mips_insert_watchpoint (struct target_ops *self,
-			CORE_ADDR addr, int len, enum target_hw_bp_type type,
-			struct expression *cond)
-{
-  /* These enum types are compatible by design.  */
-  enum break_type btype = (enum break_type) type;
-
-  if (mips_set_breakpoint (addr, len, btype))
-    return -1;
-
-  return 0;
-}
-
-/* Remove a watchpoint.  */
-
-static int
-mips_remove_watchpoint (struct target_ops *self,
-			CORE_ADDR addr, int len, enum target_hw_bp_type type,
-			struct expression *cond)
-{
-  /* These enum types are compatible by design.  */
-  enum break_type btype = (enum break_type) type;
-
-  if (mips_clear_breakpoint (addr, len, btype))
-    return -1;
-
-  return 0;
-}
-
-/* Test to see if a watchpoint has been hit.  Return 1 if so; return 0,
-   if not.  */
-
-static int
-mips_stopped_by_watchpoint (struct target_ops *ops)
-{
-  return hit_watchpoint;
-}
-
-
-/* Insert a breakpoint.  */
-
-static int
-mips_set_breakpoint (CORE_ADDR addr, int len, enum break_type type)
-{
-  return mips_common_breakpoint (1, addr, len, type);
-}
-
-
-/* Clear a breakpoint.  */
-
-static int
-mips_clear_breakpoint (CORE_ADDR addr, int len, enum break_type type)
-{
-  return mips_common_breakpoint (0, addr, len, type);
-}
-
-
-/* Check the error code from the return packet for an LSI breakpoint
-   command.  If there's no error, just return 0.  If it's a warning,
-   print the warning text and return 0.  If it's an error, print
-   the error text and return 1.  <ADDR> is the address of the breakpoint
-   that was being set.  <RERRFLG> is the error code returned by PMON.
-   This is a helper function for mips_common_breakpoint.  */
-
-static int
-mips_check_lsi_error (CORE_ADDR addr, int rerrflg)
-{
-  struct lsi_error *err;
-  const char *saddr = paddress (target_gdbarch (), addr);
-
-  if (rerrflg == 0)		/* no error */
-    return 0;
-
-  /* Warnings can be ORed together, so check them all.  */
-  if (rerrflg & W_WARN)
-    {
-      if (monitor_warnings)
-	{
-	  int found = 0;
-
-	  for (err = lsi_warning_table; err->code != 0; err++)
-	    {
-	      if ((err->code & rerrflg) == err->code)
-		{
-		  found = 1;
-		  fprintf_unfiltered (gdb_stderr, "\
-mips_common_breakpoint (%s): Warning: %s\n",
-				      saddr,
-				      err->string);
-		}
-	    }
-	  if (!found)
-	    fprintf_unfiltered (gdb_stderr, "\
-mips_common_breakpoint (%s): Unknown warning: 0x%x\n",
-				saddr,
-				rerrflg);
-	}
-      return 0;
-    }
-
-  /* Errors are unique, i.e. can't be ORed together.  */
-  for (err = lsi_error_table; err->code != 0; err++)
-    {
-      if ((err->code & rerrflg) == err->code)
-	{
-	  fprintf_unfiltered (gdb_stderr, "\
-mips_common_breakpoint (%s): Error: %s\n",
-			      saddr,
-			      err->string);
-	  return 1;
-	}
-    }
-  fprintf_unfiltered (gdb_stderr, "\
-mips_common_breakpoint (%s): Unknown error: 0x%x\n",
-		      saddr,
-		      rerrflg);
-  return 1;
-}
-
-
-/* This routine sends a breakpoint command to the remote target.
-
-   <SET> is 1 if setting a breakpoint, or 0 if clearing a breakpoint.
-   <ADDR> is the address of the breakpoint.
-   <LEN> the length of the region to break on.
-   <TYPE> is the type of breakpoint:
-   0 = write                    (BREAK_WRITE)
-   1 = read                     (BREAK_READ)
-   2 = read/write               (BREAK_ACCESS)
-   3 = instruction fetch        (BREAK_FETCH)
-
-   Return 0 if successful; otherwise 1.  */
-
-static int
-mips_common_breakpoint (int set, CORE_ADDR addr, int len, enum break_type type)
-{
-  int addr_size = gdbarch_addr_bit (target_gdbarch ()) / 8;
-  char buf[DATA_MAXLEN + 1];
-  char cmd, rcmd;
-  int rpid, rerrflg, rresponse, rlen;
-  int nfields;
-
-  addr = gdbarch_addr_bits_remove (target_gdbarch (), addr);
-
-  if (mips_monitor == MON_LSI)
-    {
-      if (set == 0)		/* clear breakpoint */
-	{
-	  /* The LSI PMON "clear breakpoint" has this form:
-	     <pid> 'b' <bptn> 0x0
-	     reply:
-	     <pid> 'b' 0x0 <code>
-
-	     <bptn> is a breakpoint number returned by an earlier 'B' command.
-	     Possible return codes: OK, E_BPT.  */
-
-	  int i;
-
-	  /* Search for the breakpoint in the table.  */
-	  for (i = 0; i < MAX_LSI_BREAKPOINTS; i++)
-	    if (lsi_breakpoints[i].type == type
-		&& lsi_breakpoints[i].addr == addr
-		&& lsi_breakpoints[i].len == len)
-	      break;
-
-	  /* Clear the table entry and tell PMON to clear the breakpoint.  */
-	  if (i == MAX_LSI_BREAKPOINTS)
-	    {
-	      warning (_("\
-mips_common_breakpoint: Attempt to clear bogus breakpoint at %s"),
-		       paddress (target_gdbarch (), addr));
-	      return 1;
-	    }
-
-	  lsi_breakpoints[i].type = BREAK_UNUSED;
-	  sprintf (buf, "0x0 b 0x%x 0x0", i);
-	  mips_send_packet (buf, 1);
-
-	  rlen = mips_receive_packet (buf, 1, mips_receive_wait);
-	  buf[rlen] = '\0';
-
-	  nfields = sscanf (buf, "0x%x b 0x0 0x%x", &rpid, &rerrflg);
-	  if (nfields != 2)
-	    mips_error (_("mips_common_breakpoint: "
-			"Bad response from remote board: %s"),
-			buf);
-
-	  return (mips_check_lsi_error (addr, rerrflg));
-	}
-      else
-	/* set a breakpoint */
-	{
-	  /* The LSI PMON "set breakpoint" command has this form:
-	     <pid> 'B' <addr> 0x0
-	     reply:
-	     <pid> 'B' <bptn> <code>
-
-	     The "set data breakpoint" command has this form:
-
-	     <pid> 'A' <addr1> <type> [<addr2>  [<value>]]
-
-	     where: type= "0x1" = read
-	     "0x2" = write
-	     "0x3" = access (read or write)
-
-	     The reply returns two values:
-	     bptn - a breakpoint number, which is a small integer with
-	     possible values of zero through 255.
-	     code - an error return code, a value of zero indicates a
-	     succesful completion, other values indicate various
-	     errors and warnings.
-
-	     Possible return codes: OK, W_QAL, E_QAL, E_OUT, E_NON.  */
-
-	  if (type == BREAK_FETCH)	/* instruction breakpoint */
-	    {
-	      cmd = 'B';
-	      sprintf (buf, "0x0 B 0x%s 0x0", phex_nz (addr, addr_size));
-	    }
-	  else
-	    /* watchpoint */
-	    {
-	      cmd = 'A';
-	      sprintf (buf, "0x0 A 0x%s 0x%x 0x%s",
-		       phex_nz (addr, addr_size),
-		       type == BREAK_READ ? 1 : (type == BREAK_WRITE ? 2 : 3),
-		       phex_nz (addr + len - 1, addr_size));
-	    }
-	  mips_send_packet (buf, 1);
-
-	  rlen = mips_receive_packet (buf, 1, mips_receive_wait);
-	  buf[rlen] = '\0';
-
-	  nfields = sscanf (buf, "0x%x %c 0x%x 0x%x",
-			    &rpid, &rcmd, &rresponse, &rerrflg);
-	  if (nfields != 4 || rcmd != cmd || rresponse > 255)
-	    mips_error (_("mips_common_breakpoint: "
-			"Bad response from remote board: %s"),
-			buf);
-
-	  if (rerrflg != 0)
-	    if (mips_check_lsi_error (addr, rerrflg))
-	      return 1;
-
-	  /* rresponse contains PMON's breakpoint number.  Record the
-	     information for this breakpoint so we can clear it later.  */
-	  lsi_breakpoints[rresponse].type = type;
-	  lsi_breakpoints[rresponse].addr = addr;
-	  lsi_breakpoints[rresponse].len = len;
-
-	  return 0;
-	}
-    }
-  else
-    {
-      /* On non-LSI targets, the breakpoint command has this form:
-         0x0 <CMD> <ADDR> <MASK> <FLAGS>
-         <MASK> is a don't care mask for addresses.
-         <FLAGS> is any combination of `r', `w', or `f' for 
-	 read/write/fetch.  */
-
-      unsigned long mask;
-
-      mask = calculate_mask (addr, len);
-      addr &= ~mask;
-
-      if (set)			/* set a breakpoint */
-	{
-	  char *flags;
-
-	  switch (type)
-	    {
-	    case BREAK_WRITE:	/* write */
-	      flags = "w";
-	      break;
-	    case BREAK_READ:	/* read */
-	      flags = "r";
-	      break;
-	    case BREAK_ACCESS:	/* read/write */
-	      flags = "rw";
-	      break;
-	    case BREAK_FETCH:	/* fetch */
-	      flags = "f";
-	      break;
-	    default:
-	      internal_error (__FILE__, __LINE__,
-			      _("failed internal consistency check"));
-	    }
-
-	  cmd = 'B';
-	  sprintf (buf, "0x0 B 0x%s 0x%s %s", phex_nz (addr, addr_size),
-		   phex_nz (mask, addr_size), flags);
-	}
-      else
-	{
-	  cmd = 'b';
-	  sprintf (buf, "0x0 b 0x%s", phex_nz (addr, addr_size));
-	}
-
-      mips_send_packet (buf, 1);
-
-      rlen = mips_receive_packet (buf, 1, mips_receive_wait);
-      buf[rlen] = '\0';
-
-      nfields = sscanf (buf, "0x%x %c 0x%x 0x%x",
-			&rpid, &rcmd, &rerrflg, &rresponse);
-
-      if (nfields != 4 || rcmd != cmd)
-	mips_error (_("mips_common_breakpoint: "
-		    "Bad response from remote board: %s"),
-		    buf);
-
-      if (rerrflg != 0)
-	{
-	  /* Ddb returns "0x0 b 0x16 0x0\000", whereas
-	     Cogent returns "0x0 b 0xffffffff 0x16\000": */
-	  if (mips_monitor == MON_DDB)
-	    rresponse = rerrflg;
-	  if (rresponse != 22)	/* invalid argument */
-	    fprintf_unfiltered (gdb_stderr, "\
-mips_common_breakpoint (%s):  Got error: 0x%x\n",
-				paddress (target_gdbarch (), addr), rresponse);
-	  return 1;
-	}
-    }
-  return 0;
-}
-
-/* Send one S record as specified by SREC of length LEN, starting
-   at ADDR.  Note, however, that ADDR is not used except to provide
-   a useful message to the user in the event that a NACK is received
-   from the board.  */
-
-static void
-send_srec (char *srec, int len, CORE_ADDR addr)
-{
-  while (1)
-    {
-      int ch;
-
-      serial_write (mips_desc, srec, len);
-
-      ch = mips_readchar (remote_timeout);
-
-      switch (ch)
-	{
-	case SERIAL_TIMEOUT:
-	  error (_("Timeout during download."));
-	  break;
-	case 0x6:		/* ACK */
-	  return;
-	case 0x15:		/* NACK */
-	  fprintf_unfiltered (gdb_stderr,
-			      "Download got a NACK at byte %s!  Retrying.\n",
-			      paddress (target_gdbarch (), addr));
-	  continue;
-	default:
-	  error (_("Download got unexpected ack char: 0x%x, retrying."),
-		 ch);
-	}
-    }
-}
-
-/*  Download a binary file by converting it to S records.  */
-
-static void
-mips_load_srec (const char *args)
-{
-  bfd *abfd;
-  asection *s;
-  char srec[1024];
-  bfd_byte *buffer;
-  unsigned int i;
-  unsigned int srec_frame = 200;
-  int reclen;
-  struct cleanup *cleanup;
-  static int hashmark = 1;
-
-  buffer = (bfd_byte *) alloca (srec_frame * 2 + 256);
-
-  abfd = gdb_bfd_open (args, NULL, -1);
-  if (!abfd)
-    {
-      printf_filtered ("Unable to open file %s\n", args);
-      return;
-    }
-
-  cleanup = make_cleanup_bfd_unref (abfd);
-  if (bfd_check_format (abfd, bfd_object) == 0)
-    {
-      printf_filtered ("File is not an object file\n");
-      do_cleanups (cleanup);
-      return;
-    }
-
-/* This actually causes a download in the IDT binary format: */
-  mips_send_command (LOAD_CMD, 0);
-
-  for (s = abfd->sections; s; s = s->next)
-    {
-      if (s->flags & SEC_LOAD)
-	{
-	  unsigned int numbytes;
-
-	  /* FIXME!  vma too small?????  */
-	  printf_filtered ("%s\t: 0x%4lx .. 0x%4lx  ", s->name,
-			   (long) s->vma,
-			   (long) (s->vma + bfd_get_section_size (s)));
-	  gdb_flush (gdb_stdout);
-
-	  for (i = 0; i < bfd_get_section_size (s); i += numbytes)
-	    {
-	      numbytes = min (srec_frame, bfd_get_section_size (s) - i);
-
-	      bfd_get_section_contents (abfd, s, buffer, i, numbytes);
-
-	      reclen = mips_make_srec (srec, '3', s->vma + i, 
-				       buffer, numbytes);
-	      send_srec (srec, reclen, s->vma + i);
-
-	      if (deprecated_ui_load_progress_hook)
-		deprecated_ui_load_progress_hook (s->name, i);
-
-	      if (hashmark)
-		{
-		  putchar_unfiltered ('#');
-		  gdb_flush (gdb_stdout);
-		}
-
-	    }			/* Per-packet (or S-record) loop */
-
-	  putchar_unfiltered ('\n');
-	}			/* Loadable sections */
-    }
-  if (hashmark)
-    putchar_unfiltered ('\n');
-
-  /* Write a type 7 terminator record. no data for a type 7, and there
-     is no data, so len is 0.  */
-
-  reclen = mips_make_srec (srec, '7', abfd->start_address, NULL, 0);
-
-  send_srec (srec, reclen, abfd->start_address);
-
-  serial_flush_input (mips_desc);
-  do_cleanups (cleanup);
-}
-
-/*
- * mips_make_srec -- make an srecord.  This writes each line, one at a
- *      time, each with it's own header and trailer line.
- *      An srecord looks like this:
- *
- * byte count-+     address
- * start ---+ |        |       data        +- checksum
- *          | |        |                   |
- *        S01000006F6B692D746573742E73726563E4
- *        S315000448600000000000000000FC00005900000000E9
- *        S31A0004000023C1400037DE00F023604000377B009020825000348D
- *        S30B0004485A0000000000004E
- *        S70500040000F6
- *
- *      S<type><length><address><data><checksum>
- *
- *      Where
- *      - length
- *        is the number of bytes following upto the checksum.  Note that
- *        this is not the number of chars following, since it takes two
- *        chars to represent a byte.
- *      - type
- *        is one of:
- *        0) header record
- *        1) two byte address data record
- *        2) three byte address data record
- *        3) four byte address data record
- *        7) four byte address termination record
- *        8) three byte address termination record
- *        9) two byte address termination record
- *       
- *      - address
- *        is the start address of the data following, or in the case of
- *        a termination record, the start address of the image
- *      - data
- *        is the data.
- *      - checksum
- *        is the sum of all the raw byte data in the record, from the length
- *        upwards, modulo 256 and subtracted from 255.
- *
- * This routine returns the length of the S-record.
- *
- */
-
-static int
-mips_make_srec (char *buf, int type, CORE_ADDR memaddr, unsigned char *myaddr,
-		int len)
-{
-  unsigned char checksum;
-  int i;
-
-  /* Create the header for the srec.  addr_size is the number of bytes
-     in the address, and 1 is the number of bytes in the count.  */
-
-  /* FIXME!! bigger buf required for 64-bit!  */
-  buf[0] = 'S';
-  buf[1] = type;
-  buf[2] = len + 4 + 1;		/* len + 4 byte address + 1 byte checksum */
-  /* This assumes S3 style downloads (4byte addresses).  There should
-     probably be a check, or the code changed to make it more
-     explicit.  */
-  buf[3] = memaddr >> 24;
-  buf[4] = memaddr >> 16;
-  buf[5] = memaddr >> 8;
-  buf[6] = memaddr;
-  memcpy (&buf[7], myaddr, len);
-
-  /* Note that the checksum is calculated on the raw data, not the
-     hexified data.  It includes the length, address and the data
-     portions of the packet.  */
-  checksum = 0;
-  buf += 2;			/* Point at length byte.  */
-  for (i = 0; i < len + 4 + 1; i++)
-    checksum += *buf++;
-
-  *buf = ~checksum;
-
-  return len + 8;
-}
-
-/* The following manifest controls whether we enable the simple flow
-   control support provided by the monitor.  If enabled the code will
-   wait for an affirmative ACK between transmitting packets.  */
-#define DOETXACK (1)
-
-/* The PMON fast-download uses an encoded packet format constructed of
-   3byte data packets (encoded as 4 printable ASCII characters), and
-   escape sequences (preceded by a '/'):
-
-   'K'     clear checksum
-   'C'     compare checksum (12bit value, not included in checksum calculation)
-   'S'     define symbol name (for addr) terminated with ","
-           and padded to 4char boundary
-   'Z'     zero fill multiple of 3bytes
-   'B'     byte (12bit encoded value, of 8bit data)
-   'A'     address (36bit encoded value)
-   'E'     define entry as original address, and exit load
-
-   The packets are processed in 4 character chunks, so the escape
-   sequences that do not have any data (or variable length data)
-   should be padded to a 4 character boundary.  The decoder will give
-   an error if the complete message block size is not a multiple of
-   4bytes (size of record).
-
-   The encoding of numbers is done in 6bit fields.  The 6bit value is
-   used to index into this string to get the specific character
-   encoding for the value: */
-static char encoding[] =
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,.";
-
-/* Convert the number of bits required into an encoded number, 6bits
-   at a time (range 0..63).  Keep a checksum if required (passed
-   pointer non-NULL).  The function returns the number of encoded
-   characters written into the buffer.  */
-
-static int
-pmon_makeb64 (unsigned long v, char *p, int n, unsigned int *chksum)
-{
-  int count = (n / 6);
-
-  if ((n % 12) != 0)
-    {
-      fprintf_unfiltered (gdb_stderr,
-			  "Fast encoding bitcount must be a "
-			  "multiple of 12bits: %dbit%s\n",
-			  n, (n == 1) ? "" : "s");
-      return (0);
-    }
-  if (n > 36)
-    {
-      fprintf_unfiltered (gdb_stderr,
-			  "Fast encoding cannot process more "
-			  "than 36bits at the moment: %dbits\n", n);
-      return (0);
-    }
-
-  /* Deal with the checksum: */
-  if (chksum != NULL)
-    {
-      switch (n)
-	{
-	case 36:
-	  *chksum += ((v >> 24) & 0xFFF);
-	case 24:
-	  *chksum += ((v >> 12) & 0xFFF);
-	case 12:
-	  *chksum += ((v >> 0) & 0xFFF);
-	}
-    }
-
-  do
-    {
-      n -= 6;
-      *p++ = encoding[(v >> n) & 0x3F];
-    }
-  while (n > 0);
-
-  return (count);
-}
-
-/* Shorthand function (that could be in-lined) to output the zero-fill
-   escape sequence into the data stream.  */
-
-static int
-pmon_zeroset (int recsize, char **buff,
-	      unsigned int *amount, unsigned int *chksum)
-{
-  int count;
-
-  sprintf (*buff, "/Z");
-  count = pmon_makeb64 (*amount, (*buff + 2), 12, chksum);
-  *buff += (count + 2);
-  *amount = 0;
-  return (recsize + count + 2);
-}
-
-/* Add the checksum specified by *VALUE to end of the record under
-   construction.  *BUF specifies the location at which to begin
-   writing characters comprising the checksum information.  RECSIZE
-   specifies the size of the record constructed thus far.  (A trailing
-   NUL character may be present in the buffer holding the record, but
-   the record size does not include this character.)
-
-   Return the total size of the record after adding the checksum escape,
-   the checksum itself, and the trailing newline.
-   
-   The checksum specified by *VALUE is zeroed out prior to returning.
-   Additionally, *BUF is updated to refer to the location just beyond
-   the record elements added by this call.  */
-
-static int
-pmon_checkset (int recsize, char **buff, unsigned int *value)
-{
-  int count;
-
-  /* Add the checksum (without updating the value): */
-  sprintf (*buff, "/C");
-  count = pmon_makeb64 (*value, (*buff + 2), 12, NULL);
-  *buff += (count + 2);
-  sprintf (*buff, "\n");
-  *buff += 2;			/* Include zero terminator.  */
-  /* Forcing a checksum validation clears the sum: */
-  *value = 0;
-  return (recsize + count + 3);
-}
-
-/* Amount of padding we leave after at the end of the output buffer,
-   for the checksum and line termination characters: */
-#define CHECKSIZE (4 + 4 + 4 + 2)
-/* zero-fill, checksum, transfer end and line termination space.  */
-
-/* The amount of binary data loaded from the object file in a single
-   operation: */
-#define BINCHUNK (1024)
-
-/* Maximum line of data accepted by the monitor: */
-#define MAXRECSIZE (550)
-/* NOTE: This constant depends on the monitor being used.  This value
-   is for PMON 5.x on the Cogent Vr4300 board.  */
-
-/* Create a FastLoad format record.
-
-   *OUTBUF is the buffer into which a FastLoad formatted record is
-   written.  On return, the pointer position represented by *OUTBUF
-   is updated to point at the end of the data, i.e. the next position
-   in the buffer that may be written.  No attempt is made to NUL-
-   terminate this portion of the record written to the buffer.
-   
-   INBUF contains the binary input data from which the FastLoad
-   formatted record will be built.  *INPTR is an index into this
-   buffer.  *INPTR is updated as the input is consumed.  Thus, on
-   return, the caller has access to the position of the next input
-   byte yet to be processed.  INAMOUNT is the size, in bytes, of the
-   input data.
-
-   *RECSIZE will be written with the size of the record written to the
-   output buffer prior to returning.  This size does not include a
-   NUL-termination byte as none is written to the output buffer.
-
-   *CSUM is the output buffer checksum.  It is updated as data is
-   written to the output buffer.
-   
-   *ZEROFILL is the current number of 3-byte zero sequences that have
-   been encountered.  It is both an input and an output to this
-   function.  */
-
-static void
-pmon_make_fastrec (char **outbuf, unsigned char *inbuf, int *inptr,
-		   int inamount, int *recsize, unsigned int *csum,
-		   unsigned int *zerofill)
-{
-  int count = 0;
-  char *p = *outbuf;
-
-  /* This is a simple check to ensure that our data will fit within
-     the maximum allowable record size.  Each record output is 4bytes
-     in length.  We must allow space for a pending zero fill command,
-     the record, and a checksum record.  */
-  while ((*recsize < (MAXRECSIZE - CHECKSIZE)) && ((inamount - *inptr) > 0))
-    {
-      /* Process the binary data: */
-      if ((inamount - *inptr) < 3)
-	{
-	  if (*zerofill != 0)
-	    *recsize = pmon_zeroset (*recsize, &p, zerofill, csum);
-	  sprintf (p, "/B");
-	  count = pmon_makeb64 (inbuf[*inptr], &p[2], 12, csum);
-	  p += (2 + count);
-	  *recsize += (2 + count);
-	  (*inptr)++;
-	}
-      else
-	{
-	  unsigned int value = ((inbuf[*inptr + 0] << 16)
-				| (inbuf[*inptr + 1] << 8)
-				| (inbuf[*inptr + 2]));
-
-	  /* Simple check for zero data.  TODO: A better check would be
-	     to check the last, and then the middle byte for being zero
-	     (if the first byte is not).  We could then check for
-	     following runs of zeros, and if above a certain size it is
-	     worth the 4 or 8 character hit of the byte insertions used
-	     to pad to the start of the zeroes.  NOTE: This also depends
-	     on the alignment at the end of the zero run.  */
-	  if (value == 0x00000000)
-	    {
-	      (*zerofill)++;
-	      if (*zerofill == 0xFFF)	/* 12bit counter */
-		*recsize = pmon_zeroset (*recsize, &p, zerofill, csum);
-	    }
-	  else
-	    {
-	      if (*zerofill != 0)
-		*recsize = pmon_zeroset (*recsize, &p, zerofill, csum);
-	      count = pmon_makeb64 (value, p, 24, csum);
-	      p += count;
-	      *recsize += count;
-	    }
-	  *inptr += 3;
-	}
-    }
-
-  *outbuf = p;
-  return;
-}
-
-/* Attempt to read an ACK.  If an ACK is not read in a timely manner,
-   output the message specified by MESG.  Return -1 for failure, 0
-   for success.  */
-
-static int
-pmon_check_ack (char *mesg)
-{
-#if defined(DOETXACK)
-  int c;
-
-  if (!tftp_in_use)
-    {
-      c = serial_readchar (udp_in_use ? udp_desc : mips_desc,
-			   remote_timeout);
-      if ((c == SERIAL_TIMEOUT) || (c != 0x06))
-	{
-	  fprintf_unfiltered (gdb_stderr,
-			      "Failed to receive valid ACK for %s\n", mesg);
-	  return (-1);		/* Terminate the download.  */
-	}
-    }
-#endif /* DOETXACK */
-  return (0);
-}
-
-/* pmon_download - Send a sequence of characters to the PMON download port,
-   which is either a serial port or a UDP socket.  */
-
-static void
-pmon_start_download (void)
-{
-  if (tftp_in_use)
-    {
-      /* Create the temporary download file.  */
-      if ((tftp_file = fopen (tftp_localname, "w")) == NULL)
-	perror_with_name (tftp_localname);
-    }
-  else
-    {
-      mips_send_command (udp_in_use ? LOAD_CMD_UDP : LOAD_CMD, 0);
-      mips_expect ("Downloading from ");
-      mips_expect (udp_in_use ? "udp" : "tty0");
-      mips_expect (", ^C to abort\r\n");
-    }
-}
-
-/* Look for the string specified by STRING sent from the target board
-   during a download operation.  If the string in question is not
-   seen, output an error message, remove the temporary file, if
-   appropriate, and return 0.  Otherwise, return 1 to indicate
-   success.  */
-
-static int
-mips_expect_download (char *string)
-{
-  if (!mips_expect (string))
-    {
-      fprintf_unfiltered (gdb_stderr, "Load did not complete successfully.\n");
-      if (tftp_in_use)
-	remove (tftp_localname);	/* Remove temporary file.  */
-      return 0;
-    }
-  else
-    return 1;
-}
-
-/* Look for messages from the target board associated with the entry
-   address.
-
-   NOTE: This function doesn't indicate success or failure, so we
-   have no way to determine whether or not the output from the board
-   was correctly seen.  However, given that other items are checked
-   after this, it seems unlikely that those checks will pass if this
-   check doesn't first (silently) pass.  */
-
-static void
-pmon_check_entry_address (char *entry_address, int final)
-{
-  char hexnumber[9];		/* Includes '\0' space.  */
-
-  mips_expect_timeout (entry_address, tftp_in_use ? 15 : remote_timeout);
-  sprintf (hexnumber, "%x", final);
-  mips_expect (hexnumber);
-  mips_expect ("\r\n");
-}
-
-/* Look for messages from the target board showing the total number of
-   bytes downloaded to the board.  Output 1 for success if the tail
-   end of the message was read correctly, 0 otherwise.  */
-
-static int
-pmon_check_total (int bintotal)
-{
-  char hexnumber[9];		/* Includes '\0' space.  */
-
-  mips_expect ("\r\ntotal = 0x");
-  sprintf (hexnumber, "%x", bintotal);
-  mips_expect (hexnumber);
-  return mips_expect_download (" bytes\r\n");
-}
-
-/* Look for the termination messages associated with the end of
-   a download to the board.
-
-   Also, when `tftp_in_use' is set, issue the load command to the
-   board causing the file to be transferred.  (This is done prior
-   to looking for the above mentioned termination messages.)  */
-   
-static void
-pmon_end_download (int final, int bintotal)
-{
-  char hexnumber[9];		/* Includes '\0' space.  */
-
-  if (tftp_in_use)
-    {
-      static char *load_cmd_prefix = "load -b -s ";
-      char *cmd;
-      struct stat stbuf;
-
-      /* Close off the temporary file containing the load data.  */
-      fclose (tftp_file);
-      tftp_file = NULL;
-
-      /* Make the temporary file readable by the world.  */
-      if (stat (tftp_localname, &stbuf) == 0)
-	chmod (tftp_localname, stbuf.st_mode | S_IROTH);
-
-      /* Must reinitialize the board to prevent PMON from crashing.  */
-      if (mips_monitor != MON_ROCKHOPPER)
-	mips_send_command ("initEther\r", -1);
-
-      /* Send the load command.  */
-      cmd = (char *) xmalloc (strlen (load_cmd_prefix)
-			      + strlen (tftp_name) + 2);
-      strcpy (cmd, load_cmd_prefix);
-      strcat (cmd, tftp_name);
-      strcat (cmd, "\r");
-      mips_send_command (cmd, 0);
-      xfree (cmd);
-      if (!mips_expect_download ("Downloading from "))
-	return;
-      if (!mips_expect_download (tftp_name))
-	return;
-      if (!mips_expect_download (", ^C to abort\r\n"))
-	return;
-    }
-
-  /* Wait for the stuff that PMON prints after the load has completed.
-     The timeout value for use in the tftp case (15 seconds) was picked
-     arbitrarily but might be too small for really large downloads.  FIXME.  */
-  switch (mips_monitor)
-    {
-    case MON_LSI:
-      pmon_check_ack ("termination");
-      pmon_check_entry_address ("Entry address is ", final);
-      if (!pmon_check_total (bintotal))
-	return;
-      break;
-    case MON_ROCKHOPPER:
-      if (!pmon_check_total (bintotal))
-	return;
-      pmon_check_entry_address ("Entry Address  = ", final);
-      break;
-    default:
-      pmon_check_entry_address ("Entry Address  = ", final);
-      pmon_check_ack ("termination");
-      if (!pmon_check_total (bintotal))
-	return;
-      break;
-    }
-
-  if (tftp_in_use)
-    remove (tftp_localname);	/* Remove temporary file.  */
-}
-
-/* Write the buffer specified by BUFFER of length LENGTH to either
-   the board or the temporary file that'll eventually be transferred
-   to the board.  */
-
-static void
-pmon_download (char *buffer, int length)
-{
-  if (tftp_in_use)
-    {
-      size_t written;
-
-      written = fwrite (buffer, 1, length, tftp_file);
-      if (written < length)
-	perror_with_name (tftp_localname);
-    }
-  else
-    serial_write (udp_in_use ? udp_desc : mips_desc, buffer, length);
-}
-
-/* Open object or executable file, FILE, and send it to the board
-   using the FastLoad format.  */
-
-static void
-pmon_load_fast (const char *file)
-{
-  bfd *abfd;
-  asection *s;
-  unsigned char *binbuf;
-  char *buffer;
-  int reclen;
-  unsigned int csum = 0;
-  int hashmark = !tftp_in_use;
-  int bintotal = 0;
-  int final = 0;
-  int finished = 0;
-  struct cleanup *cleanup;
-
-  buffer = (char *) xmalloc (MAXRECSIZE + 1);
-  binbuf = (unsigned char *) xmalloc (BINCHUNK);
-
-  abfd = gdb_bfd_open (file, NULL, -1);
-  if (!abfd)
-    {
-      printf_filtered ("Unable to open file %s\n", file);
-      return;
-    }
-  cleanup = make_cleanup_bfd_unref (abfd);
-
-  if (bfd_check_format (abfd, bfd_object) == 0)
-    {
-      printf_filtered ("File is not an object file\n");
-      do_cleanups (cleanup);
-      return;
-    }
-
-  /* Setup the required download state: */
-  mips_send_command ("set dlproto etxack\r", -1);
-  mips_send_command ("set dlecho off\r", -1);
-  /* NOTE: We get a "cannot set variable" message if the variable is
-     already defined to have the argument we give.  The code doesn't
-     care, since it just scans to the next prompt anyway.  */
-  /* Start the download: */
-  pmon_start_download ();
-
-  /* Zero the checksum.  */
-  sprintf (buffer, "/Kxx\n");
-  reclen = strlen (buffer);
-  pmon_download (buffer, reclen);
-  finished = pmon_check_ack ("/Kxx");
-
-  for (s = abfd->sections; s && !finished; s = s->next)
-    if (s->flags & SEC_LOAD)	/* Only deal with loadable sections.  */
-      {
-	bintotal += bfd_get_section_size (s);
-	final = (s->vma + bfd_get_section_size (s));
-
-	printf_filtered ("%s\t: 0x%4x .. 0x%4x  ", s->name,
-			 (unsigned int) s->vma,
-			 (unsigned int) (s->vma + bfd_get_section_size (s)));
-	gdb_flush (gdb_stdout);
-
-	/* Output the starting address.  */
-	sprintf (buffer, "/A");
-	reclen = pmon_makeb64 (s->vma, &buffer[2], 36, &csum);
-	buffer[2 + reclen] = '\n';
-	buffer[3 + reclen] = '\0';
-	reclen += 3;	/* For the initial escape code and carriage return.  */
-	pmon_download (buffer, reclen);
-	finished = pmon_check_ack ("/A");
-
-	if (!finished)
-	  {
-	    unsigned int binamount;
-	    unsigned int zerofill = 0;
-	    char *bp = buffer;
-	    unsigned int i;
-
-	    reclen = 0;
-
-	    for (i = 0;
-		 i < bfd_get_section_size (s) && !finished;
-		 i += binamount)
-	      {
-		int binptr = 0;
-
-		binamount = min (BINCHUNK, bfd_get_section_size (s) - i);
-
-		bfd_get_section_contents (abfd, s, binbuf, i, binamount);
-
-		/* This keeps a rolling checksum, until we decide to output
-		   the line: */
-		for (; ((binamount - binptr) > 0);)
-		  {
-		    pmon_make_fastrec (&bp, binbuf, &binptr, binamount, 
-				       &reclen, &csum, &zerofill);
-		    if (reclen >= (MAXRECSIZE - CHECKSIZE))
-		      {
-			reclen = pmon_checkset (reclen, &bp, &csum);
-			pmon_download (buffer, reclen);
-			finished = pmon_check_ack ("data record");
-			if (finished)
-			  {
-			    zerofill = 0;	/* Do not transmit pending
-						   zerofills.  */
-			    break;
-			  }
-
-			if (deprecated_ui_load_progress_hook)
-			  deprecated_ui_load_progress_hook (s->name, i);
-
-			if (hashmark)
-			  {
-			    putchar_unfiltered ('#');
-			    gdb_flush (gdb_stdout);
-			  }
-
-			bp = buffer;
-			reclen = 0;	/* buffer processed */
-		      }
-		  }
-	      }
-
-	    /* Ensure no out-standing zerofill requests: */
-	    if (zerofill != 0)
-	      reclen = pmon_zeroset (reclen, &bp, &zerofill, &csum);
-
-	    /* and then flush the line: */
-	    if (reclen > 0)
-	      {
-		reclen = pmon_checkset (reclen, &bp, &csum);
-		/* Currently pmon_checkset outputs the line terminator by
-		   default, so we write out the buffer so far: */
-		pmon_download (buffer, reclen);
-		finished = pmon_check_ack ("record remnant");
-	      }
-	  }
-
-	putchar_unfiltered ('\n');
-      }
-
-  /* Terminate the transfer.  We know that we have an empty output
-     buffer at this point.  */
-  sprintf (buffer, "/E/E\n");	/* Include dummy padding characters.  */
-  reclen = strlen (buffer);
-  pmon_download (buffer, reclen);
-
-  if (finished)
-    {				/* Ignore the termination message: */
-      serial_flush_input (udp_in_use ? udp_desc : mips_desc);
-    }
-  else
-    {				/* Deal with termination message: */
-      pmon_end_download (final, bintotal);
-    }
-
-  do_cleanups (cleanup);
-  return;
-}
-
-/* mips_load -- download a file.  */
-
-static void
-mips_load (struct target_ops *self, const char *file, int from_tty)
-{
-  struct regcache *regcache;
-
-  /* Get the board out of remote debugging mode.  */
-  if (mips_exit_debug ())
-    error (_("mips_load:  Couldn't get into monitor mode."));
-
-  if (mips_monitor != MON_IDT)
-    pmon_load_fast (file);
-  else
-    mips_load_srec (file);
-
-  mips_initialize ();
-
-  /* Finally, make the PC point at the start address.  */
-  regcache = get_current_regcache ();
-  if (mips_monitor != MON_IDT)
-    {
-      /* 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 regcache_write_pc() WILL update the PC value: */
-      regcache_invalidate (regcache,
-			   mips_regnum (get_regcache_arch (regcache))->pc);
-    }
-  if (exec_bfd)
-    regcache_write_pc (regcache, bfd_get_start_address (exec_bfd));
-}
-
-/* Check to see if a thread is still alive.  */
- 
-static int
-mips_thread_alive (struct target_ops *ops, ptid_t ptid)
-{
-  if (ptid_equal (ptid, remote_mips_ptid))
-    /* The monitor's task is always alive.  */
-    return 1;
-
-  return 0;
-}
-
-/* Convert a thread ID to a string.  Returns the string in a static
-   buffer.  */
-
-static char *
-mips_pid_to_str (struct target_ops *ops, ptid_t ptid)
-{
-  static char buf[64];
-
-  if (ptid_equal (ptid, remote_mips_ptid))
-    {
-      xsnprintf (buf, sizeof buf, "Thread <main>");
-      return buf;
-    }
-
-  return normal_pid_to_str (ptid);
-}
-
-/* Pass the command argument as a packet to PMON verbatim.  */
-
-static void
-pmon_command (char *args, int from_tty)
-{
-  char buf[DATA_MAXLEN + 1];
-  int rlen;
-
-  sprintf (buf, "0x0 %s", args);
-  mips_send_packet (buf, 1);
-  printf_filtered ("Send packet: %s\n", buf);
-
-  rlen = mips_receive_packet (buf, 1, mips_receive_wait);
-  buf[rlen] = '\0';
-  printf_filtered ("Received packet: %s\n", buf);
-}
-
-/* -Wmissing-prototypes */
-extern initialize_file_ftype _initialize_remote_mips;
-
-/* Initialize mips_ops, lsi_ops, ddb_ops, pmon_ops, and rockhopper_ops.
-   Create target specific commands and perform other initializations
-   specific to this file.  */
-
-void
-_initialize_remote_mips (void)
-{
-  /* Initialize the fields in mips_ops that are common to all four targets.  */
-  mips_ops.to_longname = "Remote MIPS debugging over serial line";
-  mips_ops.to_close = mips_close;
-  mips_ops.to_detach = mips_detach;
-  mips_ops.to_resume = mips_resume;
-  mips_ops.to_fetch_registers = mips_fetch_registers;
-  mips_ops.to_store_registers = mips_store_registers;
-  mips_ops.to_prepare_to_store = mips_prepare_to_store;
-  mips_ops.to_xfer_partial = mips_xfer_partial;
-  mips_ops.to_files_info = mips_files_info;
-  mips_ops.to_insert_breakpoint = mips_insert_breakpoint;
-  mips_ops.to_remove_breakpoint = mips_remove_breakpoint;
-  mips_ops.to_insert_watchpoint = mips_insert_watchpoint;
-  mips_ops.to_remove_watchpoint = mips_remove_watchpoint;
-  mips_ops.to_stopped_by_watchpoint = mips_stopped_by_watchpoint;
-  mips_ops.to_can_use_hw_breakpoint = mips_can_use_watchpoint;
-  mips_ops.to_kill = mips_kill;
-  mips_ops.to_load = mips_load;
-  mips_ops.to_create_inferior = mips_create_inferior;
-  mips_ops.to_mourn_inferior = mips_mourn_inferior;
-  mips_ops.to_thread_alive = mips_thread_alive;
-  mips_ops.to_pid_to_str = mips_pid_to_str;
-  mips_ops.to_log_command = serial_log_command;
-  mips_ops.to_stratum = process_stratum;
-  mips_ops.to_has_all_memory = default_child_has_all_memory;
-  mips_ops.to_has_memory = default_child_has_memory;
-  mips_ops.to_has_stack = default_child_has_stack;
-  mips_ops.to_has_registers = default_child_has_registers;
-  mips_ops.to_has_execution = default_child_has_execution;
-  mips_ops.to_magic = OPS_MAGIC;
-
-  /* Copy the common fields to all four target vectors.  */
-  rockhopper_ops = pmon_ops = ddb_ops = lsi_ops = mips_ops;
-
-  /* Initialize target-specific fields in the target vectors.  */
-  mips_ops.to_shortname = "mips";
-  mips_ops.to_doc = "\
-Debug a board using the MIPS remote debugging protocol over a serial line.\n\
-The argument is the device it is connected to or, if it contains a colon,\n\
-HOST:PORT to access a board over a network";
-  mips_ops.to_open = mips_open;
-  mips_ops.to_wait = mips_wait;
-
-  pmon_ops.to_shortname = "pmon";
-  pmon_ops.to_doc = "\
-Debug a board using the PMON MIPS remote debugging protocol over a serial\n\
-line. The argument is the device it is connected to or, if it contains a\n\
-colon, HOST:PORT to access a board over a network";
-  pmon_ops.to_open = pmon_open;
-  pmon_ops.to_wait = mips_wait;
-
-  ddb_ops.to_shortname = "ddb";
-  ddb_ops.to_doc = "\
-Debug a board using the PMON MIPS remote debugging protocol over a serial\n\
-line. The first argument is the device it is connected to or, if it contains\n\
-a colon, HOST:PORT to access a board over a network.  The optional second\n\
-parameter is the temporary file in the form HOST:FILENAME to be used for\n\
-TFTP downloads to the board.  The optional third parameter is the local name\n\
-of the TFTP temporary file, if it differs from the filename seen by the board.";
-  ddb_ops.to_open = ddb_open;
-  ddb_ops.to_wait = mips_wait;
-
-  rockhopper_ops.to_shortname = "rockhopper";
-  rockhopper_ops.to_doc = ddb_ops.to_doc;
-  rockhopper_ops.to_open = rockhopper_open;
-  rockhopper_ops.to_wait = mips_wait;
-
-  lsi_ops.to_shortname = "lsi";
-  lsi_ops.to_doc = pmon_ops.to_doc;
-  lsi_ops.to_open = lsi_open;
-  lsi_ops.to_wait = mips_wait;
-
-  /* Add the targets.  */
-  add_target (&mips_ops);
-  add_target (&pmon_ops);
-  add_target (&ddb_ops);
-  add_target (&lsi_ops);
-  add_target (&rockhopper_ops);
-
-  add_setshow_zinteger_cmd ("timeout", no_class, &mips_receive_wait, _("\
-Set timeout in seconds for remote MIPS serial I/O."), _("\
-Show timeout in seconds for remote MIPS serial I/O."), NULL,
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setlist, &showlist);
-
-  add_setshow_zinteger_cmd ("retransmit-timeout", no_class,
-			    &mips_retransmit_wait, _("\
-Set retransmit timeout in seconds for remote MIPS serial I/O."), _("\
-Show retransmit timeout in seconds for remote MIPS serial I/O."), _("\
-This is the number of seconds to wait for an acknowledgement to a packet\n\
-before resending the packet."),
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setlist, &showlist);
-
-  add_setshow_zinteger_cmd ("syn-garbage-limit", no_class,
-			    &mips_syn_garbage,  _("\
-Set the maximum number of characters to ignore when scanning for a SYN."), _("\
-Show the maximum number of characters to ignore when scanning for a SYN."), _("\
-This is the maximum number of characters GDB will ignore when trying to\n\
-synchronize with the remote system.  A value of -1 means that there is no\n\
-limit. (Note that these characters are printed out even though they are\n\
-ignored.)"),
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setlist, &showlist);
-
-  add_setshow_string_cmd ("monitor-prompt", class_obscure,
-			  &mips_monitor_prompt, _("\
-Set the prompt that GDB expects from the monitor."), _("\
-Show the prompt that GDB expects from the monitor."), NULL,
-			  NULL,
-			  NULL, /* FIXME: i18n: */
-			  &setlist, &showlist);
-
-  add_setshow_zinteger_cmd ("monitor-warnings", class_obscure,
-			    &monitor_warnings, _("\
-Set printing of monitor warnings."), _("\
-Show printing of monitor warnings."), _("\
-When enabled, monitor warnings about hardware breakpoints will be displayed."),
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setlist, &showlist);
-
-  add_com ("pmon", class_obscure, pmon_command,
-	   _("Send a packet to PMON (must be in debug mode)."));
-
-  add_setshow_boolean_cmd ("mask-address", no_class, &mask_address_p, _("\
-Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON targets."), _("\
-Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON targets."), _("\
-Use \"on\" to enable the masking and \"off\" to disable it."),
-			   NULL,
-			   NULL, /* FIXME: i18n: */
-			   &setlist, &showlist);
-  remote_mips_ptid = ptid_build (42000, 0, 42000);
-}
diff --git a/gdb/symfile.c b/gdb/symfile.c
index e11c280..0d67bfd 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2142,8 +2142,6 @@ generic_load (const char *args, int from_tty)
   ui_out_text (uiout, ", load size ");
   ui_out_field_fmt (uiout, "load-size", "%lu", total_progress.data_count);
   ui_out_text (uiout, "\n");
-  /* We were doing this in remote-mips.c, I suspect it is right
-     for other targets too.  */
   regcache_write_pc (get_current_regcache (), entry);
 
   /* Reset breakpoints, now that we have changed the load image.  For
@@ -2156,12 +2154,6 @@ generic_load (const char *args, int from_tty)
 
   breakpoint_re_set ();
 
-  /* FIXME: are we supposed to call symbol_file_add or not?  According
-     to a comment from remote-mips.c (where a call to symbol_file_add
-     was commented out), making the call confuses GDB if more than one
-     file is loaded in.  Some targets do (e.g., remote-vx.c) but
-     others don't (or didn't - perhaps they have all been deleted).  */
-
   print_transfer_performance (gdb_stdout, total_progress.data_count,
 			      total_progress.write_count,
 			      &start_time, &end_time);
