*** empty log message ***

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

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 0f6d9957275326eafe31f6e22b365e35c17e3d19..a1df0eb94e9d3ef9ce06eeb434313b9d6214a2da 100644 (file)
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -1,6 +1,8 @@
 /* Remote debugging interface for MIPS remote debugging protocol.
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002 Free Software Foundation, Inc.
+
    Contributed by Cygnus Support.  Written by Ian Lance Taylor
    <ian@cygnus.com>.
 
@@ -495,7 +497,7 @@ mips_error (char *string,...)
   printf_unfiltered ("Ending remote MIPS debugging.\n");
   target_mourn_inferior ();
 
-  return_to_top_level (RETURN_ERROR);
+  throw_exception (RETURN_ERROR);
 }
 
 /* putc_readable - print a character, displaying non-printable chars in
@@ -1493,7 +1495,7 @@ mips_initialize (void)
 
   mips_request ('r', 0, 0, &err, mips_receive_wait, NULL);
   set_current_frame (create_new_frame (read_fp (), read_pc ()));
-  select_frame (get_current_frame (), 0);
+  select_frame (get_current_frame ());
 }
 
 /* Open a connection to the remote board.  */
@@ -1619,7 +1621,7 @@ device is attached to the target board (e.g., /dev/ttya).\n"
   registers_changed ();
   stop_pc = read_pc ();
   set_current_frame (create_new_frame (read_fp (), stop_pc));
-  select_frame (get_current_frame (), 0);
+  select_frame (get_current_frame ());
   print_stack_frame (selected_frame, -1, 1);
   xfree (serial_port_name);
 }
@@ -2066,8 +2068,7 @@ static int mask_address_p = 1;
 
 static int
 mips_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
-                 struct mem_attrib *attrib ATTRIBUTE_UNUSED,
-                 struct target_ops *target ATTRIBUTE_UNUSED)
+                 struct mem_attrib *attrib, struct target_ops *target)
 {
   int i;
   CORE_ADDR addr;
@@ -2185,7 +2186,7 @@ Give up (and stop debugging it)? "))
          printf_unfiltered ("Ending remote MIPS debugging.\n");
          target_mourn_inferior ();
 
-         return_to_top_level (RETURN_QUIT);
+         throw_exception (RETURN_QUIT);
        }
 
       target_terminal_inferior ();
@@ -2845,6 +2846,9 @@ mips_load_srec (char *args)
              reclen = mips_make_srec (srec, '3', s->vma + i, buffer, numbytes);
              send_srec (srec, reclen, s->vma + i);
 
+             if (ui_load_progress_hook)
+               ui_load_progress_hook (s->name, i);
+
              if (hashmark)
                {
                  putchar_unfiltered ('#');
@@ -3366,6 +3370,9 @@ pmon_load_fast (char *file)
                            break;
                          }
 
+                       if (ui_load_progress_hook)
+                         ui_load_progress_hook (s->name, i);
+
                        if (hashmark)
                          {
                            putchar_unfiltered ('#');