* frame.h (select_frame): Delete level parameter.

[binutils.git] / gdb / ui-out.c

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 696128d0b6fbf2241bc16097c3f4f8e8de53d439..7e27d592ed6c55d15888cb669de65b6a67c4a051 100644 (file)
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -1,5 +1,7 @@
 /* Output generating routines for GDB.
 /* Output generating routines for GDB.

-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+

    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
 


@@ -27,11 +29,6 @@
 #include "ui-out.h"
 #include "gdb_assert.h"
 
 #include "ui-out.h"
 #include "gdb_assert.h"
 

-/* Convenience macro for allocting typesafe memory. */
-
-#undef XMALLOC
-#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE))
-

 /* table header structures */
 
 struct ui_out_hdr
 /* table header structures */
 
 struct ui_out_hdr


@@ -39,6 +36,7 @@ struct ui_out_hdr
     int colno;
     int width;
     int alignment;
     int colno;
     int width;
     int alignment;

+    char *col_name;

     char *colhdr;
     struct ui_out_hdr *next;
   };
     char *colhdr;
     struct ui_out_hdr *next;
   };


@@ -57,6 +55,43 @@ struct ui_out_level
     enum ui_out_type type;
   };
 
     enum ui_out_type type;
   };
 

+/* 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.  */
+
+struct ui_out_table
+{
+  /* If on, a table is being generated.  */
+  int flag;
+
+  /* If on, the body of a table is being generated.  If off, the table
+     header is being generated.  */
+  int body_flag;
+
+  /* The level at which each entry of the table is to be found.  A row
+     (a tuple) is made up of entries.  Consequently ENTRY_LEVEL is one
+     above that of the table.  */
+  int entry_level;
+
+  /* Number of table columns (as specified in the table_begin call).  */
+  int columns;
+
+  /* String identifying the table (as specified in the table_begin
+     call).  */
+  char *id;
+
+  /* Points to the first table header (if any).  */
+  struct ui_out_hdr *header_first;
+
+  /* Points to the last table header (if any).  */
+  struct ui_out_hdr *header_last;
+
+  /* Points to header of NEXT column to format.  */
+  struct ui_out_hdr *header_next;
+
+};
+
+

 /* The ui_out structure */
 /* Any change here requires a corresponding one in the initialization
    of the default uiout, which is statically initialized */
 /* The ui_out structure */
 /* Any change here requires a corresponding one in the initialization
    of the default uiout, which is statically initialized */


@@ -68,31 +103,12 @@ struct ui_out
     struct ui_out_impl *impl;
     struct ui_out_data *data;
 
     struct ui_out_impl *impl;
     struct ui_out_data *data;
 

-    /* if on, a table is being generated */
-    int table_flag;
-
-    /* if on, the body of a table is being generated */
-    int body_flag;
-
-    /* number of table columns (as specified in the table_begin call) */
-    int table_columns;
-
-    /* strinf identifying the table (as specified in the table_begin call) */
-    char *table_id;
-
-    /* Sub structure tracking the table depth. */
+    /* Sub structure tracking the ui-out depth.  */

     int level;
     struct ui_out_level levels[MAX_UI_OUT_LEVELS];
 
     int level;
     struct ui_out_level levels[MAX_UI_OUT_LEVELS];
 

-    /* points to the first header (if any) */
-    struct ui_out_hdr *headerfirst;
-
-    /* points to the last header (if any) */
-    struct ui_out_hdr *headerlast;
-
-    /* points to header of next column to format */
-    struct ui_out_hdr *headercurr;
-
+    /* A table, if any.  At present only a single table is supported.  */
+    struct ui_out_table table;

   };
 
 /* The current (inner most) level. */
   };
 
 /* The current (inner most) level. */


@@ -135,11 +151,12 @@ pop_level (struct ui_out *uiout,
 /* These are the default implementation functions */
 
 static void default_table_begin (struct ui_out *uiout, int nbrofcols,
 /* These are the default implementation functions */
 
 static void default_table_begin (struct ui_out *uiout, int nbrofcols,

-                                char *tblid);
+                                int nr_rows, const char *tblid);

 static void default_table_body (struct ui_out *uiout);
 static void default_table_end (struct ui_out *uiout);
 static void default_table_header (struct ui_out *uiout, int width,
 static void default_table_body (struct ui_out *uiout);
 static void default_table_end (struct ui_out *uiout);
 static void default_table_header (struct ui_out *uiout, int width,

-                                 enum ui_align alig, char *colhdr);
+                                 enum ui_align alig, const char *col_name,
+                                 const char *colhdr);

 static void default_begin (struct ui_out *uiout,
                           enum ui_out_type type,
                           int level, const char *id);
 static void default_begin (struct ui_out *uiout,
                           enum ui_out_type type,
                           int level, const char *id);


@@ -147,18 +164,25 @@ static void default_end (struct ui_out *uiout,
                         enum ui_out_type type,
                         int level);
 static void default_field_int (struct ui_out *uiout, int fldno, int width,
                         enum ui_out_type type,
                         int level);
 static void default_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 default_field_skip (struct ui_out *uiout, int fldno, int width,
 static void default_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 default_field_string (struct ui_out *uiout, int fldno, int width,
 static void default_field_string (struct ui_out *uiout, int fldno, int width,

-                                 enum ui_align align, char *fldname,
+                                 enum ui_align align,
+                                 const char *fldname,

                                  const char *string);
 static void default_field_fmt (struct ui_out *uiout, int fldno,
                               int width, enum ui_align align,
                                  const char *string);
 static void default_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);

 static void default_spaces (struct ui_out *uiout, int numspaces);
 static void default_spaces (struct ui_out *uiout, int numspaces);

-static void default_text (struct ui_out *uiout, char *string);
-static void default_message (struct ui_out *uiout, int verbosity, char *format,
+static void default_text (struct ui_out *uiout, const char *string);
+static void default_message (struct ui_out *uiout, int verbosity,
+                            const char *format,

                             va_list args);
 static void default_wrap_hint (struct ui_out *uiout, char *identstring);
 static void default_flush (struct ui_out *uiout);
                             va_list args);
 static void default_wrap_hint (struct ui_out *uiout, char *identstring);
 static void default_flush (struct ui_out *uiout);


@@ -181,7 +205,8 @@ struct ui_out_impl default_ui_out_impl =
   default_text,
   default_message,
   default_wrap_hint,
   default_text,
   default_message,
   default_wrap_hint,

-  default_flush
+  default_flush,
+  0, /* Does not need MI hacks.  */

 };
 
 /* The default ui_out */
 };
 
 /* The default ui_out */


@@ -200,11 +225,13 @@ struct ui_out *uiout = &def_uiout;
 
 /* These are the interfaces to implementation functions */
 
 
 /* These are the interfaces to implementation functions */
 

-static void uo_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid);
+static void uo_table_begin (struct ui_out *uiout, int nbrofcols,
+                           int nr_rows, const char *tblid);

 static void uo_table_body (struct ui_out *uiout);
 static void uo_table_end (struct ui_out *uiout);
 static void uo_table_header (struct ui_out *uiout, int width,
 static void uo_table_body (struct ui_out *uiout);
 static void uo_table_end (struct ui_out *uiout);
 static void uo_table_header (struct ui_out *uiout, int width,

-                            enum ui_align align, char *colhdr);
+                            enum ui_align align, const char *col_name,
+                            const char *colhdr);

 static void uo_begin (struct ui_out *uiout,
                      enum ui_out_type type,
                      int level, const char *id);
 static void uo_begin (struct ui_out *uiout,
                      enum ui_out_type type,
                      int level, const char *id);


@@ -212,30 +239,33 @@ static void uo_end (struct ui_out *uiout,
                    enum ui_out_type type,
                    int level);
 static void uo_field_int (struct ui_out *uiout, int fldno, int width,
                    enum ui_out_type type,
                    int level);
 static void uo_field_int (struct ui_out *uiout, int fldno, int width,

-                         enum ui_align align, char *fldname, int value);
+                         enum ui_align align, const char *fldname, int value);

 static void uo_field_skip (struct ui_out *uiout, int fldno, int width,
 static void uo_field_skip (struct ui_out *uiout, int fldno, int width,

-                          enum ui_align align, char *fldname);
+                          enum ui_align align, const char *fldname);

 static void uo_field_string (struct ui_out *uiout, int fldno, int width,
 static void uo_field_string (struct ui_out *uiout, int fldno, int width,

-                         enum ui_align align, char *fldname, const char *string);
+                            enum ui_align align, const char *fldname,
+                            const char *string);

 static void uo_field_fmt (struct ui_out *uiout, int fldno, int width,
 static void uo_field_fmt (struct ui_out *uiout, int fldno, int width,

-                         enum ui_align align, char *fldname,
-                         char *format, va_list args);
+                         enum ui_align align, const char *fldname,
+                         const char *format, va_list args);

 static void uo_spaces (struct ui_out *uiout, int numspaces);
 static void uo_spaces (struct ui_out *uiout, int numspaces);

-static void uo_text (struct ui_out *uiout, char *string);
+static void uo_text (struct ui_out *uiout, const char *string);

 static void uo_message (struct ui_out *uiout, int verbosity,
 static void uo_message (struct ui_out *uiout, int verbosity,

-                       char *format, va_list args);
+                       const char *format, va_list args);

 static void uo_wrap_hint (struct ui_out *uiout, char *identstring);
 static void uo_flush (struct ui_out *uiout);
 
 /* Prototypes for local functions */
 
 extern void _initialize_ui_out (void);
 static void uo_wrap_hint (struct ui_out *uiout, char *identstring);
 static void uo_flush (struct ui_out *uiout);
 
 /* Prototypes for local functions */
 
 extern void _initialize_ui_out (void);

-static void append_header_to_list (struct ui_out *uiout, int width, int alignment, char *colhdr);
-static int get_curr_header (struct ui_out *uiout, int *colno, int *width,
+static void append_header_to_list (struct ui_out *uiout, int width,
+                                  int alignment, const char *col_name,
+                                  const char *colhdr);
+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);
                            int *alignment, char **colhdr);
 static void clear_header_list (struct ui_out *uiout);

-static void verify_field_proper_position (struct ui_out *uiout);
-static void verify_field_alignment (struct ui_out *uiout, int fldno, int *width, int *alignment);
+static void verify_field (struct ui_out *uiout, int *fldno, int *width,
+                         int *align);

 
 static void init_ui_out_state (struct ui_out *uiout);
 
 
 static void init_ui_out_state (struct ui_out *uiout);
 


@@ -244,42 +274,46 @@ static void init_ui_out_state (struct ui_out *uiout);
 /* Mark beginning of a table */
 
 void
 /* Mark beginning of a table */
 
 void

-ui_out_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
+ui_out_table_begin (struct ui_out *uiout, int nbrofcols,
+                   int nr_rows,
+                   const char *tblid)

 {
 {

-  if (uiout->table_flag)
+  if (uiout->table.flag)

     internal_error (__FILE__, __LINE__,
                    "tables cannot be nested; table_begin found before \
 previous table_end.");
 
     internal_error (__FILE__, __LINE__,
                    "tables cannot be nested; table_begin found before \
 previous table_end.");
 

-  uiout->table_flag = 1;
-  uiout->table_columns = nbrofcols;
+  uiout->table.flag = 1;
+  uiout->table.body_flag = 0;
+  uiout->table.entry_level = uiout->level + 1;
+  uiout->table.columns = nbrofcols;

   if (tblid != NULL)
   if (tblid != NULL)

-    uiout->table_id = xstrdup (tblid);
+    uiout->table.id = xstrdup (tblid);

   else
   else

-    uiout->table_id = NULL;
+    uiout->table.id = NULL;

   clear_header_list (uiout);
 
   clear_header_list (uiout);
 

-  uo_table_begin (uiout, nbrofcols, uiout->table_id);
+  uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table.id);

 }
 
 void
 ui_out_table_body (struct ui_out *uiout)
 {
 }
 
 void
 ui_out_table_body (struct ui_out *uiout)
 {

-  if (!uiout->table_flag)
+  if (!uiout->table.flag)

     internal_error (__FILE__, __LINE__,
                    "table_body outside a table is not valid; it must be \
 after a table_begin and before a table_end.");
     internal_error (__FILE__, __LINE__,
                    "table_body outside a table is not valid; it must be \
 after a table_begin and before a table_end.");

-  if (uiout->body_flag)
+  if (uiout->table.body_flag)

     internal_error (__FILE__, __LINE__,
                    "extra table_body call not allowed; there must be \
 only one table_body after a table_begin and before a table_end.");
     internal_error (__FILE__, __LINE__,
                    "extra table_body call not allowed; there must be \
 only one table_body after a table_begin and before a table_end.");

-  if (uiout->headercurr->colno != uiout->table_columns)
+  if (uiout->table.header_next->colno != uiout->table.columns)

     internal_error (__FILE__, __LINE__,
                    "number of headers differ from number of table \
 columns.");
 
     internal_error (__FILE__, __LINE__,
                    "number of headers differ from number of table \
 columns.");
 

-  uiout->body_flag = 1;
-  uiout->headercurr = uiout->headerfirst;
+  uiout->table.body_flag = 1;
+  uiout->table.header_next = uiout->table.header_first;

 
   uo_table_body (uiout);
 }
 
   uo_table_body (uiout);
 }


@@ -287,32 +321,34 @@ columns.");
 void
 ui_out_table_end (struct ui_out *uiout)
 {
 void
 ui_out_table_end (struct ui_out *uiout)
 {

-  if (!uiout->table_flag)
+  if (!uiout->table.flag)

     internal_error (__FILE__, __LINE__,
                    "misplaced table_end or missing table_begin.");
 
     internal_error (__FILE__, __LINE__,
                    "misplaced table_end or missing table_begin.");
 

-  uiout->body_flag = 0;
-  uiout->table_flag = 0;
+  uiout->table.entry_level = 0;
+  uiout->table.body_flag = 0;
+  uiout->table.flag = 0;

 
   uo_table_end (uiout);
 
 
   uo_table_end (uiout);
 

-  if (uiout->table_id)
-    xfree (uiout->table_id);
+  if (uiout->table.id)
+    xfree (uiout->table.id);

   clear_header_list (uiout);
 }
 
 void
 ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
   clear_header_list (uiout);
 }
 
 void
 ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,

-                    char *colhdr)
+                    const char *col_name,
+                    const char *colhdr)

 {
 {

-  if (!uiout->table_flag || uiout->body_flag)
+  if (!uiout->table.flag || uiout->table.body_flag)

     internal_error (__FILE__, __LINE__,
                    "table header must be specified after table_begin \
 and before table_body.");
 
     internal_error (__FILE__, __LINE__,
                    "table header must be specified after table_begin \
 and before table_body.");
 

-  append_header_to_list (uiout, width, alignment, colhdr);
+  append_header_to_list (uiout, width, alignment, col_name, colhdr);

 
 

-  uo_table_header (uiout, width, alignment, colhdr);
+  uo_table_header (uiout, width, alignment, col_name, colhdr);

 }
 
 void
 }
 
 void


@@ -321,23 +357,49 @@ ui_out_begin (struct ui_out *uiout,
              const char *id)
 {
   int new_level;
              const char *id)
 {
   int new_level;

-  if (uiout->table_flag && !uiout->body_flag)
+  if (uiout->table.flag && !uiout->table.body_flag)

     internal_error (__FILE__, __LINE__,
                    "table header or table_body expected; lists must be \
 specified after table_body.");
     internal_error (__FILE__, __LINE__,
                    "table header or table_body expected; lists must be \
 specified after table_body.");

+
+  /* Be careful to verify the ``field'' before the new tuple/list is
+     pushed onto the stack.  That way the containing list/table/row is
+     verified and not the newly created tuple/list.  This verification
+     is needed (at least) for the case where a table row entry
+     contains either a tuple/list.  For that case bookkeeping such as
+     updating the column count or advancing to the next heading still
+     needs to be performed.  */
+  {
+    int fldno;
+    int width;
+    int align;
+    verify_field (uiout, &fldno, &width, &align);
+  }
+

   new_level = push_level (uiout, type, id);
   new_level = push_level (uiout, type, id);

-  if (uiout->table_flag && (new_level == 1))
-    uiout->headercurr = uiout->headerfirst;
+
+  /* If the push puts us at the same level as a table row entry, we've
+     got a new table row.  Put the header pointer back to the start.  */
+  if (uiout->table.body_flag
+      && uiout->table.entry_level == new_level)
+    uiout->table.header_next = uiout->table.header_first;
+

   uo_begin (uiout, type, new_level, id);
 }
 
 void
 ui_out_list_begin (struct ui_out *uiout,
   uo_begin (uiout, type, new_level, id);
 }
 
 void
 ui_out_list_begin (struct ui_out *uiout,

-                  char *id)
+                  const char *id)

 {
   ui_out_begin (uiout, ui_out_type_list, id);
 }
 
 {
   ui_out_begin (uiout, ui_out_type_list, id);
 }
 

+void
+ui_out_tuple_begin (struct ui_out *uiout, const char *id)
+{
+  ui_out_begin (uiout, ui_out_type_tuple, id);
+}
+

 void
 ui_out_end (struct ui_out *uiout,
            enum ui_out_type type)
 void
 ui_out_end (struct ui_out *uiout,
            enum ui_out_type type)


@@ -352,38 +414,81 @@ ui_out_list_end (struct ui_out *uiout)
   ui_out_end (uiout, ui_out_type_list);
 }
 
   ui_out_end (uiout, ui_out_type_list);
 }
 

+void
+ui_out_tuple_end (struct ui_out *uiout)
+{
+  ui_out_end (uiout, ui_out_type_tuple);
+}
+
+struct ui_out_end_cleanup_data
+{
+  struct ui_out *uiout;
+  enum ui_out_type type;
+};
+

 static void
 static void

-do_list_end (void *uiout)
+do_cleanup_end (void *data)
+{
+  struct ui_out_end_cleanup_data *end_cleanup_data = data;
+  ui_out_end (end_cleanup_data->uiout, end_cleanup_data->type);
+  xfree (end_cleanup_data);
+}
+
+static struct cleanup *
+make_cleanup_ui_out_end (struct ui_out *uiout,
+                        enum ui_out_type type)

 {
 {

-  ui_out_list_end (uiout);
+  struct ui_out_end_cleanup_data *end_cleanup_data;
+  end_cleanup_data = XMALLOC (struct ui_out_end_cleanup_data);
+  end_cleanup_data->uiout = uiout;
+  end_cleanup_data->type = type;
+  return make_cleanup (do_cleanup_end, end_cleanup_data);

 }
 
 struct cleanup *
 }
 
 struct cleanup *

-make_cleanup_ui_out_list_end (struct ui_out *uiout)
+make_cleanup_ui_out_begin_end (struct ui_out *uiout,
+                              enum ui_out_type type,
+                              const char *id)

 {
 {

-  return make_cleanup (do_list_end, uiout);
+  ui_out_begin (uiout, type, id);
+  return make_cleanup_ui_out_end (uiout, type);
+}
+
+struct cleanup *
+make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
+                                    const char *id)
+{
+  ui_out_tuple_begin (uiout, id);
+  return make_cleanup_ui_out_end (uiout, ui_out_type_tuple);
+}
+
+struct cleanup *
+make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
+                                   const char *id)
+{
+  ui_out_list_begin (uiout, id);
+  return make_cleanup_ui_out_end (uiout, ui_out_type_list);

 }
 
 void
 }
 
 void

-ui_out_field_int (struct ui_out *uiout, char *fldname, int value)
+ui_out_field_int (struct ui_out *uiout,
+                 const char *fldname,
+                 int value)

 {
   int fldno;
   int width;
   int align;
   struct ui_out_level *current = current_level (uiout);
 
 {
   int fldno;
   int width;
   int align;
   struct ui_out_level *current = current_level (uiout);
 

-  verify_field_proper_position (uiout);
-
-  current->field_count += 1;
-  fldno = current->field_count;
-
-  verify_field_alignment (uiout, fldno, &width, &align);
+  verify_field (uiout, &fldno, &width, &align);

 
   uo_field_int (uiout, fldno, width, align, fldname, value);
 }
 
 void
 
   uo_field_int (uiout, fldno, width, align, fldname, value);
 }
 
 void

-ui_out_field_core_addr (struct ui_out *uiout, char *fldname, CORE_ADDR address)
+ui_out_field_core_addr (struct ui_out *uiout,
+                       const char *fldname,
+                       CORE_ADDR address)

 {
   char addstr[20];
 
 {
   char addstr[20];
 


@@ -395,7 +500,9 @@ ui_out_field_core_addr (struct ui_out *uiout, char *fldname, CORE_ADDR address)
 }
 
 void
 }
 
 void

-ui_out_field_stream (struct ui_out *uiout, char *fldname, struct ui_stream *buf)
+ui_out_field_stream (struct ui_out *uiout,
+                    const char *fldname,
+                    struct ui_stream *buf)

 {
   long length;
   char *buffer = ui_file_xstrdup (buf->stream, &length);
 {
   long length;
   char *buffer = ui_file_xstrdup (buf->stream, &length);


@@ -411,60 +518,45 @@ ui_out_field_stream (struct ui_out *uiout, char *fldname, struct ui_stream *buf)
 /* used to ommit a field */
 
 void
 /* used to ommit a field */
 
 void

-ui_out_field_skip (struct ui_out *uiout, char *fldname)
+ui_out_field_skip (struct ui_out *uiout,
+                  const char *fldname)

 {
   int fldno;
   int width;
   int align;
 {
   int fldno;
   int width;
   int align;

-  struct ui_out_level *current = current_level (uiout);
-
-  verify_field_proper_position (uiout);
-
-  current->field_count += 1;
-  fldno = current->field_count;

 
 

-  verify_field_alignment (uiout, fldno, &width, &align);
+  verify_field (uiout, &fldno, &width, &align);

 
   uo_field_skip (uiout, fldno, width, align, fldname);
 }
 
 void
 ui_out_field_string (struct ui_out *uiout,
 
   uo_field_skip (uiout, fldno, width, align, fldname);
 }
 
 void
 ui_out_field_string (struct ui_out *uiout,

-                    char *fldname,
+                    const char *fldname,

                     const char *string)
 {
   int fldno;
   int width;
   int align;
                     const char *string)
 {
   int fldno;
   int width;
   int align;

-  struct ui_out_level *current = current_level (uiout);

 
 

-  verify_field_proper_position (uiout);
-
-  current->field_count += 1;
-  fldno = current->field_count;
-
-  verify_field_alignment (uiout, fldno, &width, &align);
+  verify_field (uiout, &fldno, &width, &align);

 
   uo_field_string (uiout, fldno, width, align, fldname, string);
 }
 
 /* VARARGS */
 void
 
   uo_field_string (uiout, fldno, width, align, fldname, string);
 }
 
 /* VARARGS */
 void

-ui_out_field_fmt (struct ui_out *uiout, char *fldname, char *format,...)
+ui_out_field_fmt (struct ui_out *uiout,
+                 const char *fldname,
+                 const char *format, ...)

 {
   va_list args;
   int fldno;
   int width;
   int align;
 {
   va_list args;
   int fldno;
   int width;
   int align;

-  struct ui_out_level *current = current_level (uiout);
-
-  verify_field_proper_position (uiout);
-
-  current->field_count += 1;
-  fldno = current->field_count;

 
   /* will not align, but has to call anyway */
 
   /* will not align, but has to call anyway */

-  verify_field_alignment (uiout, fldno, &width, &align);
+  verify_field (uiout, &fldno, &width, &align);

 
   va_start (args, format);
 
 
   va_start (args, format);
 


@@ -480,13 +572,15 @@ ui_out_spaces (struct ui_out *uiout, int numspaces)
 }
 
 void
 }
 
 void

-ui_out_text (struct ui_out *uiout, char *string)
+ui_out_text (struct ui_out *uiout,
+            const char *string)

 {
   uo_text (uiout, string);
 }
 
 void
 {
   uo_text (uiout, string);
 }
 
 void

-ui_out_message (struct ui_out *uiout, int verbosity, char *format,...)
+ui_out_message (struct ui_out *uiout, int verbosity,
+               const char *format,...)

 {
   va_list args;
 
 {
   va_list args;
 


@@ -634,10 +728,18 @@ gdb_query (struct ui_out *uiout, int qflags, char *qprompt)
 }
 #endif
 
 }
 #endif
 

+int
+ui_out_is_mi_like_p (struct ui_out *uiout)
+{
+  return uiout->impl->is_mi_like_p;
+}
+

 /* default gdb-out hook functions */
 
 static void
 /* default gdb-out hook functions */
 
 static void

-default_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
+default_table_begin (struct ui_out *uiout, int nbrofcols,
+                    int nr_rows,
+                    const char *tblid)

 {
 }
 
 {
 }
 


@@ -653,7 +755,8 @@ default_table_end (struct ui_out *uiout)
 
 static void
 default_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
 
 static void
 default_table_header (struct ui_out *uiout, int width, enum ui_align alignment,

-                     char *colhdr)
+                     const char *col_name,
+                     const char *colhdr)

 {
 }
 
 {
 }
 


@@ -674,13 +777,14 @@ default_end (struct ui_out *uiout,
 
 static void
 default_field_int (struct ui_out *uiout, int fldno, int width,
 
 static void
 default_field_int (struct ui_out *uiout, int fldno, int width,

-                  enum ui_align align, char *fldname, int value)
+                  enum ui_align align,
+                  const char *fldname, int value)

 {
 }
 
 static void
 default_field_skip (struct ui_out *uiout, int fldno, int width,
 {
 }
 
 static void
 default_field_skip (struct ui_out *uiout, int fldno, int width,

-                   enum ui_align align, char *fldname)
+                   enum ui_align align, const char *fldname)

 {
 }
 
 {
 }
 


@@ -689,14 +793,16 @@ default_field_string (struct ui_out *uiout,
                      int fldno,
                      int width,
                      enum ui_align align,
                      int fldno,
                      int width,
                      enum ui_align align,

-                     char *fldname,
+                     const char *fldname,

                      const char *string)
 {
 }
 
 static void
 default_field_fmt (struct ui_out *uiout, int fldno, int width,
                      const char *string)
 {
 }
 
 static void
 default_field_fmt (struct ui_out *uiout, int fldno, int width,

-                  enum ui_align align, char *fldname, char *format,
+                  enum ui_align align,
+                  const char *fldname,
+                  const char *format,

                   va_list args)
 {
 }
                   va_list args)
 {
 }


@@ -707,12 +813,13 @@ default_spaces (struct ui_out *uiout, int numspaces)
 }
 
 static void
 }
 
 static void

-default_text (struct ui_out *uiout, char *string)
+default_text (struct ui_out *uiout, const char *string)

 {
 }
 
 static void
 {
 }
 
 static void

-default_message (struct ui_out *uiout, int verbosity, char *format,
+default_message (struct ui_out *uiout, int verbosity,
+                const char *format,

                 va_list args)
 {
 }
                 va_list args)
 {
 }


@@ -730,11 +837,13 @@ default_flush (struct ui_out *uiout)
 /* Interface to the implementation functions */
 
 void
 /* Interface to the implementation functions */
 
 void

-uo_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
+uo_table_begin (struct ui_out *uiout, int nbrofcols,
+               int nr_rows,
+               const char *tblid)

 {
   if (!uiout->impl->table_begin)
     return;
 {
   if (!uiout->impl->table_begin)
     return;

-  uiout->impl->table_begin (uiout, nbrofcols, tblid);
+  uiout->impl->table_begin (uiout, nbrofcols, nr_rows, tblid);

 }
 
 void
 }
 
 void


@@ -754,11 +863,13 @@ uo_table_end (struct ui_out *uiout)
 }
 
 void
 }
 
 void

-uo_table_header (struct ui_out *uiout, int width, enum ui_align align, char *colhdr)
+uo_table_header (struct ui_out *uiout, int width, enum ui_align align,
+                const char *col_name,
+                const char *colhdr)

 {
   if (!uiout->impl->table_header)
     return;
 {
   if (!uiout->impl->table_header)
     return;

-  uiout->impl->table_header (uiout, width, align, colhdr);
+  uiout->impl->table_header (uiout, width, align, col_name, colhdr);

 }
 
 void
 }
 
 void


@@ -783,7 +894,9 @@ uo_end (struct ui_out *uiout,
 }
 
 void
 }
 
 void

-uo_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align align, char *fldname, int value)
+uo_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align align,
+             const char *fldname,
+             int value)

 {
   if (!uiout->impl->field_int)
     return;
 {
   if (!uiout->impl->field_int)
     return;


@@ -791,7 +904,8 @@ uo_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align align, c
 }
 
 void
 }
 
 void

-uo_field_skip (struct ui_out *uiout, int fldno, int width, enum ui_align align, char *fldname)
+uo_field_skip (struct ui_out *uiout, int fldno, int width, enum ui_align align,
+              const char *fldname)

 {
   if (!uiout->impl->field_skip)
     return;
 {
   if (!uiout->impl->field_skip)
     return;


@@ -800,7 +914,9 @@ uo_field_skip (struct ui_out *uiout, int fldno, int width, enum ui_align align,
 
 void
 uo_field_string (struct ui_out *uiout, int fldno, int width,
 
 void
 uo_field_string (struct ui_out *uiout, int fldno, int width,

-                enum ui_align align, char *fldname, const char *string)
+                enum ui_align align,
+                const char *fldname,
+                const char *string)

 {
   if (!uiout->impl->field_string)
     return;
 {
   if (!uiout->impl->field_string)
     return;


@@ -808,7 +924,10 @@ uo_field_string (struct ui_out *uiout, int fldno, int width,
 }
 
 void
 }
 
 void

-uo_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align, char *fldname, char *format, va_list args)
+uo_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align,
+             const char *fldname,
+             const char *format,
+             va_list args)

 {
   if (!uiout->impl->field_fmt)
     return;
 {
   if (!uiout->impl->field_fmt)
     return;


@@ -824,7 +943,8 @@ uo_spaces (struct ui_out *uiout, int numspaces)
 }
 
 void
 }
 
 void

-uo_text (struct ui_out *uiout, char *string)
+uo_text (struct ui_out *uiout,
+        const char *string)

 {
   if (!uiout->impl->text)
     return;
 {
   if (!uiout->impl->text)
     return;


@@ -832,7 +952,9 @@ uo_text (struct ui_out *uiout, char *string)
 }
 
 void
 }
 
 void

-uo_message (struct ui_out *uiout, int verbosity, char *format, va_list args)
+uo_message (struct ui_out *uiout, int verbosity,
+           const char *format,
+           va_list args)

 {
   if (!uiout->impl->message)
     return;
 {
   if (!uiout->impl->message)
     return;


@@ -862,23 +984,25 @@ uo_flush (struct ui_out *uiout)
 static void
 clear_header_list (struct ui_out *uiout)
 {
 static void
 clear_header_list (struct ui_out *uiout)
 {

-  while (uiout->headerfirst != NULL)
+  while (uiout->table.header_first != NULL)

     {
     {

-      uiout->headercurr = uiout->headerfirst;
-      uiout->headerfirst = uiout->headerfirst->next;
-      if (uiout->headercurr->colhdr != NULL)
-       xfree (uiout->headercurr->colhdr);
-      xfree (uiout->headercurr);
+      uiout->table.header_next = uiout->table.header_first;
+      uiout->table.header_first = uiout->table.header_first->next;
+      if (uiout->table.header_next->colhdr != NULL)
+       xfree (uiout->table.header_next->colhdr);
+      xfree (uiout->table.header_next);

     }
     }

-  uiout->headerlast = NULL;
-  uiout->headercurr = NULL;
+  gdb_assert (uiout->table.header_first == NULL);
+  uiout->table.header_last = NULL;
+  uiout->table.header_next = NULL;

 }
 
 static void
 append_header_to_list (struct ui_out *uiout,
                       int width,
                       int alignment,
 }
 
 static void
 append_header_to_list (struct ui_out *uiout,
                       int width,
                       int alignment,

-                      char *colhdr)
+                      const char *col_name,
+                      const char *colhdr)

 {
   struct ui_out_hdr *temphdr;
 
 {
   struct ui_out_hdr *temphdr;
 


@@ -887,79 +1011,82 @@ append_header_to_list (struct ui_out *uiout,
   temphdr->alignment = alignment;
   /* we have to copy the column title as the original may be an automatic */
   if (colhdr != NULL)
   temphdr->alignment = alignment;
   /* we have to copy the column title as the original may be an automatic */
   if (colhdr != NULL)

-    {
-      temphdr->colhdr = xmalloc (strlen (colhdr) + 1);
-      strcpy (temphdr->colhdr, colhdr);
-    }
+    temphdr->colhdr = xstrdup (colhdr);
+  else
+    temphdr->colhdr = NULL;
+  if (col_name != NULL)
+    temphdr->col_name = xstrdup (colhdr);
+  else
+    temphdr->col_name = xstrdup (colhdr);

   temphdr->next = NULL;
   temphdr->next = NULL;

-  if (uiout->headerfirst == NULL)
+  if (uiout->table.header_first == NULL)

     {
       temphdr->colno = 1;
     {
       temphdr->colno = 1;

-      uiout->headerfirst = temphdr;
-      uiout->headerlast = temphdr;
+      uiout->table.header_first = temphdr;
+      uiout->table.header_last = temphdr;

     }
   else
     {
     }
   else
     {

-      temphdr->colno = uiout->headerlast->colno + 1;
-      uiout->headerlast->next = temphdr;
-      uiout->headerlast = temphdr;
+      temphdr->colno = uiout->table.header_last->colno + 1;
+      uiout->table.header_last->next = temphdr;
+      uiout->table.header_last = temphdr;

     }
     }

-  uiout->headercurr = uiout->headerlast;
+  uiout->table.header_next = uiout->table.header_last;

 }
 
 }
 

-/* returns 0 if there is no more headers */
+/* Extract the format information for the NEXT header and and advance
+   the header pointer.  Return 0 if there was no next header.  */

 
 static int
 
 static int

-get_curr_header (struct ui_out *uiout,
+get_next_header (struct ui_out *uiout,

                 int *colno,
                 int *width,
                 int *alignment,
                 char **colhdr)
 {
                 int *colno,
                 int *width,
                 int *alignment,
                 char **colhdr)
 {

-  /* There may be no headers at all or we may have used all columns */
-  if (uiout->headercurr == NULL)
+  /* There may be no headers at all or we may have used all columns.  */
+  if (uiout->table.header_next == NULL)

     return 0;
     return 0;

-  *colno = uiout->headercurr->colno;
-  *width = uiout->headercurr->width;
-  *alignment = uiout->headercurr->alignment;
-  *colhdr = uiout->headercurr->colhdr;
-  uiout->headercurr = uiout->headercurr->next;
+  *colno = uiout->table.header_next->colno;
+  *width = uiout->table.header_next->width;
+  *alignment = uiout->table.header_next->alignment;
+  *colhdr = uiout->table.header_next->colhdr;
+  /* Advance the header pointer to the next entry.  */
+  uiout->table.header_next = uiout->table.header_next->next;

   return 1;
 }
 
   return 1;
 }
 

-/* makes sure the field_* calls were properly placed */
+
+/* Verify that the field/tuple/list is correctly positioned.  Return
+   the field number and corresponding alignment (if
+   available/applicable).  */

 
 static void
 
 static void

-verify_field_proper_position (struct ui_out *uiout)
+verify_field (struct ui_out *uiout, int *fldno, int *width, int *align)

 {
 {

-  if (uiout->table_flag)
+  struct ui_out_level *current = current_level (uiout);
+  char *text;
+
+  if (uiout->table.flag)

     {
     {

-      if (!uiout->body_flag)
+      if (!uiout->table.body_flag)

        internal_error (__FILE__, __LINE__,
                        "table_body missing; table fields must be \
 specified after table_body and inside a list.");
        internal_error (__FILE__, __LINE__,
                        "table_body missing; table fields must be \
 specified after table_body and inside a list.");

-      if (uiout->level == 0)
-       internal_error (__FILE__, __LINE__,
-                       "list_begin missing; table fields must be \
-specified after table_body and inside a list.");
+      /* NOTE: cagney/2001-12-08: There was a check here to ensure
+        that this code was only executed when uiout->level was
+        greater than zero.  That no longer applies - this code is run
+        before each table row tuple is started and at that point the
+        level is zero.  */

     }
     }

-}
-
-/* determines what is the alignment policy */

 
 

-static void
-verify_field_alignment (struct ui_out *uiout,
-                       int fldno,
-                       int *width,
-                       int *align)
-{
-  int colno;
-  char *text;
+  current->field_count += 1;

 
 

-  if (uiout->table_flag
-      && get_curr_header (uiout, &colno, width, align, &text))
+  if (uiout->table.body_flag
+      && uiout->table.entry_level == uiout->level
+      && get_next_header (uiout, fldno, width, align, &text))

     {
     {

-      if (fldno != colno)
+      if (*fldno != current->field_count)

        internal_error (__FILE__, __LINE__,
                        "ui-out internal error in handling headers.");
     }
        internal_error (__FILE__, __LINE__,
                        "ui-out internal error in handling headers.");
     }


@@ -967,9 +1094,11 @@ verify_field_alignment (struct ui_out *uiout,
     {
       *width = 0;
       *align = ui_noalign;
     {
       *width = 0;
       *align = ui_noalign;

+      *fldno = current->field_count;

     }
 }
 
     }
 }
 

+

 /* access to ui_out format private members */
 
 void
 /* access to ui_out format private members */
 
 void


@@ -996,13 +1125,13 @@ ui_out_new (struct ui_out_impl *impl,
   uiout->data = data;
   uiout->impl = impl;
   uiout->flags = flags;
   uiout->data = data;
   uiout->impl = impl;
   uiout->flags = flags;

-  uiout->table_flag = 0;
-  uiout->body_flag = 0;
+  uiout->table.flag = 0;
+  uiout->table.body_flag = 0;

   uiout->level = 0;
   memset (uiout->levels, 0, sizeof (uiout->levels));
   uiout->level = 0;
   memset (uiout->levels, 0, sizeof (uiout->levels));

-  uiout->headerfirst = NULL;
-  uiout->headerlast = NULL;
-  uiout->headercurr = NULL;
+  uiout->table.header_first = NULL;
+  uiout->table.header_last = NULL;
+  uiout->table.header_next = NULL;

   return uiout;
 }
 
   return uiout;
 }