Change backtrace_command_1 calling to use flags

The next patch will add more flags to backtrace_command_1; and rather
than add another boolean argument, this patch changes it to accept a
flags value.

gdb/ChangeLog
2018-03-26  Tom Tromey  <tom@tromey.com>

	* stack.c (backtrace_command_1): Remove "show_locals" parameter,
	add "flags".
	(backtrace_command): Remove "fulltrace", add "flags".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 532826c8716e707272e08dd71aee9b897d11c673..ed1d9dda62f9534a7fa3d8313ab436d27d0e5f60 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-26  Tom Tromey  <tom@tromey.com>
+
+       * stack.c (backtrace_command_1): Remove "show_locals" parameter,
+       add "flags".
+       (backtrace_command): Remove "fulltrace", add "flags".
+
 2018-03-26  Tom Tromey  <tom@tromey.com>
 
        * stack.c (backtrace_command): Rewrite command line parsing.

diff --git a/gdb/stack.c b/gdb/stack.c
index 13af6594a922c7f9b16063bda4d6babefdd27993..76695ff7e61f1c3cad9bedebae37b6c0bd9d7fde 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1692,8 +1692,8 @@ info_frame_command (const char *addr_exp, int from_tty)
    frames.  */
 
 static void
-backtrace_command_1 (const char *count_exp, int show_locals, int no_filters,
-                    int from_tty)
+backtrace_command_1 (const char *count_exp, frame_filter_flags flags,
+                    int no_filters, int from_tty)
 {
   struct frame_info *fi;
   int count;
@@ -1775,11 +1775,9 @@ backtrace_command_1 (const char *count_exp, int show_locals, int no_filters,
 
   if (! no_filters)
     {
-      frame_filter_flags flags = PRINT_LEVEL | PRINT_FRAME_INFO | PRINT_ARGS;
       enum ext_lang_frame_args arg_type;
 
-      if (show_locals)
-       flags |= PRINT_LOCALS;
+      flags |= PRINT_LEVEL | PRINT_FRAME_INFO | PRINT_ARGS;
       if (from_tty)
        flags |= PRINT_MORE_FRAMES;
 
@@ -1809,7 +1807,7 @@ backtrace_command_1 (const char *count_exp, int show_locals, int no_filters,
             the frame->prev field gets set to NULL in that case).  */
 
          print_frame_info (fi, 1, LOCATION, 1, 0);
-         if (show_locals)
+         if ((flags & PRINT_LOCALS) != 0)
            {
              struct frame_id frame_id = get_frame_id (fi);
 
@@ -1850,8 +1848,8 @@ backtrace_command_1 (const char *count_exp, int show_locals, int no_filters,
 static void
 backtrace_command (const char *arg, int from_tty)
 {
-  bool fulltrace = false;
   bool filters = true;
+  frame_filter_flags flags = 0;
 
   if (arg)
     {
@@ -1868,7 +1866,7 @@ backtrace_command (const char *arg, int from_tty)
          if (subset_compare (this_arg.c_str (), "no-filters"))
            filters = false;
          else if (subset_compare (this_arg.c_str (), "full"))
-           fulltrace = true;
+           flags |= PRINT_LOCALS;
          else
            {
              /* Not a recognized argument, so stop.  */
@@ -1881,8 +1879,7 @@ backtrace_command (const char *arg, int from_tty)
        arg = NULL;
     }
 
-  backtrace_command_1 (arg, fulltrace /* show_locals */,
-                      !filters /* no frame-filters */, from_tty);
+  backtrace_command_1 (arg, flags, !filters /* no frame-filters */, from_tty);
 }
 
 /* Iterate over the local variables of a block B, calling CB with