collect some remote things into remote-utils

1 files changed, 191 insertions, 619 deletions

diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index da4f0e2..2c06f6b 100644
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -38,7 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "serial.h"
 #include "gdbcmd.h"
 
-#include "dcache.h"
+#include "remote-utils.h"
 
 extern int sleep();
 
@@ -49,27 +49,16 @@ extern int stop_soon_quietly;	/* for wait_for_inferior */
 extern struct target_ops bug_ops;	/* Forward declaration */
 
 /* Forward function declarations */
-
 static int bug_clear_breakpoints PARAMS((void));
-static void bug_close PARAMS((int quitting));
-static void bug_write_cr PARAMS((char *string));
 
-static int bug_read_inferior_memory PARAMS((CORE_ADDR memaddr,
+static int bug_read_memory PARAMS((CORE_ADDR memaddr,
 					    unsigned char *myaddr,
 					    int len));
 
-static int bug_write_inferior_memory PARAMS((CORE_ADDR memaddr,
+static int bug_write_memory PARAMS((CORE_ADDR memaddr,
 					     unsigned char *myaddr,
 					     int len));
 
-/* This is the serial descriptor to our target.  */
-
-static serial_t desc = NULL;
-
-/* This is our data cache. */
-
-static DCACHE *bug_dcache;
-
 /* This variable is somewhat arbitrary.  It's here so that it can be
    set from within a running gdb.  */
 
@@ -111,184 +100,6 @@ static int srec_sleep = 0;
 
 static int srec_noise = 0;
 
-/***********************************************************************
- * I/O stuff stolen from remote-eb.c
- ***********************************************************************/
-
-/* with a timeout of 2, we time out waiting for the prompt after an
-   s-record dump. */
-static int timeout = 4;
-
-static const char *dev_name;
-
-/* Descriptor for I/O to remote machine.  Initialize it to -1 so that
-   bug_open knows that we don't have a file open when the program
-   starts.  */
-
-static int is_open = 0;
-static int
-check_open ()
-{
-  if (!is_open)
-    {
-      error ("remote device not open");
-    }
-
-  return(1);
-}
-
-#define ON	1
-#define OFF	0
-
-/* Read a character from the remote system, doing all the fancy
-   timeout stuff.  */
-static int
-readchar ()
-{
-  int buf;
-
-  buf = SERIAL_READCHAR (desc, timeout);
-
-  if (buf == SERIAL_TIMEOUT)
-    error ("Timeout reading from remote system.");
-
-  if (remote_debug)
-    printf ("%c", buf);
-
-  return buf & 0x7f;
-}
-
-static int
-readchar_nofail ()
-{
-  int buf;
-
-  buf = SERIAL_READCHAR (desc, timeout);
-  if (buf == SERIAL_TIMEOUT)
-    buf = 0;
-  if (remote_debug)
-    if (buf)
-      printf ("%c", buf);
-    else
-      printf ("<timeout>");
-
-  return buf & 0x7f;
-
-}
-
-static int
-pollchar()
-{
-  int buf;
-
-  buf = SERIAL_READCHAR (desc, 0);
-  if (buf == SERIAL_TIMEOUT)
-    buf = 0;
-  if (remote_debug)
-    if (buf)
-      printf ("%c", buf);
-    else
-      printf ("<empty poll>");
-
-  return buf & 0x7f;
-}
-
-/* Keep discarding input from the remote system, until STRING is found.
-   Let the user break out immediately.  */
-static void
-expect (string)
-     char *string;
-{
-  char *p = string;
-
-  immediate_quit = 1;
-  for (;;)
-    {
-      if (readchar () == *p)
-	{
-	  p++;
-	  if (*p == '\0')
-	    {
-	      immediate_quit = 0;
-	      return;
-	    }
-	}
-      else
-	p = string;
-    }
-}
-
-/* Keep discarding input until we see the bug prompt.
-
-   The convention for dealing with the prompt is that you
-   o give your command
-   o *then* wait for the prompt.
-
-   Thus the last thing that a procedure does with the serial line
-   will be an expect_prompt().  Exception:  bug_resume does not
-   wait for the prompt, because the terminal is being handed over
-   to the inferior.  However, the next thing which happens after that
-   is a bug_wait which does wait for the prompt.
-   Note that this includes abnormal exit, e.g. error().  This is
-   necessary to prevent getting into states from which we can't
-   recover.  */
-static void
-expect_prompt ()
-{
-  expect ("Bug>");
-}
-
-/* Get a hex digit from the remote system & return its value.
-   If ignore_space is nonzero, ignore spaces (not newline, tab, etc).  */
-static int
-get_hex_digit (ignore_space)
-     int ignore_space;
-{
-  int ch;
-
-  for (;;)
-    {
-      ch = readchar ();
-      if (ch >= '0' && ch <= '9')
-	return ch - '0';
-      else if (ch >= 'A' && ch <= 'F')
-	return ch - 'A' + 10;
-      else if (ch >= 'a' && ch <= 'f')
-	return ch - 'a' + 10;
-      else if (ch != ' ' || !ignore_space)
-	{
-	  expect_prompt ();
-	  error ("Invalid hex digit from remote system.");
-	}
-    }
-}
-
-/* Get a byte from bug_desc and put it in *BYT.  Accept any number
-   leading spaces.  */
-static void
-get_hex_byte (byt)
-     char *byt;
-{
-  int val;
-
-  val = get_hex_digit (1) << 4;
-  val |= get_hex_digit (0);
-  *byt = val;
-}
-
-/* Read a 32-bit hex word from the bug, preceded by a space  */
-static long
-get_hex_word ()
-{
-  long val;
-  int j;
-
-  val = 0;
-  for (j = 0; j < 8; j++)
-    val = (val << 4) + get_hex_digit (j == 0);
-  return val;
-}
-
 /* Called when SIGALRM signal sent due to alarm() timeout.  */
 
 /* Number of SIGTRAPs we need to simulate.  That is, the next
@@ -297,14 +108,6 @@ get_hex_word ()
 
 static int need_artificial_trap = 0;
 
-void
-bug_kill (arg, from_tty)
-     char *arg;
-     int from_tty;
-{
-
-}
-
 /*
  * Download a file specified in 'args', to the bug.
  */
@@ -318,9 +121,9 @@ bug_load (args, fromtty)
   asection *s;
   char buffer[1024];
 
-  check_open ();
+  sr_check_open ();
 
-  dcache_flush (bug_dcache);
+  dcache_flush (gr_get_dcache());
   inferior_pid = 0;
   abfd = bfd_openr (args, 0);
   if (!abfd)
@@ -352,7 +155,7 @@ bug_load (args, fromtty)
 		srec_frame = s->_raw_size - i;
 
 	      bfd_get_section_contents (abfd, s, buffer, i, srec_frame);
-	      bug_write_inferior_memory (s->vma + i, buffer, srec_frame);
+	      bug_write_memory (s->vma + i, buffer, srec_frame);
 	      printf_filtered ("*");
 	      fflush (stdout);
 	    }
@@ -362,39 +165,11 @@ bug_load (args, fromtty)
       s = s->next;
     }
   sprintf (buffer, "rs ip %lx", (unsigned long) abfd->start_address);
-  bug_write_cr (buffer);
-  expect_prompt ();
-}
-
-/* This is called not only when we first attach, but also when the
-   user types "run" after having attached.  */
-void
-bug_create_inferior (execfile, args, env)
-     char *execfile;
-     char *args;
-     char **env;
-{
-  int entry_pt;
-
-  if (args && *args)
-    error ("Can't pass arguments to remote bug process.");
-
-  if (execfile == 0 || exec_bfd == 0)
-    error ("No exec file specified");
-
-  entry_pt = (int) bfd_get_start_address (exec_bfd);
-  check_open ();
-
-  bug_kill (NULL, NULL);
-  bug_clear_breakpoints ();
-  init_wait_for_inferior ();
-  bug_write_cr ("");
-  expect_prompt ();
-
-  insert_breakpoints ();	/* Needed to get correct instruction in cache */
-  proceed (entry_pt, -1, 0);
+  sr_write_cr (buffer);
+  gr_expect_prompt ();
 }
 
+#if 0
 static char *
 get_word (p)
      char **p;
@@ -423,72 +198,47 @@ get_word (p)
   *p = s;
   return copy;
 }
+#endif
 
-static int baudrate = 9600;
-
-static void
-bug_open (name, from_tty)
-     char *name;
-     int from_tty;
-{
-  push_target (&bug_ops);
-
-  if (name == 0)
-    {
-      name = "";
-    }
-  if (is_open)
-    bug_close (0);
-  dev_name = strdup (name);
-
-  if (!(desc = SERIAL_OPEN (dev_name)))
-    perror_with_name ((char *) dev_name);
-
-  SERIAL_RAW (desc);
-  is_open = 1;
-
-  bug_dcache = dcache_init (bug_read_inferior_memory, bug_write_inferior_memory);
-
-  /* Hello?  Are you there?  */
-  SERIAL_WRITE (desc, "\r", 1);
-  expect_prompt ();
-
-  /* Clear any break points */
-  bug_clear_breakpoints ();
-
-  printf_filtered ("Connected to remote 187bug system.\n");
-}
+static struct gr_settings bug_settings = {
+  NULL,	/* dcache */
+  "Bug>", /* prompt */
+  &bug_ops, /* ops */
+  bug_clear_breakpoints, /* clear_all_breakpoints */
+  bug_read_memory, /* readfunc */
+  bug_write_memory, /* writefunc */
+  gr_generic_checkin, /* checkin */
+};
 
-/* Close out all files and local state before this target loses control. */
+static char *cpu_check_strings[] = {
+  "=",
+  "Invalid Register",
+};
 
 static void
-bug_close (quitting)
-     int quitting;
-{
-  /* Clear any break points */
-  bug_clear_breakpoints ();
-
-  if (is_open)
-    SERIAL_CLOSE (desc);
-
-  is_open = 0;
-}
-
-/* Terminate the open connection to the remote debugger.
-   Use this when you want to detach and do something else
-   with your gdb.  */
-void
-bug_detach (args, from_tty)
+bug_open (args, from_tty)
      char *args;
      int from_tty;
 {
-  if (is_open)
-    bug_clear_breakpoints ();
+  if (args == NULL)
+      args = "";
 
-  pop_target ();		/* calls bug_close to do the real work */
+  gr_open(args, from_tty, &bug_settings);
+  /* decide *now* whether we are on an 88100 or an 88110 */
+  sr_write_cr("rs cr06");
+  sr_expect("rs cr06");
 
-  if (from_tty)
-    printf_filtered ("Ending remote %s debugging\n", target_shortname);
+  switch (sr_multi_scan(cpu_check_strings, 0))
+    {
+    case 0: /* this is an m88100 */
+      target_is_m88110 = 0;
+      break;
+    case 1: /* this is an m88110 */
+      target_is_m88110 = 1;
+      break;
+    default:
+      abort();
+    }
 }
 
 /* Tell the remote machine to resume.  */
@@ -497,11 +247,11 @@ void
 bug_resume (pid, step, sig)
      int pid, step, sig;
 {
-  dcache_flush (bug_dcache);
+  dcache_flush (gr_get_dcache());
 
   if (step)
     {
-      bug_write_cr("t");
+      sr_write_cr("t");
 
       /* Force the next bug_wait to return a trap.  Not doing anything
        about I/O from the target means that the user has to type
@@ -509,102 +259,11 @@ bug_resume (pid, step, sig)
       need_artificial_trap = 1;
     }
   else
-      bug_write_cr ("g");
+      sr_write_cr ("g");
 
   return;
 }
 
-/* Given a null terminated list of strings LIST, read the input until we find one of
-   them.  Return the index of the string found or -1 on error.  '?' means match
-   any single character. Note that with the algorithm we use, the initial
-   character of the string cannot recur in the string, or we will not find some
-   cases of the string in the input.  If PASSTHROUGH is non-zero, then
-   pass non-matching data on.  */
-
-static int
-multi_scan (list, passthrough)
-     char *list[];
-     int passthrough;
-{
-  char *swallowed = NULL; /* holding area */
-  char *swallowed_p = swallowed; /* Current position in swallowed.  */
-  int ch;
-  int ch_handled;
-  int i;
-  int string_count;
-  int max_length;
-  char **plist;
-
-  /* Look through the strings.  Count them.  Find the largest one so we can
-     allocate a holding area.  */
-
-  for (max_length = string_count = i = 0;
-       list[i] != NULL;
-       ++i, ++string_count)
-    {
-      int length = strlen(list[i]);
-
-      if (length > max_length)
-	max_length = length;
-    }
-
-  /* if we have no strings, then something is wrong. */
-  if (string_count == 0)
-    return(-1);
-
-  /* otherwise, we will need a holding area big enough to hold almost two
-     copies of our largest string.  */
-  swallowed_p = swallowed = alloca(max_length << 1);
-
-  /* and a list of pointers to current scan points. */
-  plist = alloca(string_count * sizeof(*plist));
-
-  /* and initialize */
-  for (i = 0; i < string_count; ++i)
-    plist[i] = list[i];
-
-  for (ch = readchar(); /* loop forever */ ; ch = readchar())
-    {
-      QUIT; /* Let user quit and leave process running */
-      ch_handled = 0;
-
-      for (i = 0; i < string_count; ++i)
-	{
-	  if (ch == *plist[i] || *plist[i] == '?')
-	    {
-	      ++plist[i];
-	      if (*plist[i] == '\0')
-		return(i);
-
-	      if (!ch_handled)
-		*swallowed_p++ = ch;
-
-	      ch_handled = 1;
-	    }
-	  else
-	    plist[i] = list[i];
-	}
-
-      if (!ch_handled)
-	{
-	  char *p;
-
-	  /* Print out any characters which have been swallowed.  */
-	  if (passthrough)
-	    {
-	      for (p = swallowed; p < swallowed_p; ++p)
-		putc (*p, stdout);
-
-	      putc (ch, stdout);
-	    }
-
-	  swallowed_p = swallowed;
-	}
-    }
-
-  return(-1);
-}
-
 /* Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.  */
 
@@ -612,6 +271,7 @@ static char *wait_strings[] = {
   "At Breakpoint",
   "Exception: Data Access Fault (Local Bus Timeout)",
   "\r8???-Bug>",
+  "\r197-Bug>",
   NULL,
 };
 
@@ -619,7 +279,7 @@ int
 bug_wait (status)
      WAITTYPE *status;
 {
-  int old_timeout = timeout;
+  int old_timeout = sr_get_timeout();
   int old_immediate_quit = immediate_quit;
 
   WSETEXIT ((*status), 0);
@@ -628,29 +288,30 @@ bug_wait (status)
      back out as stdout.  */
   if (need_artificial_trap == 0)
     {
-      expect("Effective address: ");
-      (void) get_hex_word();
-      expect ("\r\n");
+      sr_expect("Effective address: ");
+      (void) sr_get_hex_word();
+      sr_expect ("\r\n");
     }
 
-  timeout = -1;	/* Don't time out -- user program is running. */
+  sr_set_timeout(-1); /* Don't time out -- user program is running. */
   immediate_quit = 1; /* Helps ability to QUIT */
 
-  switch (multi_scan(wait_strings, need_artificial_trap == 0))
+  switch (gr_multi_scan(wait_strings, need_artificial_trap == 0))
     {
     case 0: /* breakpoint case */
       WSETSTOP ((*status), SIGTRAP);
       /* user output from the target can be discarded here. (?) */
-      expect_prompt();
+      gr_expect_prompt();
       break;
 
     case 1: /* bus error */
       WSETSTOP ((*status), SIGBUS);
       /* user output from the target can be discarded here. (?) */
-      expect_prompt();
+      gr_expect_prompt();
       break;
 
     case 2: /* normal case */
+    case 3:
       if (need_artificial_trap != 0)
 	{
 	  /* stepping */
@@ -672,7 +333,7 @@ bug_wait (status)
       break;
     }
 
-  timeout = old_timeout;
+  sr_set_timeout(old_timeout);
   immediate_quit = old_immediate_quit;
   return 0;
 }
@@ -700,38 +361,16 @@ get_reg_name (regno)
   /* 35 = sxip */
     "cr05", /* 36 = snip */
     "cr06", /* 37 = sfip */
+
+    "x00", "x01", "x02", "x03", "x04", "x05", "x06", "x07",
+    "x08", "x09", "x10", "x11", "x12", "x13", "x14", "x15",
+    "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23",
+    "x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31",
   };
 
   return rn[regno];
 }
 
-static int
-bug_write (a, l)
-     char *a;
-     int l;
-{
-  int i;
-
-  SERIAL_WRITE (desc, a, l);
-
-  if (remote_debug)
-    for (i = 0; i < l; i++)
-      {
-	printf ("%c", a[i]);
-      }
-
-  return(0);
-}
-
-static void
-bug_write_cr (s)
-     char *s;
-{
-  bug_write (s, strlen (s));
-  bug_write ("\r", 1);
-  return;
-}
-
 #if 0 /* not currently used */
 /* Read from remote while the input matches STRING.  Return zero on
    success, -1 on failure.  */
@@ -744,7 +383,7 @@ bug_scan (s)
 
   while (*s)
     {
-      c = readchar();
+      c = sr_readchar();
       if (c != *s++)
 	{
 	  fflush(stdout);
@@ -766,16 +405,16 @@ bug_srec_write_cr (s)
   if (srec_echo_pace)
     for (p = s; *p; ++p)
       {
-	if (remote_debug)
+	if (sr_get_debug() > 0)
 	  printf ("%c", *p);
 
 	do
-	  SERIAL_WRITE(desc, p, 1);
-	while (readchar_nofail() != *p);
+	  SERIAL_WRITE(sr_get_desc(), p, 1);
+	while (sr_pollchar() != *p);
       }
   else
     {  
-      bug_write_cr (s);
+      sr_write_cr (s);
 /*       return(bug_scan (s) || bug_scan ("\n")); */
     }
 
@@ -789,7 +428,8 @@ bug_fetch_register(regno)
      int regno;
 {
   REGISTER_TYPE regval;
-  check_open();
+
+  sr_check_open();
 
   if (regno == -1)
     {
@@ -798,13 +438,13 @@ bug_fetch_register(regno)
       for (i = 0; i < NUM_REGS; ++i)
 	bug_fetch_register(i);
     }
-  else
+  else if (regno < XFP_REGNUM)
     {
-      bug_write("rs ", 3);
-      bug_write_cr(get_reg_name(regno));
-      expect("=");
-      regval = get_hex_word();
-      expect_prompt();
+      sr_write("rs ", 3);
+      sr_write_cr(get_reg_name(regno));
+      sr_expect("=");
+      regval = sr_get_hex_word();
+      gr_expect_prompt();
 
       /* the following registers contain flag bits in the lower to bit slots.
 	 Mask them off */
@@ -815,6 +455,48 @@ bug_fetch_register(regno)
 
       supply_register(regno, (char *) &regval);
     }
+  else
+    {
+      /* Float register so we need to parse a strange data format. */
+      long p;
+      unsigned char value[10];
+
+      sr_write("rs ", 3);
+      sr_write(get_reg_name(regno), strlen(get_reg_name(regno)));
+      sr_write_cr(";d");
+      sr_expect("rs");
+      sr_expect(get_reg_name(regno));
+      sr_expect(";d");
+      sr_expect("=");
+
+      /* sign */
+      p = sr_get_hex_digit(1);
+      value[0] = p << 7;
+
+      /* exponent */
+      sr_expect("_");
+      p = sr_get_hex_digit(1);
+      value[0] += (p << 4);
+      value[0] += sr_get_hex_digit(1);
+
+      value[1] = sr_get_hex_digit(1) << 4;
+
+      /* fraction */
+      sr_expect("_");
+      value[1] += sr_get_hex_digit(1);
+
+      value[2] = (sr_get_hex_digit(1) << 4) + sr_get_hex_digit(1);
+      value[3] = (sr_get_hex_digit(1) << 4) + sr_get_hex_digit(1);
+      value[4] = (sr_get_hex_digit(1) << 4) + sr_get_hex_digit(1);
+      value[5] = (sr_get_hex_digit(1) << 4) + sr_get_hex_digit(1);
+      value[6] = (sr_get_hex_digit(1) << 4) + sr_get_hex_digit(1);
+      value[7] = (sr_get_hex_digit(1) << 4) + sr_get_hex_digit(1);
+      value[8] = 0;
+      value[9] = 0;
+
+      gr_expect_prompt();
+      supply_register(regno, value);
+    }
 
   return;
 }
@@ -826,7 +508,7 @@ bug_store_register (regno)
      int regno;
 {
   char buffer[1024];
-  check_open();
+  sr_check_open();
 
   if (regno == -1)
     {
@@ -839,54 +521,42 @@ bug_store_register (regno)
     {
       char *regname;
 
-      regname = (get_reg_name(regno));
+      regname = get_reg_name(regno);
 
-      sprintf(buffer, "rs %s %08x",
-	      regname,
-	      read_register(regno));
+      if (regno < XFP_REGNUM)
+	sprintf(buffer, "rs %s %08x",
+		regname,
+		read_register(regno));
+      else
+	{
+	  unsigned char *value = &registers[REGISTER_BYTE(regno)];
+	  
+	  sprintf(buffer, "rs %s %1x_%2x%1x_%1x%2x%2x%2x%2x%2x%2x",
+		  regname,
+		  /* sign */
+		  (value[0] >> 7) & 0xf,
+		  /* exponent */
+		  value[0] & 0x7f,
+		  (value[1] >> 8) & 0xf,
+		  /* fraction */
+		  value[1] & 0xf,
+		  value[2],
+		  value[3],
+		  value[4],
+		  value[5],
+		  value[6],
+		  value[7]);
+	}
 
-      bug_write_cr(buffer);
-      expect_prompt();
+      sr_write_cr(buffer);
+      gr_expect_prompt();
     }
 
   return;
 }
 
-/* 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.  */
-
-void
-bug_prepare_to_store ()
-{
-  /* Do nothing, since we can store individual regs */
-}
-
-/* Read a word from remote address ADDR and return it.
- * This goes through the data cache.
- */
 int
-bug_fetch_word (addr)
-     CORE_ADDR addr;
-{
-  return dcache_fetch (bug_dcache, addr);
-}
-
-/* Write a word WORD into remote address ADDR.
-   This goes through the data cache.  */
-
-void
-bug_store_word (addr, word)
-     CORE_ADDR addr;
-     int word;
-{
-  dcache_poke (bug_dcache, addr, word);
-}
-
-int
-bug_xfer_inferior_memory (memaddr, myaddr, len, write, target)
+bug_xfer_memory (memaddr, myaddr, len, write, target)
      CORE_ADDR memaddr;
      char *myaddr;
      int len;
@@ -916,13 +586,13 @@ bug_xfer_inferior_memory (memaddr, myaddr, len, write, target)
       if (addr != memaddr || len < (int) sizeof (int))
 	{
 	  /* Need part of initial word -- fetch it.  */
-	  buffer[0] = bug_fetch_word (addr);
+	  buffer[0] = gr_fetch_word (addr);
 	}
 
       if (count > 1)		/* FIXME, avoid if even boundary */
 	{
 	  buffer[count - 1]
-	    = bug_fetch_word (addr + (count - 1) * sizeof (int));
+	    = gr_fetch_word (addr + (count - 1) * sizeof (int));
 	}
 
       /* Copy data to be written over corresponding part of buffer */
@@ -934,7 +604,7 @@ bug_xfer_inferior_memory (memaddr, myaddr, len, write, target)
       for (i = 0; i < count; i++, addr += sizeof (int))
 	{
 	  errno = 0;
-	  bug_store_word (addr, buffer[i]);
+	  gr_store_word (addr, buffer[i]);
 	  if (errno)
 	    {
 
@@ -949,7 +619,7 @@ bug_xfer_inferior_memory (memaddr, myaddr, len, write, target)
       for (i = 0; i < count; i++, addr += sizeof (int))
 	{
 	  errno = 0;
-	  buffer[i] = bug_fetch_word (addr);
+	  buffer[i] = gr_fetch_word (addr);
 	  if (errno)
 	    {
 	      return 0;
@@ -971,9 +641,9 @@ start_load()
 
   command = (srec_echo_pace ? "lo 0 ;x" : "lo 0");
 
-  bug_write_cr (command);
-  expect (command);
-  expect ("\r\n");
+  sr_write_cr (command);
+  sr_expect (command);
+  sr_expect ("\r\n");
   bug_srec_write_cr ("S0030000FC");
   return;
 }
@@ -993,12 +663,12 @@ start_load()
 
 static char *srecord_strings[] = {
   "S-RECORD",
-  "8???-Bug>",
+  "-Bug>",
   NULL,
 };
 
 static int
-bug_write_inferior_memory (memaddr, myaddr, len)
+bug_write_memory (memaddr, myaddr, len)
      CORE_ADDR memaddr;
      unsigned char *myaddr;
      int len;
@@ -1020,15 +690,15 @@ bug_write_inferior_memory (memaddr, myaddr, len)
 
       if (retries > 0)
 	{
-	  if (remote_debug)
+	  if (sr_get_debug() > 0)
 	    printf("\n<retrying...>\n");
 
-	  /* This expect_prompt call is extremely important.  Without
+	  /* This gr_expect_prompt call is extremely important.  Without
 	     it, we will tend to resend our packet so fast that it
 	     will arrive before the bug monitor is ready to receive
 	     it.  This would lead to a very ugly resend loop.  */
 
-	  expect_prompt();
+	  gr_expect_prompt();
 	}
 
       start_load();
@@ -1081,22 +751,22 @@ bug_write_inferior_memory (memaddr, myaddr, len)
 	  if (srec_sleep != 0)
 	    sleep(srec_sleep);
 
-	  /* This pollchar is probably redundant to the multi_scan
+	  /* This pollchar is probably redundant to the gr_multi_scan
 	     below.  Trouble is, we can't be sure when or where an
 	     error message will appear.  Apparently, when running at
 	     full speed from a typical sun4, error messages tend to
 	     appear to arrive only *after* the s7 record.   */
 
-	  if ((x = pollchar()) != 0)
+	  if ((x = sr_pollchar()) != 0)
 	    {
-	      if (remote_debug)
+	      if (sr_get_debug() > 0)
 		printf("\n<retrying...>\n");
 
 	      ++retries;
 
 	      /* flush any remaining input and verify that we are back
 		 at the prompt level. */
-	      expect_prompt();
+	      gr_expect_prompt();
 	      /* start all over again. */
 	      start_load();
 	      done = 0;
@@ -1111,28 +781,11 @@ bug_write_inferior_memory (memaddr, myaddr, len)
 
       /* Having finished the load, we need to figure out whether we
 	 had any errors.  */
-    } while (multi_scan(srecord_strings, 0) == 0);;
+    } while (gr_multi_scan(srecord_strings, 0) == 0);;
 
   return(0);
 }
 
-void
-bug_files_info ()
-{
-  char *file = "nothing";
-
-  if (exec_bfd)
-    file = bfd_get_filename (exec_bfd);
-
-  if (exec_bfd)
-#ifdef __GO32__
-    printf_filtered ("\tAttached to DOS asynctsr and running program %s\n", file);
-#else
-    printf_filtered ("\tAttached to %s at %d baud and running program %s\n", dev_name, baudrate, file);
-#endif
-  printf_filtered ("\ton an m88k processor.\n");
-}
-
 /* Copy LEN bytes of data from debugger memory at MYADDR
    to inferior's memory at MEMADDR.  Returns errno value.
  * sb/sh instructions don't work on unaligned addresses, when TU=1.
@@ -1141,7 +794,7 @@ bug_files_info ()
 /* Read LEN bytes from inferior memory at MEMADDR.  Put the result
    at debugger address MYADDR.  Returns errno value.  */
 static int
-bug_read_inferior_memory (memaddr, myaddr, len)
+bug_read_memory (memaddr, myaddr, len)
      CORE_ADDR memaddr;
      unsigned char *myaddr;
      int len;
@@ -1156,23 +809,23 @@ bug_read_inferior_memory (memaddr, myaddr, len)
   unsigned int checksum;
 
   sprintf(request, "du 0 %x:&%d", memaddr, len);
-  bug_write_cr(request);
+  sr_write_cr(request);
 
   p = buffer = alloca(len);
 
   /* scan up through the header */
-  expect("S0030000FC");
+  sr_expect("S0030000FC");
 
   while (p < buffer + len)
     {
       /* scan off any white space. */
-      while (readchar() != 'S') ;;
+      while (sr_readchar() != 'S') ;;
 
       /* what kind of s-rec? */
-      type = readchar();
+      type = sr_readchar();
 
       /* scan record size */
-      get_hex_byte(&size);
+      sr_get_hex_byte(&size);
       checksum = size;
       --size;
       inaddr = 0;
@@ -1185,23 +838,23 @@ bug_read_inferior_memory (memaddr, myaddr, len)
 	  goto done;
 
 	case '3':
-	  get_hex_byte(&c);
+	  sr_get_hex_byte(&c);
 	  inaddr = (inaddr << 8) + c;
 	  checksum += c;
 	  --size;
 	  /* intentional fall through */
 	case '2':
-	  get_hex_byte(&c);
+	  sr_get_hex_byte(&c);
 	  inaddr = (inaddr << 8) + c;
 	  checksum += c;
 	  --size;
 	  /* intentional fall through */
 	case '1':
-	  get_hex_byte(&c);
+	  sr_get_hex_byte(&c);
 	  inaddr = (inaddr << 8) + c;
 	  checksum += c;
 	  --size;
-	  get_hex_byte(&c);
+	  sr_get_hex_byte(&c);
 	  inaddr = (inaddr << 8) + c;
 	  checksum += c;
 	  --size;
@@ -1221,17 +874,17 @@ bug_read_inferior_memory (memaddr, myaddr, len)
 
       for (; size; --size, ++p)
 	{
-	  get_hex_byte(p);
+	  sr_get_hex_byte(p);
 	  checksum += *p;
 	}
 
-      get_hex_byte(&c);
+      sr_get_hex_byte(&c);
       if (c != (~checksum & 0xff))
 	error("bad s-rec checksum");
     }
 
  done:
-  expect_prompt();
+  gr_expect_prompt();
   if (p != buffer + len)
     return(1);
 
@@ -1246,7 +899,7 @@ bug_insert_breakpoint (addr, save)
      CORE_ADDR addr;
      char *save;		/* Throw away, let bug save instructions */
 {
-  check_open ();
+  sr_check_open ();
 
   if (num_brkpts < MAX_BREAKS)
     {
@@ -1254,8 +907,8 @@ bug_insert_breakpoint (addr, save)
 
       num_brkpts++;
       sprintf (buffer, "br %x", addr);
-      bug_write_cr (buffer);
-      expect_prompt ();
+      sr_write_cr (buffer);
+      gr_expect_prompt ();
       return(0);
     }
   else
@@ -1277,8 +930,8 @@ bug_remove_breakpoint (addr, save)
 
       num_brkpts--;
       sprintf (buffer, "nobr %x", addr);
-      bug_write_cr (buffer);
-      expect_prompt ();
+      sr_write_cr (buffer);
+      gr_expect_prompt ();
 
     }
   return (0);
@@ -1289,103 +942,35 @@ static int
 bug_clear_breakpoints ()
 {
 
-  if (is_open)
+  if (sr_is_open())
     {
-      bug_write_cr ("nobr");
-      expect("nobr");
-      expect_prompt ();
+      sr_write_cr ("nobr");
+      sr_expect("nobr");
+      gr_expect_prompt ();
     }
   num_brkpts = 0;
   return(0);
 }
 
-static void
-bug_mourn ()
-{
-  bug_clear_breakpoints ();
-  generic_mourn_inferior ();
-}
-
-/* Put a command string, in args, out to the bug.  The bug is assumed to
-   be in raw mode, all writing/reading done through desc.
-   Ouput from the bug is placed on the users terminal until the
-   prompt from the bug is seen.
-   FIXME: Can't handle commands that take input.  */
-
-void
-bug_com (args, fromtty)
-     char *args;
-     int fromtty;
-{
-  check_open ();
-
-  if (!args)
-    return;
-
-  /* Clear all input so only command relative output is displayed */
-
-  bug_write_cr (args);
-  bug_write ("\030", 1);
-  expect_prompt ();
-}
-
-static void
-bug_device (args, fromtty)
-     char *args;
-     int fromtty;
-{
-  if (args)
-    dev_name = get_word (&args);
-
-  return;
-}
-
-#if 0
-static
-bug_speed (s)
-     char *s;
-{
-  check_open ();
-
-  if (s)
-    {
-      char buffer[100];
-      int newrate = atoi (s);
-      int which = 0;
-
-      if (SERIAL_SETBAUDRATE (desc, newrate))
-	error ("Can't use %d baud\n", newrate);
-
-      printf_filtered ("Checking target is in sync\n");
-
-      printf_filtered ("Sending commands to set target to %d\n",
-		       baudrate);
-
-      sprintf (buffer, "tm %d. N 8 1", baudrate);
-      bug_write_cr (buffer);
-    }
-}
-#endif /* 0 */
-
 struct target_ops bug_ops =
 {
   "bug", "Remote BUG monitor",
   "Use the mvme187 board running the BUG monitor connected\n\
 by a serial line.",
 
-  bug_open, bug_close,
-  0, bug_detach, bug_resume, bug_wait,	/* attach */
+  bug_open, gr_close,
+  0, gr_detach, bug_resume, bug_wait,	/* attach */
   bug_fetch_register, bug_store_register,
-  bug_prepare_to_store,
-  bug_xfer_inferior_memory,
-  bug_files_info,
+  gr_prepare_to_store,
+  bug_xfer_memory,
+  gr_files_info,
   bug_insert_breakpoint, bug_remove_breakpoint,	/* Breakpoints */
   0, 0, 0, 0, 0,		/* Terminal handling */
-  bug_kill,			/* FIXME, kill */
+  gr_kill,			/* FIXME, kill */
   bug_load,
   0,				/* lookup_symbol */
-  bug_create_inferior,		/* create_inferior */
-  bug_mourn,			/* mourn_inferior FIXME */
+  gr_create_inferior,		/* create_inferior */
+  gr_mourn,			/* mourn_inferior FIXME */
   0,				/* can_run */
   0,				/* notice_signals */
   process_stratum, 0,		/* next */
@@ -1399,17 +984,6 @@ _initialize_remote_bug ()
 {
   add_target (&bug_ops);
 
-  add_com ("bug <command>", class_obscure, bug_com,
-	   "Send a command to the BUG monitor.");
-
-  add_com ("device", class_obscure, bug_device,
-	   "Set the terminal line for BUG communications");
-
-#if 0
-  add_com ("speed", class_obscure, bug_speed,
-	   "Set the terminal line speed for BUG communications");
-#endif /* 0 */
-
   add_show_from_set
     (add_set_cmd ("srec-bytes", class_support, var_uinteger,
 		  (char *) &srec_bytes,
@@ -1465,6 +1039,4 @@ When on, use verification by echo when downloading S-records.  This is\n\
 much slower, but generally more reliable.", 
 		  &setlist),
      &showlist);
-
-  dev_name = NULL;
 }