X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmi%2Fmi-out.c;h=95132678013017f489ab6375649d5de2300ab3b0;hb=173981bc49c9e8fce9271cb47714952dbe2ec627;hp=c389097cf6cbd19f14a98e9f295fd7ba6d2aa6b7;hpb=fb40c20903110ed8af9701ce7c2635abd3770d52;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index c389097cf6..9513267801 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -1,12 +1,14 @@
 /* MI Command Set - output generating routines.
-   Copyright (C) 2000, Free Software Foundation, Inc.
-   Contributed by Cygnus Solutions.
+
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
+
+   Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,66 +17,68 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "ui-out.h"
 #include "mi-out.h"
+#include "vec.h"
 
-/* Convenience macro for allocting typesafe memory. */
-
-#ifndef XMALLOC
-#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE))
-#endif
+typedef struct ui_file *ui_filep;
+DEF_VEC_P (ui_filep);
 
 struct ui_out_data
   {
-    int supress_field_separator;
-    int first_header;
-    struct ui_file *buffer;
+    int suppress_field_separator;
+    int suppress_output;
+    int mi_version;
+    VEC (ui_filep) *streams;
   };
+typedef struct ui_out_data mi_out_data;
 
 /* These are the MI output functions */
 
-static void mi_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid);
+static void mi_out_data_dtor (struct ui_out *ui_out);
+static void mi_table_begin (struct ui_out *uiout, int nbrofcols,
+			    int nr_rows, const char *tblid);
 static void mi_table_body (struct ui_out *uiout);
 static void mi_table_end (struct ui_out *uiout);
 static void mi_table_header (struct ui_out *uiout, int width,
-			     enum ui_align alig, char *colhdr);
-static void mi_list_begin (struct ui_out *uiout, int list_flag, char *lstid);
-static void mi_list_end (struct ui_out *uiout, int list_flag);
+			     enum ui_align alig, const char *col_name,
+			     const char *colhdr);
+static void mi_begin (struct ui_out *uiout, enum ui_out_type type,
+		      int level, const char *id);
+static void mi_end (struct ui_out *uiout, enum ui_out_type type, int level);
 static void mi_field_int (struct ui_out *uiout, int fldno, int width,
-			  enum ui_align alig, char *fldname, int value);
+			  enum ui_align alig, const char *fldname, int value);
 static void mi_field_skip (struct ui_out *uiout, int fldno, int width,
-			   enum ui_align alig, char *fldname);
+			   enum ui_align alig, const char *fldname);
 static void mi_field_string (struct ui_out *uiout, int fldno, int width,
-			     enum ui_align alig, char *fldname,
+			     enum ui_align alig, const char *fldname,
 			     const char *string);
 static void mi_field_fmt (struct ui_out *uiout, int fldno,
 			  int width, enum ui_align align,
-			  char *fldname, char *format, va_list args);
+			  const char *fldname, const char *format,
+			  va_list args) ATTRIBUTE_PRINTF (6, 0);
 static void mi_spaces (struct ui_out *uiout, int numspaces);
-static void mi_text (struct ui_out *uiout, char *string);
-static void mi_message (struct ui_out *uiout, int verbosity, char *format,
-			va_list args);
+static void mi_text (struct ui_out *uiout, const char *string);
+static void mi_message (struct ui_out *uiout, int verbosity,
+			const char *format, va_list args)
+     ATTRIBUTE_PRINTF (3, 0);
 static void mi_wrap_hint (struct ui_out *uiout, char *identstring);
 static void mi_flush (struct ui_out *uiout);
+static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream);
 
 /* This is the MI ui-out implementation functions vector */
 
-/* FIXME: This can be initialized dynamically after default is set to
-   handle initial output in main.c */
-
-struct ui_out_impl mi_ui_out_impl =
+static const struct ui_out_impl mi_ui_out_impl =
 {
   mi_table_begin,
   mi_table_body,
   mi_table_end,
   mi_table_header,
-  mi_list_begin,
-  mi_list_end,
+  mi_begin,
+  mi_end,
   mi_field_int,
   mi_field_skip,
   mi_field_string,
@@ -83,319 +87,358 @@ struct ui_out_impl mi_ui_out_impl =
   mi_text,
   mi_message,
   mi_wrap_hint,
-  mi_flush
+  mi_flush,
+  mi_redirect,
+  mi_out_data_dtor,
+  1, /* Needs MI hacks.  */
 };
 
 /* Prototypes for local functions */
 
-extern void _initialize_mi_out PARAMS ((void));
+extern void _initialize_mi_out (void);
 static void field_separator (struct ui_out *uiout);
-static void list_open (struct ui_out *uiout);
-static void list_close (struct ui_out *uiout);
-
-static void out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
-			   char *format,...);
+static void mi_open (struct ui_out *uiout, const char *name,
+		     enum ui_out_type type);
+static void mi_close (struct ui_out *uiout, enum ui_out_type type);
 
-/* Mark beginning of a table */
+/* Mark beginning of a table.  */
 
 void
-mi_table_begin (uiout, nbrofcols, tblid)
-     struct ui_out *uiout;
-     int nbrofcols;
-     char *tblid;
+mi_table_begin (struct ui_out *uiout,
+		int nr_cols,
+		int nr_rows,
+		const char *tblid)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  field_separator (uiout);
-  if (tblid)
-    fprintf_unfiltered (data->buffer, "%s=", tblid);
-  list_open (uiout);
-  data->first_header = 0;
-  data->supress_field_separator = 1;
+  mi_open (uiout, tblid, ui_out_type_tuple);
+  mi_field_int (uiout, -1, -1, ui_left, "nr_rows", nr_rows);
+  mi_field_int (uiout, -1, -1, ui_left, "nr_cols", nr_cols);
+  mi_open (uiout, "hdr", ui_out_type_list);
 }
 
-/* Mark beginning of a table body */
+/* Mark beginning of a table body.  */
 
 void
-mi_table_body (uiout)
-     struct ui_out *uiout;
+mi_table_body (struct ui_out *uiout)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  if (data->suppress_output)
+    return;
   /* close the table header line if there were any headers */
-  if (data->first_header)
-    list_close (uiout);
+  mi_close (uiout, ui_out_type_list);
+  mi_open (uiout, "body", ui_out_type_list);
 }
 
-/* Mark end of a table */
+/* Mark end of a table.  */
 
 void
-mi_table_end (uiout)
-     struct ui_out *uiout;
+mi_table_end (struct ui_out *uiout)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  list_close (uiout);
-  /* If table was empty this flag did not get reset yet */
-  data->supress_field_separator = 0;
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  data->suppress_output = 0;
+  mi_close (uiout, ui_out_type_list); /* body */
+  mi_close (uiout, ui_out_type_tuple);
 }
 
-/* Specify table header */
+/* Specify table header.  */
 
 void
-mi_table_header (uiout, width, alignment, colhdr)
-     struct ui_out *uiout;
-     int width;
-     int alignment;
-     char *colhdr;
+mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
+		 const char *col_name, const char *colhdr)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  if (!data->first_header++)
-    {
-      fputs_unfiltered ("hdr=", data->buffer);
-      list_open (uiout);
-    }
-  mi_field_string (uiout, 0, width, alignment, 0, colhdr);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  if (data->suppress_output)
+    return;
+
+  mi_open (uiout, NULL, ui_out_type_tuple);
+  mi_field_int (uiout, 0, 0, ui_center, "width", width);
+  mi_field_int (uiout, 0, 0, ui_center, "alignment", alignment);
+  mi_field_string (uiout, 0, 0, ui_center, "col_name", col_name);
+  mi_field_string (uiout, 0, width, alignment, "colhdr", colhdr);
+  mi_close (uiout, ui_out_type_tuple);
 }
 
-/* Mark beginning of a list */
+/* Mark beginning of a list.  */
 
 void
-mi_list_begin (uiout, list_flag, lstid)
-     struct ui_out *uiout;
-     int list_flag;
-     char *lstid;
+mi_begin (struct ui_out *uiout, enum ui_out_type type, int level,
+	  const char *id)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  field_separator (uiout);
-  data->supress_field_separator = 1;
-  if (lstid)
-    fprintf_unfiltered (data->buffer, "%s=", lstid);
-  list_open (uiout);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  if (data->suppress_output)
+    return;
+
+  mi_open (uiout, id, type);
 }
 
-/* Mark end of a list */
+/* Mark end of a list.  */
 
 void
-mi_list_end (uiout, list_flag)
-     struct ui_out *uiout;
-     int list_flag;
+mi_end (struct ui_out *uiout, enum ui_out_type type, int level)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  list_close (uiout);
-  /* If list was empty this flag did not get reset yet */
-  data->supress_field_separator = 0;
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  if (data->suppress_output)
+    return;
+
+  mi_close (uiout, type);
 }
 
-/* output an int field */
+/* Output an int field.  */
 
-void
-mi_field_int (uiout, fldno, width, alignment, fldname, value)
-     struct ui_out *uiout;
-     int fldno;
-     int width;
-     int alignment;
-     char *fldname;
-     int value;
+static void
+mi_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? */
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  if (data->suppress_output)
+    return;
 
-  sprintf (buffer, "%d", value);
+  xsnprintf (buffer, sizeof (buffer), "%d", value);
   mi_field_string (uiout, fldno, width, alignment, fldname, buffer);
 }
 
-/* used to ommit a field */
+/* Used to omit a field.  */
 
 void
-mi_field_skip (uiout, fldno, width, alignment, fldname)
-     struct ui_out *uiout;
-     int fldno;
-     int width;
-     int alignment;
-     char *fldname;
+mi_field_skip (struct ui_out *uiout, int fldno, int width,
+               enum ui_align alignment, const char *fldname)
 {
-  mi_field_string (uiout, fldno, width, alignment, fldname, "");
 }
 
-/* other specific mi_field_* end up here so alignment and field
-   separators are both handled by mi_field_string */
+/* Other specific mi_field_* end up here so alignment and field
+   separators are both handled by mi_field_string. */
 
 void
-mi_field_string (struct ui_out *uiout,
-		 int fldno,
-		 int width,
-		 int align,
-		 char *fldname,
-		 const char *string)
+mi_field_string (struct ui_out *uiout, int fldno, int width,
+		 enum ui_align align, const char *fldname, const char *string)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream;
+
+  if (data->suppress_output)
+    return;
+
+  stream = VEC_last (ui_filep, data->streams);
   field_separator (uiout);
   if (fldname)
-    fprintf_unfiltered (data->buffer, "%s=", fldname);
-  fprintf_unfiltered (data->buffer, "\"");
+    fprintf_unfiltered (stream, "%s=", fldname);
+  fprintf_unfiltered (stream, "\"");
   if (string)
-    fputstr_unfiltered (string, '"', data->buffer);
-  fprintf_unfiltered (data->buffer, "\"");
+    fputstr_unfiltered (string, '"', stream);
+  fprintf_unfiltered (stream, "\"");
 }
 
-/* This is the only field function that does not align */
+/* This is the only field function that does not align.  */
 
 void
-mi_field_fmt (struct ui_out *uiout, int fldno,
-	      int width, enum ui_align align,
-	      char *fldname, char *format, va_list args)
+mi_field_fmt (struct ui_out *uiout, int fldno, int width,
+	      enum ui_align align, const char *fldname,
+	      const char *format, va_list args)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream;
+
+  if (data->suppress_output)
+    return;
+
+  stream = VEC_last (ui_filep, data->streams);
   field_separator (uiout);
   if (fldname)
-    fprintf_unfiltered (data->buffer, "%s=\"", fldname);
+    fprintf_unfiltered (stream, "%s=\"", fldname);
   else
-    fputs_unfiltered ("\"", data->buffer);
-  vfprintf_unfiltered (data->buffer, format, args);
-  fputs_unfiltered ("\"", data->buffer);
+    fputs_unfiltered ("\"", stream);
+  vfprintf_unfiltered (stream, format, args);
+  fputs_unfiltered ("\"", stream);
 }
 
 void
-mi_spaces (uiout, numspaces)
-     struct ui_out *uiout;
-     int numspaces;
+mi_spaces (struct ui_out *uiout, int numspaces)
 {
 }
 
 void
-mi_text (uiout, string)
-     struct ui_out *uiout;
-     char *string;
+mi_text (struct ui_out *uiout, const char *string)
 {
 }
 
 void
-mi_message (struct ui_out *uiout, int verbosity, char *format, va_list args)
+mi_message (struct ui_out *uiout, int verbosity,
+	    const char *format, va_list args)
 {
 }
 
 void
-mi_wrap_hint (uiout, identstring)
-     struct ui_out *uiout;
-     char *identstring;
+mi_wrap_hint (struct ui_out *uiout, char *identstring)
 {
   wrap_here (identstring);
 }
 
 void
-mi_flush (uiout)
-     struct ui_out *uiout;
+mi_flush (struct ui_out *uiout)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  gdb_flush (data->buffer);
-}
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
 
-/* local functions */
-
-/* Like mi_field_fmt, but takes a variable number of args
-   and makes a va_list and does not insert a separator */
+  gdb_flush (stream);
+}
 
-/* VARARGS */
-static void
-out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
-	       char *format,...)
+int
+mi_redirect (struct ui_out *uiout, struct ui_file *outstream)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  va_list args;
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
 
-  field_separator (uiout);
-  if (fldname)
-    fprintf_unfiltered (data->buffer, "%s=\"", fldname);
+  if (outstream != NULL)
+    VEC_safe_push (ui_filep, data->streams, outstream);
   else
-    fputs_unfiltered ("\"", data->buffer);
-
-  va_start (args, format);
-  vfprintf_unfiltered (data->buffer, format, args);
+    VEC_pop (ui_filep, data->streams);
 
-  fputs_unfiltered ("\"", data->buffer);
-
-  va_end (args);
+  return 0;
 }
 
+/* local functions */
+
 /* access to ui_out format private members */
 
 static void
 field_separator (struct ui_out *uiout)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  if (data->supress_field_separator)
-    data->supress_field_separator = 0;
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  if (data->suppress_field_separator)
+    data->suppress_field_separator = 0;
   else
-    fputc_unfiltered (',', data->buffer);
+    fputc_unfiltered (',', stream);
 }
 
 static void
-list_open (struct ui_out *uiout)
+mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  fputc_unfiltered ('{', data->buffer);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  field_separator (uiout);
+  data->suppress_field_separator = 1;
+  if (name)
+    fprintf_unfiltered (stream, "%s=", name);
+  switch (type)
+    {
+    case ui_out_type_tuple:
+      fputc_unfiltered ('{', stream);
+      break;
+    case ui_out_type_list:
+      fputc_unfiltered ('[', stream);
+      break;
+    default:
+      internal_error (__FILE__, __LINE__, _("bad switch"));
+    }
 }
 
 static void
-list_close (struct ui_out *uiout)
+mi_close (struct ui_out *uiout, enum ui_out_type type)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  fputc_unfiltered ('}', data->buffer);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  switch (type)
+    {
+    case ui_out_type_tuple:
+      fputc_unfiltered ('}', stream);
+      break;
+    case ui_out_type_list:
+      fputc_unfiltered (']', stream);
+      break;
+    default:
+      internal_error (__FILE__, __LINE__, _("bad switch"));
+    }
+  data->suppress_field_separator = 0;
 }
 
-/* add a string to the buffer */
+/* Add a string to the buffer.  */
 
 void
 mi_out_buffered (struct ui_out *uiout, char *string)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  fprintf_unfiltered (data->buffer, "%s", string);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  fprintf_unfiltered (stream, "%s", string);
 }
 
-/* clear the buffer */
+/* Clear the buffer.  */
 
 void
 mi_out_rewind (struct ui_out *uiout)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  ui_file_rewind (data->buffer);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *stream = VEC_last (ui_filep, data->streams);
+
+  ui_file_rewind (stream);
 }
 
-/* dump the buffer onto the specified stream */
+/* Dump the buffer onto the specified stream.  */
 
-static void
-do_write (void *data, const char *buffer, long length_buffer)
+void
+mi_out_put (struct ui_out *uiout, struct ui_file *stream)
 {
-  ui_file_write (data, buffer, length_buffer);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+  struct ui_file *outstream = VEC_last (ui_filep, data->streams);
+
+  ui_file_put (outstream, ui_file_write_for_put, stream);
+  ui_file_rewind (outstream);
 }
 
-void
-mi_out_put (struct ui_out *uiout,
-	    struct ui_file *stream)
+/* Return the current MI version.  */
+
+int
+mi_version (struct ui_out *uiout)
 {
-  struct ui_out_data *data = ui_out_data (uiout);
-  ui_file_put (data->buffer, do_write, stream);
-  ui_file_rewind (data->buffer);
+  mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+
+  return data->mi_version;
 }
 
-/* initalize private members at startup */
+/* Constructor for an `mi_out_data' object.  */
 
-struct ui_out *
-mi_out_new (void)
+static void
+mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream)
 {
-  int flags = 0;
-  struct ui_out_data *data = XMALLOC (struct ui_out_data);
-  data->supress_field_separator = 0;
-  /* FIXME: This code should be using a ``string_file'' and not the
-     TUI buffer hack. */
-  data->buffer = mem_fileopen ();
-  return ui_out_new (&mi_ui_out_impl, data, flags);
+  gdb_assert (stream != NULL);
+
+  self->streams = NULL;
+  VEC_safe_push (ui_filep, self->streams, stream);
+
+  self->suppress_field_separator = 0;
+  self->suppress_output = 0;
+  self->mi_version = mi_version;
 }
 
-/* standard gdb initialization hook */
-void
-_initialize_mi_out ()
+/* The destructor.  */
+
+static void
+mi_out_data_dtor (struct ui_out *ui_out)
 {
-  /* nothing happens here */
+  mi_out_data *data = (mi_out_data *) ui_out_data (ui_out);
+
+  VEC_free (ui_filep, data->streams);
+  xfree (data);
 }
 
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-mi" */
-/* End: */
+/* Initialize private members at startup.  */
+
+struct ui_out *
+mi_out_new (int mi_version)
+{
+  int flags = 0;
+  mi_out_data *data = XNEW (mi_out_data);
+  struct ui_file *stream = mem_fileopen ();
+
+  mi_out_data_ctor (data, mi_version, stream);
+  return ui_out_new (&mi_ui_out_impl, data, flags);
+}