aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/stack.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b333606..e1093cf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-27 Hui Zhu <hui@codesourcery.com>
+
+ * stack.c (print_frame_info): Call do_gdb_disassembly with
+ DUMMY_FRAME, SIGTRAMP_FRAME and ARCH_FRAME.
+
2014-04-26 Doug Evans <xdje42@gmail.com>
* guile/scm-safe-call.c (scscm_eval_scheme_string): Fix comment.
diff --git a/gdb/stack.c b/gdb/stack.c
index da7d977..6f08aae 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -836,6 +836,13 @@ print_frame_info (struct frame_info *frame, int print_level,
ui_out_text (uiout, "\n");
annotate_frame_end ();
+ /* If disassemble-next-line is set to auto or on output the next
+ instruction. */
+ if (disassemble_next_line == AUTO_BOOLEAN_AUTO
+ || disassemble_next_line == AUTO_BOOLEAN_TRUE)
+ do_gdb_disassembly (get_frame_arch (frame), 1,
+ get_frame_pc (frame), get_frame_pc (frame) + 1);
+
do_cleanups (uiout_cleanup);
return;
}