X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fui-out.c;h=9f24784db54fc3df89ccc069ee2b22bae33b45ca;hb=565904581b642bc4cb7eff8c0b5880cd3f5606f8;hp=dfdb61d647665409a95ce25a03e92e794c4a5b7f;hpb=ed49a04fe1bc299bc4b22c01a15c1f46ae21a294;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ui-out.c b/gdb/ui-out.c index dfdb61d647..9f24784db5 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -1,7 +1,7 @@ /* Output generating routines for GDB. - Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2008 - Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2004-2005, 2007-2012 Free Software + Foundation, Inc. Contributed by Cygnus Solutions. Written by Fernando Nasser for Cygnus. @@ -42,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 = 6 }; +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; }; @@ -93,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; @@ -110,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); @@ -134,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--; @@ -147,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); @@ -177,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) ATTR_FORMAT (printf, 6, 0); + 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) ATTR_FORMAT (printf, 3, 0); + 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 = { @@ -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; +struct ui_out *current_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,15 @@ 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) - ATTR_FORMAT (printf, 6, 0); + 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) - ATTR_FORMAT (printf, 3, 0); + 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); @@ -272,7 +270,7 @@ static void verify_field (struct ui_out *uiout, int *fldno, int *width, /* exported functions (ui_out API) */ -/* Mark beginning of a table */ +/* Mark beginning of a table. */ static void ui_out_table_begin (struct ui_out *uiout, int nbrofcols, @@ -374,6 +372,7 @@ ui_out_begin (struct ui_out *uiout, 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 \ @@ -390,6 +389,7 @@ specified after table_body.")); int fldno; int width; int align; + verify_field (uiout, &fldno, &width, &align); } @@ -409,6 +409,7 @@ 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); } @@ -422,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); } @@ -431,6 +433,7 @@ 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; @@ -461,7 +464,6 @@ 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); @@ -478,33 +480,22 @@ ui_out_field_fmt_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, input_width, input_align, fldname, value); } +/* Documented in ui-out.h. */ + 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 (current_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 gdbarch_addr_bit. */ - if (addr_bit <= 32) - strcpy (addstr, hex_string_custom (address, 8)); - else - strcpy (addstr, hex_string_custom (address, 16)); - - ui_out_field_string (uiout, fldname, addstr); + ui_out_field_string (uiout, fldname, + print_core_address (gdbarch, address)); } void @@ -515,6 +506,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 @@ -523,7 +515,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, @@ -563,7 +555,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); @@ -593,9 +585,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); } @@ -648,42 +638,40 @@ ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream) return uo_redirect (uiout, outstream); } -/* set the flags specified by the mask given */ +/* 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; } @@ -748,7 +736,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, @@ -848,7 +836,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, @@ -1002,7 +990,7 @@ uo_redirect (struct ui_out *uiout, struct ui_file *outstream) /* local functions */ -/* list of column headers manipulation routines */ +/* List of column headers manipulation routines. */ static void clear_header_list (struct ui_out *uiout) @@ -1062,7 +1050,7 @@ append_header_to_list (struct ui_out *uiout, uiout->table.header_next = uiout->table.header_last; } -/* Extract the format information for the NEXT header and and advance +/* Extract the format information for the NEXT header and advance the header pointer. Return 0 if there was no next header. */ static int @@ -1127,29 +1115,44 @@ specified after table_body and inside a list.")); } -/* access to ui_out format private members */ +/* Access to ui-out members data. */ -void -ui_out_get_field_separator (struct ui_out *uiout) +void * +ui_out_data (struct ui_out *uiout) { + return uiout->data; } -/* Access to ui-out members data */ - -struct ui_out_data * -ui_out_data (struct ui_out *uiout) +/* Access table field parameters. */ +int +ui_out_query_field (struct ui_out *uiout, int colno, + int *width, int *alignment, char **col_name) { - return uiout->data; + struct ui_out_hdr *hdr; + + if (!uiout->table.flag) + return 0; + + for (hdr = uiout->table.header_first; hdr; hdr = hdr->next) + if (hdr->colno == colno) + { + *width = hdr->width; + *alignment = hdr->alignment; + *col_name = hdr->col_name; + return 1; + } + + return 0; } -/* 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; @@ -1163,7 +1166,7 @@ ui_out_new (struct ui_out_impl *impl, return uiout; } -/* standard gdb initialization hook */ +/* Standard gdb initialization hook. */ void _initialize_ui_out (void)