convert to_get_min_fast_tracepoint_insn_len

[deliverable/binutils-gdb.git] / gdb / cli-out.c

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 67a8a22e914923ac7328682401ae68517fb0a282..b936f30a93d6ff755af4bef41781314699a8d44f 100644 (file)
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -1,7 +1,6 @@
 /* Output generating routines for GDB CLI.
 
-   Copyright (C) 1999, 2000, 2002, 2003, 2005, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
@@ -24,8 +23,9 @@
 #include "defs.h"
 #include "ui-out.h"
 #include "cli-out.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
+#include "vec.h"
 
 typedef struct cli_ui_out_data cli_out_data;
 
@@ -38,7 +38,7 @@ static void field_separator (void);
 
 static void out_field_fmt (struct ui_out *uiout, int fldno,
                           const char *fldname,
-                          const char *format,...) ATTR_FORMAT (printf, 4, 5);
+                          const char *format,...) ATTRIBUTE_PRINTF (4, 5);
 
 /* These are the CLI output functions */
 
@@ -50,6 +50,7 @@ cli_table_begin (struct ui_out *uiout, int nbrofcols,
                 const char *tblid)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (nr_rows == 0)
     data->suppress_output = 1;
   else
@@ -64,6 +65,7 @@ static void
 cli_table_body (struct ui_out *uiout)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
   /* first, close the table header line */
@@ -76,6 +78,7 @@ static void
 cli_table_end (struct ui_out *uiout)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   data->suppress_output = 0;
 }
 
@@ -87,6 +90,7 @@ cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
                  const char *colhdr)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
 
@@ -104,6 +108,7 @@ cli_begin (struct ui_out *uiout,
           const char *id)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
 }
@@ -116,6 +121,7 @@ cli_end (struct ui_out *uiout,
         int level)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
 }
@@ -127,12 +133,12 @@ cli_field_int (struct ui_out *uiout, int fldno, int width,
               enum ui_align alignment,
               const char *fldname, int value)
 {
-  char buffer[20];             /* FIXME: how many chars long a %d can become? */
-
+  char buffer[20];     /* FIXME: how many chars long a %d can become? */
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
-  sprintf (buffer, "%d", value);
+  xsnprintf (buffer, sizeof (buffer), "%d", value);
 
   /* Always go through the function pointer (virtual function call).
      We may have been extended.  */
@@ -147,6 +153,7 @@ cli_field_skip (struct ui_out *uiout, int fldno, int width,
                const char *fldname)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
 
@@ -168,8 +175,8 @@ cli_field_string (struct ui_out *uiout,
 {
   int before = 0;
   int after = 0;
-
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
 
@@ -209,7 +216,7 @@ cli_field_string (struct ui_out *uiout,
 
 /* This is the only field function that does not align.  */
 
-static void
+static void ATTRIBUTE_PRINTF (6, 0)
 cli_field_fmt (struct ui_out *uiout, int fldno,
               int width, enum ui_align align,
               const char *fldname,
@@ -217,10 +224,13 @@ cli_field_fmt (struct ui_out *uiout, int fldno,
               va_list args)
 {
   cli_out_data *data = ui_out_data (uiout);
+  struct ui_file *stream;
+
   if (data->suppress_output)
     return;
 
-  vfprintf_filtered (data->stream, format, args);
+  stream = VEC_last (ui_filep, data->streams);
+  vfprintf_filtered (stream, format, args);
 
   if (align != ui_noalign)
     field_separator ();
@@ -230,35 +240,50 @@ static void
 cli_spaces (struct ui_out *uiout, int numspaces)
 {
   cli_out_data *data = ui_out_data (uiout);
+  struct ui_file *stream;
+
   if (data->suppress_output)
     return;
-  print_spaces_filtered (numspaces, data->stream);
+
+  stream = VEC_last (ui_filep, data->streams);
+  print_spaces_filtered (numspaces, stream);
 }
 
 static void
 cli_text (struct ui_out *uiout, const char *string)
 {
   cli_out_data *data = ui_out_data (uiout);
+  struct ui_file *stream;
+
   if (data->suppress_output)
     return;
-  fputs_filtered (string, data->stream);
+
+  stream = VEC_last (ui_filep, data->streams);
+  fputs_filtered (string, stream);
 }
 
-static void ATTR_FORMAT (printf, 3,0)
+static void ATTRIBUTE_PRINTF (3, 0)
 cli_message (struct ui_out *uiout, int verbosity,
             const char *format, va_list args)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
+
   if (ui_out_get_verblvl (uiout) >= verbosity)
-    vfprintf_unfiltered (data->stream, format, args);
+    {
+      struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+      vfprintf_unfiltered (stream, format, args);
+    }
 }
 
 static void
 cli_wrap_hint (struct ui_out *uiout, char *identstring)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (data->suppress_output)
     return;
   wrap_here (identstring);
@@ -268,23 +293,24 @@ static void
 cli_flush (struct ui_out *uiout)
 {
   cli_out_data *data = ui_out_data (uiout);
-  gdb_flush (data->stream);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  gdb_flush (stream);
 }
 
+/* OUTSTREAM as non-NULL will push OUTSTREAM on the stack of output streams
+   and make it therefore active.  OUTSTREAM as NULL will pop the last pushed
+   output stream; it is an internal error if it does not exist.  */
+
 static int
 cli_redirect (struct ui_out *uiout, struct ui_file *outstream)
 {
   cli_out_data *data = ui_out_data (uiout);
+
   if (outstream != NULL)
-    {
-      data->original_stream = data->stream;
-      data->stream = outstream;
-    }
-  else if (data->original_stream != NULL)
-    {
-      data->stream = data->original_stream;
-      data->original_stream = NULL;
-    }
+    VEC_safe_push (ui_filep, data->streams, outstream);
+  else
+    VEC_pop (ui_filep, data->streams);
 
   return 0;
 }
@@ -301,10 +327,11 @@ out_field_fmt (struct ui_out *uiout, int fldno,
               const char *format,...)
 {
   cli_out_data *data = ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
   va_list args;
 
   va_start (args, format);
-  vfprintf_filtered (data->stream, format, args);
+  vfprintf_filtered (stream, format, args);
 
   va_end (args);
 }
@@ -314,8 +341,10 @@ out_field_fmt (struct ui_out *uiout, int fldno,
 static void
 field_separator (void)
 {
-  cli_out_data *data = ui_out_data (uiout);
-  fputc_filtered (' ', data->stream);
+  cli_out_data *data = ui_out_data (current_uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  fputc_filtered (' ', stream);
 }
 
 /* This is the CLI ui-out implementation functions vector */
@@ -341,6 +370,7 @@ struct ui_out_impl cli_ui_out_impl =
   cli_wrap_hint,
   cli_flush,
   cli_redirect,
+  0,
   0, /* Does not need MI hacks (i.e. needs CLI hacks).  */
 };
 
@@ -349,8 +379,11 @@ struct ui_out_impl cli_ui_out_impl =
 void
 cli_out_data_ctor (cli_out_data *self, struct ui_file *stream)
 {
-  self->stream = stream;
-  self->original_stream = NULL;
+  gdb_assert (stream != NULL);
+
+  self->streams = NULL;
+  VEC_safe_push (ui_filep, self->streams, stream);
+
   self->suppress_output = 0;
 }
 
@@ -360,8 +393,8 @@ struct ui_out *
 cli_out_new (struct ui_file *stream)
 {
   int flags = ui_source_list;
+  cli_out_data *data = XNEW (cli_out_data);
 
-  cli_out_data *data = XMALLOC (cli_out_data);
   cli_out_data_ctor (data, stream);
   return ui_out_new (&cli_ui_out_impl, data, flags);
 }
@@ -370,7 +403,10 @@ struct ui_file *
 cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream)
 {
   cli_out_data *data = ui_out_data (uiout);
-  struct ui_file *old = data->stream;
-  data->stream = stream;
+  struct ui_file *old;
+  
+  old = VEC_pop (ui_filep, data->streams);
+  VEC_quick_push (ui_filep, data->streams, stream);
+
   return old;
 }