From 1a2aab69f1955c55a2495dce94deef22162d3959 Mon Sep 17 00:00:00 2001 From: Peter Schauer Date: Mon, 6 Nov 2000 20:25:36 +0000 Subject: [PATCH] * stack.c (return_command): Pop dummy frame if we just returned from a stop in a call dummy. --- gdb/ChangeLog | 5 +++++ gdb/stack.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6bf3f03fa81..264e7441086 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2000-11-06 Peter Schauer + + * stack.c (return_command): Pop dummy frame if we just returned from + a stop in a call dummy. + 2000-11-05 Kevin Buettner * v850-tdep.c (handle_prepare, handle_pushm): Remove extraneous diff --git a/gdb/stack.c b/gdb/stack.c index 859627671e1..e0f38e27cf9 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1892,6 +1892,12 @@ return_command (char *retval_exp, int from_tty) if (retval_exp) set_return_value (return_value); + /* If we are at the end of a call dummy now, pop the dummy frame too. */ + + if (CALL_DUMMY_HAS_COMPLETED (read_pc(), read_sp (), + FRAME_FP (get_current_frame ()))) + POP_FRAME; + /* If interactive, print the frame that is now current. */ if (from_tty) -- 2.30.2