aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStu Grossman <grossman@cygnus>1993-09-16 20:18:26 +0000
committerStu Grossman <grossman@cygnus>1993-09-16 20:18:26 +0000
commitc9de302ba51a69ae54c6640571fe9f8ed491095c (patch)
treebf48defa386bbfab3d40ccaf7c99056b96f13ae7
parent2670a1dd47e64e00b99cc78fadefb6bf5db21351 (diff)
downloadgdb-c9de302ba51a69ae54c6640571fe9f8ed491095c.zip
gdb-c9de302ba51a69ae54c6640571fe9f8ed491095c.tar.gz
gdb-c9de302ba51a69ae54c6640571fe9f8ed491095c.tar.bz2
* infrun.c (wait_for_inferior): Allow user to single step within
a stack dummy.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c19
2 files changed, 16 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8d227c6..c0e0d69 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 16 13:16:22 1993 Stu Grossman (grossman at cygnus.com)
+
+ * infrun.c (wait_for_inferior): Allow user to single step within
+ a stack dummy.
+
Thu Sep 16 12:34:01 1993 Jim Kingdon (kingdon@cirdan.cygnus.com)
* dbxread.c (copy_pending): Deal with END NULL.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 020ef5b..a9d8a64 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -888,16 +888,19 @@ wait_for_inferior ()
do not stop. */
/* If this is the breakpoint at the end of a stack dummy,
- just stop silently. */
- if (PC_IN_CALL_DUMMY (stop_pc, stop_sp, stop_frame_address))
- {
- stop_print_frame = 0;
- stop_stack_dummy = 1;
+ just stop silently, unless the user was doing an si/ni, in which
+ case she'd better know what she's doing. */
+
+ if (PC_IN_CALL_DUMMY (stop_pc, stop_sp, stop_frame_address)
+ && !step_range_end)
+ {
+ stop_print_frame = 0;
+ stop_stack_dummy = 1;
#ifdef HP_OS_BUG
- trap_expected_after_continue = 1;
+ trap_expected_after_continue = 1;
#endif
- break;
- }
+ break;
+ }
if (step_resume_breakpoint)
/* Having a step-resume breakpoint overrides anything