GDB 7.6.50

gdb/ui-out.c

Index: gdb/ui-out.c
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index afd15f9ea140709f23d41c9b10e7d17a9174489a..5c6b9d920f3ecd886433b89eb44e9b8ebaccfd26 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -1,7 +1,6 @@
 /* Output generating routines for GDB.
 
-   Copyright (C) 1999-2002, 2004-2005, 2007-2012 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
@@ -22,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "expression.h"		/* For language.h */
 #include "language.h"
 #include "ui-out.h"
@@ -54,6 +53,10 @@ struct ui_out_level
     enum ui_out_type type;
   };
 
+/* Define uiout->level vector types and operations.  */
+typedef struct ui_out_level *ui_out_level_p;
+DEF_VEC_P (ui_out_level_p);
+
 /* Tables are special.  Maintain a separate structure that tracks
    their state.  At present an output can only contain a single table
    but that restriction might eventually be lifted.  */
@@ -102,9 +105,11 @@ struct ui_out
     struct ui_out_impl *impl;
     void *data;
 
-    /* Sub structure tracking the ui-out depth.  */
+    /* Current level.  */
     int level;
-    struct ui_out_level levels[MAX_UI_OUT_LEVELS];
+
+    /* Vector to store and track the ui-out levels.  */
+    VEC (ui_out_level_p) *levels;
 
     /* A table, if any.  At present only a single table is supported.  */
     struct ui_out_table table;
@@ -114,7 +119,7 @@ struct ui_out
 static struct ui_out_level *
 current_level (struct ui_out *uiout)
 {
-  return &uiout->levels[uiout->level];
+  return VEC_index (ui_out_level_p, uiout->levels, uiout->level);
 }
 
 /* Create a new level, of TYPE.  Return the new level's index.  */
@@ -125,12 +130,11 @@ push_level (struct ui_out *uiout,
 {
   struct ui_out_level *current;
 
-  /* We had better not overflow the buffer.  */
   uiout->level++;
-  gdb_assert (uiout->level >= 0 && uiout->level < MAX_UI_OUT_LEVELS);
-  current = current_level (uiout);
+  current = XMALLOC (struct ui_out_level);
   current->field_count = 0;
   current->type = type;
+  VEC_safe_push (ui_out_level_p, uiout->levels, current);
   return uiout->level;
 }
 
@@ -140,9 +144,13 @@ static int
 pop_level (struct ui_out *uiout,
 	   enum ui_out_type type)
 {
+  struct ui_out_level *current;
+
   /* We had better not underflow the buffer.  */
-  gdb_assert (uiout->level > 0 && uiout->level < MAX_UI_OUT_LEVELS);
+  gdb_assert (uiout->level > 0);
   gdb_assert (current_level (uiout)->type == type);
+  current = VEC_pop (ui_out_level_p, uiout->levels);
+  xfree (current);
   uiout->level--;
   return uiout->level + 1;
 }
@@ -186,6 +194,7 @@ static void default_message (struct ui_out *uiout, int verbosity,
 			     va_list args) ATTRIBUTE_PRINTF (3, 0);
 static void default_wrap_hint (struct ui_out *uiout, char *identstring);
 static void default_flush (struct ui_out *uiout);
+static void default_data_destroy (struct ui_out *uiout);
 
 /* This is the default ui-out implementation functions vector.  */
 
@@ -207,6 +216,7 @@ struct ui_out_impl default_ui_out_impl =
   default_wrap_hint,
   default_flush,
   NULL,
+  default_data_destroy,
   0, /* Does not need MI hacks.  */
 };
 
@@ -255,6 +265,7 @@ static void uo_message (struct ui_out *uiout, int verbosity,
 static void uo_wrap_hint (struct ui_out *uiout, char *identstring);
 static void uo_flush (struct ui_out *uiout);
 static int uo_redirect (struct ui_out *uiout, struct ui_file *outstream);
+static void uo_data_destroy (struct ui_out *uiout);
 
 /* Prototypes for local functions */
 
@@ -265,6 +276,7 @@ static void append_header_to_list (struct ui_out *uiout, int width,
 static int get_next_header (struct ui_out *uiout, int *colno, int *width,
 			    int *alignment, char **colhdr);
 static void clear_header_list (struct ui_out *uiout);
+static void clear_table (struct ui_out *uiout);
 static void verify_field (struct ui_out *uiout, int *fldno, int *width,
 			  int *align);
 
@@ -329,10 +341,7 @@ ui_out_table_end (struct ui_out *uiout)
   uiout->table.flag = 0;
 
   uo_table_end (uiout);
-
-  if (uiout->table.id)
-    xfree (uiout->table.id);
-  clear_header_list (uiout);
+  clear_table (uiout);
 }
 
 void
@@ -750,6 +759,11 @@ default_flush (struct ui_out *uiout)
 {
 }
 
+static void
+default_data_destroy (struct ui_out *uiout)
+{
+}
+
 /* Interface to the implementation functions.  */
 
 void
@@ -788,6 +802,16 @@ uo_table_header (struct ui_out *uiout, int width, enum ui_align align,
   uiout->impl->table_header (uiout, width, align, col_name, colhdr);
 }
 
+/* Clear the table associated with UIOUT.  */
+
+static void
+clear_table (struct ui_out *uiout)
+{
+  if (uiout->table.id)
+    xfree (uiout->table.id);
+  clear_header_list (uiout);
+}
+
 void
 uo_begin (struct ui_out *uiout,
 	  enum ui_out_type type,
@@ -902,6 +926,15 @@ uo_redirect (struct ui_out *uiout, struct ui_file *outstream)
   return 0;
 }
 
+void
+uo_data_destroy (struct ui_out *uiout)
+{
+  if (!uiout->impl->data_destroy)
+    return;
+
+  uiout->impl->data_destroy (uiout);
+}
+
 /* local functions */
 
 /* List of column headers manipulation routines.  */
@@ -1066,6 +1099,7 @@ ui_out_new (struct ui_out_impl *impl, void *data,
 	    int flags)
 {
   struct ui_out *uiout = XMALLOC (struct ui_out);
+  struct ui_out_level *current = XMALLOC (struct ui_out_level);
 
   uiout->data = data;
   uiout->impl = impl;
@@ -1073,13 +1107,41 @@ ui_out_new (struct ui_out_impl *impl, void *data,
   uiout->table.flag = 0;
   uiout->table.body_flag = 0;
   uiout->level = 0;
-  memset (uiout->levels, 0, sizeof (uiout->levels));
+  uiout->levels = NULL;
+
+  /* Create uiout->level 0, the default level.  */
+  current->type = ui_out_type_tuple;
+  current->field_count = 0;
+  VEC_safe_push (ui_out_level_p, uiout->levels, current);
+
   uiout->table.header_first = NULL;
   uiout->table.header_last = NULL;
   uiout->table.header_next = NULL;
   return uiout;
 }
 
+/* Free  UIOUT and the memory areas it references.  */
+
+void
+ui_out_destroy (struct ui_out *uiout)
+{
+  int i;
+  struct ui_out_level *current;
+
+  /* Make sure that all levels are freed in the case where levels have
+     been pushed, but not popped before the ui_out object is
+     destroyed.  */
+  for (i = 0;
+       VEC_iterate (ui_out_level_p, uiout->levels, i, current);
+       ++i)
+    xfree (current);
+
+  VEC_free (ui_out_level_p, uiout->levels);
+  uo_data_destroy (uiout);
+  clear_table (uiout);
+  xfree (uiout);
+}
+
 /* Standard gdb initialization hook.  */
 
 void