* v850ice.c (do_gdb): New function.

        (ice_stepi): Use do_gdb to step properly.
        (ice_nexti): Use do_gdb to step properly.
        (view_source): Correct call to src window's location for new version.

2 files changed, 30 insertions, 11 deletions

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index b787332..d34f3d2 100644
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,3 +1,10 @@
+1998-11-03  Keith Seitz  <keiths@cygnus.com>
+
+        * v850ice.c (do_gdb): New function.
+        (ice_stepi): Use do_gdb to step properly.
+        (ice_nexti): Use do_gdb to step properly.
+        (view_source): Correct call to src window's location for new version.
+
 Wed Oct 28 16:19:02 1998  Martin M. Hunt  <hunt@cygnus.com>
 
 	* gdbtk-cmds.c (gdb_set_bp_addr): For callback, send full 
diff --git a/gdb/v850ice.c b/gdb/v850ice.c
index bbf5b9e..1e869ea 100755
--- a/gdb/v850ice.c
+++ b/gdb/v850ice.c
@@ -124,6 +124,9 @@ static void togdb_force_update PARAMS ((void));
 
 static void view_source PARAMS ((CORE_ADDR));
 
+static void do_gdb (char *, char *, int);
+
+
 /* Globals */
 static HWND hidden_hwnd;                 /* HWND for messages */
 
@@ -843,17 +846,30 @@ ice_cont (c)
   return 1;
 }
 
+static void
+do_gdb (cmd, str, count)
+     char *cmd;
+     char *str;
+     int count;
+{
+
+  ReplyMessage ((LRESULT) 1);
+
+  while (count--)
+    {
+      printf_unfiltered (str);
+      Tcl_Eval (gdbtk_interp, cmd);
+    }
+}
+
+
 static int
 ice_stepi (c)
   char *c;
 {
-  char string[50] = "\0";
   int count = (int) c;
 
-  sprintf (string, "gdb_immediate stepi %d", count);
-  printf_unfiltered ("stepi (ice)\n");
-  ReplyMessage ((LRESULT) 1);
-  Tcl_Eval (gdbtk_interp, string);
+  do_gdb ("gdb_immediate stepi", "stepi (ice)\n", count);
   return 1;
 }
 
@@ -861,13 +877,9 @@ static int
 ice_nexti (c)
   char *c;
 {
-  char string[50] = "\0";
   int count = (int) c;
 
-  sprintf (string, "gdb_immediate nexti %d", count);
-  printf_unfiltered ("nexti (ice)\n");
-  ReplyMessage ((LRESULT) 1);
-  Tcl_Eval (gdbtk_interp, string);
+  do_gdb ("gdb_immediate nexti", "nexti (ice)\n", count);
   return 1;
 }
 
@@ -896,7 +908,7 @@ view_source (addr)
 {
   char c[256];
 
-  sprintf (c, "set src [lindex [manage find src] 0]\n$src location [gdb_loc *0x%x]", addr);
+  sprintf (c, "set src [lindex [manage find src] 0]\n$src location BROWSE [gdb_loc *0x%x]", addr);
   Tcl_Eval (gdbtk_interp, c);
 }