X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fui-out.c;h=53ad963a648d0b5b45b614e2f35c7c87428e97d3;hb=581e13c1888512fde1bd3ff9e46f1a3ec4c337d7;hp=4a4a9228540c7d077f342a8de59a11677637f30f;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 4a4a922854..53ad963a64 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -1,6 +1,7 @@
 /* Output generating routines for GDB.
 
-   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2008, 2009, 2010,
+   2011 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
@@ -9,7 +10,7 @@
 
    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,
@@ -18,9 +19,7 @@
    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 "gdb_string.h"
@@ -43,15 +42,15 @@ struct ui_out_hdr
 
 /* Maintain a stack so that the info applicable to the inner most list
    is always available.  Stack/nested level 0 is reserved for the
-   top-level result. */
+   top-level result.  */
 
-enum { MAX_UI_OUT_LEVELS = 5 };
+enum { MAX_UI_OUT_LEVELS = 8 };
 
 struct ui_out_level
   {
-    /* Count each field; the first element is for non-list fields */
+    /* Count each field; the first element is for non-list fields.  */
     int field_count;
-    /* The type of this level. */
+    /* The type of this level.  */
     enum ui_out_type type;
   };
 
@@ -94,14 +93,14 @@ struct ui_out_table
 
 /* The ui_out structure */
 /* Any change here requires a corresponding one in the initialization
-   of the default uiout, which is statically initialized */
+   of the default uiout, which is statically initialized.  */
 
 struct ui_out
   {
     int flags;
-    /* specific implementation of ui-out */
+    /* Specific implementation of ui-out.  */
     struct ui_out_impl *impl;
-    struct ui_out_data *data;
+    void *data;
 
     /* Sub structure tracking the ui-out depth.  */
     int level;
@@ -111,21 +110,22 @@ struct ui_out
     struct ui_out_table table;
   };
 
-/* The current (inner most) level. */
+/* The current (inner most) level.  */
 static struct ui_out_level *
 current_level (struct ui_out *uiout)
 {
   return &uiout->levels[uiout->level];
 }
 
-/* Create a new level, of TYPE.  Return the new level's index. */
+/* Create a new level, of TYPE.  Return the new level's index.  */
 static int
 push_level (struct ui_out *uiout,
 	    enum ui_out_type type,
 	    const char *id)
 {
   struct ui_out_level *current;
-  /* We had better not overflow the buffer. */
+
+  /* We had better not overflow the buffer.  */
   uiout->level++;
   gdb_assert (uiout->level >= 0 && uiout->level < MAX_UI_OUT_LEVELS);
   current = current_level (uiout);
@@ -135,12 +135,12 @@ push_level (struct ui_out *uiout,
 }
 
 /* Discard the current level, return the discarded level's index.
-   TYPE is the type of the level being discarded. */
+   TYPE is the type of the level being discarded.  */
 static int
 pop_level (struct ui_out *uiout,
 	   enum ui_out_type type)
 {
-  /* We had better not underflow the buffer. */
+  /* We had better not underflow the buffer.  */
   gdb_assert (uiout->level > 0 && uiout->level < MAX_UI_OUT_LEVELS);
   gdb_assert (current_level (uiout)->type == type);
   uiout->level--;
@@ -148,7 +148,7 @@ pop_level (struct ui_out *uiout,
 }
 
 
-/* These are the default implementation functions */
+/* These are the default implementation functions.  */
 
 static void default_table_begin (struct ui_out *uiout, int nbrofcols,
 				 int nr_rows, const char *tblid);
@@ -178,16 +178,16 @@ static void default_field_fmt (struct ui_out *uiout, int fldno,
 			       int width, enum ui_align align,
 			       const char *fldname,
 			       const char *format,
-			       va_list args);
+			       va_list args) ATTRIBUTE_PRINTF (6, 0);
 static void default_spaces (struct ui_out *uiout, int numspaces);
 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);
+			     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);
 
-/* This is the default ui-out implementation functions vector */
+/* This is the default ui-out implementation functions vector.  */
 
 struct ui_out_impl default_ui_out_impl =
 {
@@ -206,6 +206,7 @@ struct ui_out_impl default_ui_out_impl =
   default_message,
   default_wrap_hint,
   default_flush,
+  NULL,
   0, /* Does not need MI hacks.  */
 };
 
@@ -219,11 +220,11 @@ struct ui_out def_uiout =
 
 /* Pointer to current ui_out */
 /* FIXME: This should not be a global, but something passed down from main.c
-   or top.c */
+   or top.c.  */
 
 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,
 			    int nr_rows, const char *tblid);
@@ -242,18 +243,18 @@ static void uo_field_int (struct ui_out *uiout, int fldno, int width,
 			  enum ui_align align, const char *fldname, int value);
 static void uo_field_skip (struct ui_out *uiout, int fldno, int width,
 			   enum ui_align align, const char *fldname);
-static void uo_field_string (struct ui_out *uiout, int fldno, int width,
-			     enum ui_align align, const char *fldname,
-			     const char *string);
 static void uo_field_fmt (struct ui_out *uiout, int fldno, int width,
 			  enum ui_align align, const char *fldname,
-			  const char *format, va_list args);
+			  const char *format, va_list args)
+     ATTRIBUTE_PRINTF (6, 0);
 static void uo_spaces (struct ui_out *uiout, int numspaces);
 static void uo_text (struct ui_out *uiout, const char *string);
 static void uo_message (struct ui_out *uiout, int verbosity,
-			const char *format, va_list args);
+			const char *format, va_list args)
+     ATTRIBUTE_PRINTF (3, 0);
 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);
 
 /* Prototypes for local functions */
 
@@ -267,21 +268,19 @@ static void clear_header_list (struct ui_out *uiout);
 static void verify_field (struct ui_out *uiout, int *fldno, int *width,
 			  int *align);
 
-static void init_ui_out_state (struct ui_out *uiout);
-
 /* exported functions (ui_out API) */
 
-/* Mark beginning of a table */
+/* Mark beginning of a table.  */
 
-void
+static void
 ui_out_table_begin (struct ui_out *uiout, int nbrofcols,
 		    int nr_rows,
 		    const char *tblid)
 {
   if (uiout->table.flag)
     internal_error (__FILE__, __LINE__,
-		    "tables cannot be nested; table_begin found before \
-previous table_end.");
+		    _("tables cannot be nested; table_begin found before \
+previous table_end."));
 
   uiout->table.flag = 1;
   uiout->table.body_flag = 0;
@@ -301,16 +300,16 @@ ui_out_table_body (struct ui_out *uiout)
 {
   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.");
+		    _("table_body outside a table is not valid; it must be \
+after a table_begin and before a table_end."));
   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.");
+		    _("extra table_body call not allowed; there must be \
+only one table_body after a table_begin and before a table_end."));
   if (uiout->table.header_next->colno != uiout->table.columns)
     internal_error (__FILE__, __LINE__,
-		    "number of headers differ from number of table \
-columns.");
+		    _("number of headers differ from number of table \
+columns."));
 
   uiout->table.body_flag = 1;
   uiout->table.header_next = uiout->table.header_first;
@@ -318,12 +317,12 @@ columns.");
   uo_table_body (uiout);
 }
 
-void
+static void
 ui_out_table_end (struct ui_out *uiout)
 {
   if (!uiout->table.flag)
     internal_error (__FILE__, __LINE__,
-		    "misplaced table_end or missing table_begin.");
+		    _("misplaced table_end or missing table_begin."));
 
   uiout->table.entry_level = 0;
   uiout->table.body_flag = 0;
@@ -343,24 +342,41 @@ ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
 {
   if (!uiout->table.flag || uiout->table.body_flag)
     internal_error (__FILE__, __LINE__,
-		    "table header must be specified after table_begin \
-and before table_body.");
+		    _("table header must be specified after table_begin \
+and before table_body."));
 
   append_header_to_list (uiout, width, alignment, col_name, colhdr);
 
   uo_table_header (uiout, width, alignment, col_name, colhdr);
 }
 
+static void
+do_cleanup_table_end (void *data)
+{
+  struct ui_out *ui_out = data;
+
+  ui_out_table_end (ui_out);
+}
+
+struct cleanup *
+make_cleanup_ui_out_table_begin_end (struct ui_out *ui_out, int nr_cols,
+                                     int nr_rows, const char *tblid)
+{
+  ui_out_table_begin (ui_out, nr_cols, nr_rows, tblid);
+  return make_cleanup (do_cleanup_table_end, ui_out);
+}
+
 void
 ui_out_begin (struct ui_out *uiout,
 	      enum ui_out_type type,
 	      const char *id)
 {
   int new_level;
+
   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.");
+		    _("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
@@ -373,6 +389,7 @@ specified after table_body.");
     int fldno;
     int width;
     int align;
+
     verify_field (uiout, &fldno, &width, &align);
   }
 
@@ -387,37 +404,13 @@ specified after table_body.");
   uo_begin (uiout, type, new_level, id);
 }
 
-void
-ui_out_list_begin (struct ui_out *uiout,
-		   const char *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)
 {
   int old_level = pop_level (uiout, type);
-  uo_end (uiout, type, old_level);
-}
 
-void
-ui_out_list_end (struct ui_out *uiout)
-{
-  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);
+  uo_end (uiout, type, old_level);
 }
 
 struct ui_out_end_cleanup_data
@@ -430,6 +423,7 @@ static void
 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);
 }
@@ -439,26 +433,18 @@ make_cleanup_ui_out_end (struct ui_out *uiout,
 			 enum ui_out_type type)
 {
   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 *
-make_cleanup_ui_out_begin_end (struct ui_out *uiout,
-			       enum ui_out_type type,
-			       const char *id)
-{
-  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);
+  ui_out_begin (uiout, ui_out_type_tuple, id);
   return make_cleanup_ui_out_end (uiout, ui_out_type_tuple);
 }
 
@@ -466,7 +452,7 @@ struct cleanup *
 make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
 				    const char *id)
 {
-  ui_out_list_begin (uiout, id);
+  ui_out_begin (uiout, ui_out_type_list, id);
   return make_cleanup_ui_out_end (uiout, ui_out_type_list);
 }
 
@@ -478,28 +464,47 @@ ui_out_field_int (struct ui_out *uiout,
   int fldno;
   int width;
   int align;
-  struct ui_out_level *current = current_level (uiout);
 
   verify_field (uiout, &fldno, &width, &align);
 
   uo_field_int (uiout, fldno, width, align, fldname, value);
 }
 
+void
+ui_out_field_fmt_int (struct ui_out *uiout,
+                      int input_width,
+                      enum ui_align input_align,
+		      const char *fldname,
+		      int value)
+{
+  int fldno;
+  int width;
+  int align;
+
+  verify_field (uiout, &fldno, &width, &align);
+
+  uo_field_int (uiout, fldno, input_width, input_align, fldname, value);
+}
+
 void
 ui_out_field_core_addr (struct ui_out *uiout,
 			const char *fldname,
+			struct gdbarch *gdbarch,
 			CORE_ADDR address)
 {
   char addstr[20];
+  int addr_bit = gdbarch_addr_bit (gdbarch);
+
+  if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
+    address &= ((CORE_ADDR) 1 << addr_bit) - 1;
 
   /* FIXME: cagney/2002-05-03: Need local_address_string() function
      that returns the language localized string formatted to a width
-     based on TARGET_ADDR_BIT.  */
-  /* print_address_numeric (address, 1, local_stream); */
-  if (TARGET_ADDR_BIT <= 32)
-    strcpy (addstr, local_hex_string_custom (address, "08l"));
+     based on gdbarch_addr_bit.  */
+  if (addr_bit <= 32)
+    strcpy (addstr, hex_string_custom (address, 8));
   else
-    strcpy (addstr, local_hex_string_custom (address, "016l"));
+    strcpy (addstr, hex_string_custom (address, 16));
 
   ui_out_field_string (uiout, fldname, addstr);
 }
@@ -512,6 +517,7 @@ ui_out_field_stream (struct ui_out *uiout,
   long length;
   char *buffer = ui_file_xstrdup (buf->stream, &length);
   struct cleanup *old_cleanup = make_cleanup (xfree, buffer);
+
   if (length > 0)
     ui_out_field_string (uiout, fldname, buffer);
   else
@@ -520,7 +526,7 @@ ui_out_field_stream (struct ui_out *uiout,
   do_cleanups (old_cleanup);
 }
 
-/* used to ommit a field */
+/* Used to omit a field.  */
 
 void
 ui_out_field_skip (struct ui_out *uiout,
@@ -560,7 +566,7 @@ ui_out_field_fmt (struct ui_out *uiout,
   int width;
   int align;
 
-  /* will not align, but has to call anyway */
+  /* Will not align, but has to call anyway.  */
   verify_field (uiout, &fldno, &width, &align);
 
   va_start (args, format);
@@ -590,9 +596,7 @@ ui_out_message (struct ui_out *uiout, int verbosity,
   va_list args;
 
   va_start (args, format);
-
   uo_message (uiout, verbosity, format, args);
-
   va_end (args);
 }
 
@@ -639,42 +643,46 @@ ui_out_flush (struct ui_out *uiout)
   uo_flush (uiout);
 }
 
-/* set the flags specified by the mask given */
+int
+ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream)
+{
+  return uo_redirect (uiout, outstream);
+}
+
+/* Set the flags specified by the mask given.  */
 int
 ui_out_set_flags (struct ui_out *uiout, int mask)
 {
   int oldflags = uiout->flags;
 
   uiout->flags |= mask;
-
   return oldflags;
 }
 
-/* clear the flags specified by the mask given */
+/* Clear the flags specified by the mask given.  */
 int
 ui_out_clear_flags (struct ui_out *uiout, int mask)
 {
   int oldflags = uiout->flags;
 
   uiout->flags &= ~mask;
-
   return oldflags;
 }
 
-/* test the flags against the mask given */
+/* Test the flags against the mask given.  */
 int
 ui_out_test_flags (struct ui_out *uiout, int mask)
 {
   return (uiout->flags & mask);
 }
 
-/* obtain the current verbosity level (as stablished by the
-   'set verbositylevel' command */
+/* Obtain the current verbosity level (as stablished by the
+   'set verbositylevel' command.  */
 
 int
 ui_out_get_verblvl (struct ui_out *uiout)
 {
-  /* FIXME: not implemented yet */
+  /* FIXME: not implemented yet.  */
   return 0;
 }
 
@@ -739,7 +747,7 @@ ui_out_is_mi_like_p (struct ui_out *uiout)
   return uiout->impl->is_mi_like_p;
 }
 
-/* default gdb-out hook functions */
+/* Default gdb-out hook functions.  */
 
 static void
 default_table_begin (struct ui_out *uiout, int nbrofcols,
@@ -839,7 +847,7 @@ default_flush (struct ui_out *uiout)
 {
 }
 
-/* Interface to the implementation functions */
+/* Interface to the implementation functions.  */
 
 void
 uo_table_begin (struct ui_out *uiout, int nbrofcols,
@@ -982,9 +990,18 @@ uo_flush (struct ui_out *uiout)
   uiout->impl->flush (uiout);
 }
 
+int
+uo_redirect (struct ui_out *uiout, struct ui_file *outstream)
+{
+  if (!uiout->impl->redirect)
+    return -1;
+  uiout->impl->redirect (uiout, outstream);
+  return 0;
+}
+
 /* local functions */
 
-/* list of column headers manipulation routines */
+/* List of column headers manipulation routines.  */
 
 static void
 clear_header_list (struct ui_out *uiout)
@@ -1014,15 +1031,20 @@ append_header_to_list (struct ui_out *uiout,
   temphdr = XMALLOC (struct ui_out_hdr);
   temphdr->width = width;
   temphdr->alignment = alignment;
-  /* we have to copy the column title as the original may be an automatic */
+  /* We have to copy the column title as the original may be an
+     automatic.  */
   if (colhdr != NULL)
     temphdr->colhdr = xstrdup (colhdr);
   else
     temphdr->colhdr = NULL;
+
   if (col_name != NULL)
+    temphdr->col_name = xstrdup (col_name);
+  else if (colhdr != NULL)
     temphdr->col_name = xstrdup (colhdr);
   else
-    temphdr->col_name = xstrdup (colhdr);
+    temphdr->col_name = NULL;
+
   temphdr->next = NULL;
   if (uiout->table.header_first == NULL)
     {
@@ -1076,8 +1098,8 @@ verify_field (struct ui_out *uiout, int *fldno, int *width, int *align)
     {
       if (!uiout->table.body_flag)
 	internal_error (__FILE__, __LINE__,
-			"table_body missing; table fields must be \
-specified after table_body and inside a list.");
+			_("table_body 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
@@ -1093,7 +1115,7 @@ specified after table_body and inside a list.");
     {
       if (*fldno != current->field_count)
 	internal_error (__FILE__, __LINE__,
-			"ui-out internal error in handling headers.");
+			_("ui-out internal error in handling headers."));
     }
   else
     {
@@ -1104,29 +1126,29 @@ specified after table_body and inside a list.");
 }
 
 
-/* access to ui_out format private members */
+/* Access to ui_out format private members.  */
 
 void
 ui_out_get_field_separator (struct ui_out *uiout)
 {
 }
 
-/* Access to ui-out members data */
+/* Access to ui-out members data.  */
 
-struct ui_out_data *
+void *
 ui_out_data (struct ui_out *uiout)
 {
   return uiout->data;
 }
 
-/* initalize private members at startup */
+/* Initalize private members at startup.  */
 
 struct ui_out *
-ui_out_new (struct ui_out_impl *impl,
-	    struct ui_out_data *data,
+ui_out_new (struct ui_out_impl *impl, void *data,
 	    int flags)
 {
   struct ui_out *uiout = XMALLOC (struct ui_out);
+
   uiout->data = data;
   uiout->impl = impl;
   uiout->flags = flags;
@@ -1140,7 +1162,7 @@ ui_out_new (struct ui_out_impl *impl,
   return uiout;
 }
 
-/* standard gdb initialization hook */
+/* Standard gdb initialization hook.  */
 
 void
 _initialize_ui_out (void)