From d7d1098dcab8fc681e39923b449df759d4866d7e Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Fri, 1 Nov 1991 02:16:20 +0000 Subject: [PATCH] * 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. --- gdb/ChangeLog | 6 ++++++ gdb/infrun.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 93321877e2..3045478a8d 100644 --- 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 e674d4d156..bb23c94b37 100644 --- 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;