* infrun.c (wait_for_inferior): another stepi/nexti fix. Ensure

that stop_step is 1 at bottom of main loop.  I don't know why this
needs to be done, but it helps me sleep better at night.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 93321877e292052f03b9aa09be5529126198138a..3045478a8dfbd67acbed1018cf671d693cb2d898 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 31 18:12:43 1991  Stu Grossman  (grossman at cygnus.com)
+
+       * infrun.c (wait_for_inferior):  another stepi/nexti fix.  Ensure
+       that stop_step is 1 at bottom of main loop.  I don't know why this
+       needs to be done, but it helps me sleep better at night.
+
 Sun Oct 27 18:18:39 1991  Stu Grossman  (grossman at cygnus.com)
 
        * main.c (initialize_history):  Read history after reading all

diff --git a/gdb/infrun.c b/gdb/infrun.c
index e674d4d156dc716b83ed69d1e4592b40678bdf0c..bb23c94b378bef5557ecff69edb22869ac28a883 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1244,8 +1244,6 @@ wait_for_inferior ()
          /* No subroutine call; stop now.  */
          else
            {
-             if (step_range_end == 1) break; /* Don't do this for stepi/nexti */
-
              /* We've wandered out of the step range (but we haven't done a
                 subroutine call or return (that's handled elsewhere)).  We
                 don't really want to stop until we encounter the start of a
@@ -1253,7 +1251,8 @@ wait_for_inferior ()
                 step_range_start and step_range_end, and just continue. */
              sal = find_pc_line(stop_pc, 0);
              
-             if (sal.line == 0 || /* Stop now if no line # info */
+             if (step_range_end == 1 || /* Don't do this for stepi/nexti */
+                 sal.line == 0 ||       /* Stop now if no line # info */
                  (current_line != sal.line
                   && stop_pc == sal.pc)) {
                stop_step = 1;