* Changed MIPS monitor interface code to be tolerant of slightly

  different IDT/sim 6.0 behavior.  Extra time and laxness is alloted
  for monitor entry and exit.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44d6989..41e6d3f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 12 16:12:07 1998  Frank Ch. Eigler  <fche@cygnus.com>
+
+       * remote-mips.c (mips_enter_debug): Sleep before sending CR to
+       monitor.
+       (mips_exit_debug): Accept any whitespace / verbiage before monitor
+       prompt reappears.
+
 Thu Feb 12 18:25:42 1998  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * d10v-tdep.c (show_regs): Avoid use of %llx when printing 8 byte

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 34a1019..0d0d5f9 100644 (file)
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -1346,6 +1346,7 @@ mips_enter_debug ()
   else /* assume IDT monitor by default */
     mips_send_command ("db tty0\r", 0);
 
+  sleep(1);
   SERIAL_WRITE (mips_desc, "\r", sizeof "\r" - 1);
 
   /* We don't need to absorb any spurious characters here, since the
@@ -1385,18 +1386,6 @@ mips_exit_debug ()
     mips_request ('x', (unsigned int) 0, (unsigned int) 0, &err,
                   mips_receive_wait, NULL);
 
-  if (mips_monitor == MON_IDT && !mips_expect ("Exiting remote debug"))
-    return -1;
-    
-  if (mips_monitor == MON_DDB)
-    {
-      if (!mips_expect ("\n"))
-        return -1;
-    }
-  else
-    if (!mips_expect ("\r\n"))
-      return -1;
-
   if (!mips_expect (mips_monitor_prompt))
     return -1;