binutils-gdb/gdb/ui-out.c

1164 lines
27 KiB
C
Raw Normal View History

2000-02-03 05:14:45 +01:00
/* Output generating routines for GDB.
Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
2000-02-03 05:14:45 +01:00
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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. */
#include "defs.h"
#include "gdb_string.h"
#include "expression.h" /* For language.h */
#include "language.h"
#include "ui-out.h"
#include "gdb_assert.h"
2000-02-03 05:14:45 +01:00
/* table header structures */
struct ui_out_hdr
{
int colno;
int width;
int alignment;
char *col_name;
2000-02-03 05:14:45 +01:00
char *colhdr;
struct ui_out_hdr *next;
};
/* 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. */
enum { MAX_UI_OUT_LEVELS = 6 };
struct ui_out_level
{
/* Count each field; the first element is for non-list fields */
int field_count;
/* The type of this level. */
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;
};
2000-02-03 05:14:45 +01:00
/* The ui_out structure */
/* Any change here requires a corresponding one in the initialization
of the default uiout, which is statically initialized */
struct ui_out
{
int flags;
/* specific implementation of ui-out */
struct ui_out_impl *impl;
struct ui_out_data *data;
/* Sub structure tracking the ui-out depth. */
int level;
struct ui_out_level levels[MAX_UI_OUT_LEVELS];
2000-02-03 05:14:45 +01:00
/* A table, if any. At present only a single table is supported. */
struct ui_out_table table;
2000-02-03 05:14:45 +01:00
};
/* 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. */
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. */
uiout->level++;
gdb_assert (uiout->level >= 0 && uiout->level < MAX_UI_OUT_LEVELS);
current = current_level (uiout);
current->field_count = 0;
current->type = type;
return uiout->level;
}
/* Discard the current level, return the discarded level's index.
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. */
gdb_assert (uiout->level > 0 && uiout->level < MAX_UI_OUT_LEVELS);
gdb_assert (current_level (uiout)->type == type);
uiout->level--;
return uiout->level + 1;
}
2000-02-03 05:14:45 +01:00
/* These are the default implementation functions */
static void default_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows, const char *tblid);
2000-02-03 05:14:45 +01:00
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, const char *col_name,
2001-06-10 02:22:41 +02:00
const char *colhdr);
static void default_begin (struct ui_out *uiout,
enum ui_out_type type,
int level, const char *id);
static void default_end (struct ui_out *uiout,
enum ui_out_type type,
int level);
2000-02-03 05:14:45 +01:00
static void default_field_int (struct ui_out *uiout, int fldno, int width,
2001-06-10 02:22:41 +02:00
enum ui_align alig,
const char *fldname,
int value);
2000-02-03 05:14:45 +01:00
static void default_field_skip (struct ui_out *uiout, int fldno, int width,
2001-06-10 02:22:41 +02:00
enum ui_align alig,
const char *fldname);
2000-02-03 05:14:45 +01:00
static void default_field_string (struct ui_out *uiout, int fldno, int width,
2001-06-10 02:22:41 +02:00
enum ui_align align,
const char *fldname,
2000-02-03 05:14:45 +01:00
const char *string);
static void default_field_fmt (struct ui_out *uiout, int fldno,
int width, enum ui_align align,
2001-06-10 02:22:41 +02:00
const char *fldname,
const char *format,
va_list args);
2000-02-03 05:14:45 +01:00
static void default_spaces (struct ui_out *uiout, int numspaces);
2001-06-10 02:22:41 +02:00
static void default_text (struct ui_out *uiout, const char *string);
static void default_message (struct ui_out *uiout, int verbosity,
const char *format,
2000-02-03 05:14:45 +01:00
va_list args);
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 */
struct ui_out_impl default_ui_out_impl =
{
default_table_begin,
default_table_body,
default_table_end,
default_table_header,
default_begin,
default_end,
2000-02-03 05:14:45 +01:00
default_field_int,
default_field_skip,
default_field_string,
default_field_fmt,
default_spaces,
default_text,
default_message,
default_wrap_hint,
default_flush,
NULL,
0, /* Does not need MI hacks. */
2000-02-03 05:14:45 +01:00
};
/* The default ui_out */
struct ui_out def_uiout =
{
0, /* flags */
&default_ui_out_impl, /* impl */
};
/* Pointer to current ui_out */
/* FIXME: This should not be a global, but something passed down from main.c
or top.c */
struct ui_out *uiout = &def_uiout;
/* These are the interfaces to implementation functions */
2001-06-11 18:34:47 +02:00
static void uo_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows, const char *tblid);
2000-02-03 05:14:45 +01:00
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, 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_end (struct ui_out *uiout,
enum ui_out_type type,
int level);
2000-02-03 05:14:45 +01:00
static void uo_field_int (struct ui_out *uiout, int fldno, int width,
2001-06-11 18:34:47 +02:00
enum ui_align align, const char *fldname, int value);
2000-02-03 05:14:45 +01:00
static void uo_field_skip (struct ui_out *uiout, int fldno, int width,
2001-06-11 18:34:47 +02:00
enum ui_align align, const char *fldname);
2000-02-03 05:14:45 +01:00
static void uo_field_string (struct ui_out *uiout, int fldno, int width,
2001-06-11 18:34:47 +02:00
enum ui_align align, const char *fldname,
const char *string);
2000-02-03 05:14:45 +01:00
static void uo_field_fmt (struct ui_out *uiout, int fldno, int width,
2001-06-11 18:34:47 +02:00
enum ui_align align, const char *fldname,
const char *format, va_list args);
2000-02-03 05:14:45 +01:00
static void uo_spaces (struct ui_out *uiout, int numspaces);
2001-06-11 18:34:47 +02:00
static void uo_text (struct ui_out *uiout, const char *string);
2000-02-03 05:14:45 +01:00
static void uo_message (struct ui_out *uiout, int verbosity,
2001-06-11 18:34:47 +02:00
const char *format, va_list args);
2000-02-03 05:14:45 +01:00
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);
2000-02-03 05:14:45 +01:00
/* Prototypes for local functions */
extern void _initialize_ui_out (void);
2001-06-11 18:34:47 +02:00
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,
2000-02-03 05:14:45 +01:00
int *alignment, char **colhdr);
static void clear_header_list (struct ui_out *uiout);
static void verify_field (struct ui_out *uiout, int *fldno, int *width,
int *align);
2000-02-03 05:14:45 +01:00
/* exported functions (ui_out API) */
/* Mark beginning of a table */
static void
2001-06-11 18:34:47 +02:00
ui_out_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows,
2001-06-11 18:34:47 +02:00
const char *tblid)
2000-02-03 05:14:45 +01:00
{
if (uiout->table.flag)
internal_error (__FILE__, __LINE__,
"tables cannot be nested; table_begin found before \
2000-02-03 05:14:45 +01:00
previous table_end.");
uiout->table.flag = 1;
uiout->table.body_flag = 0;
uiout->table.entry_level = uiout->level + 1;
uiout->table.columns = nbrofcols;
2000-02-03 05:14:45 +01:00
if (tblid != NULL)
uiout->table.id = xstrdup (tblid);
2000-02-03 05:14:45 +01:00
else
uiout->table.id = NULL;
2000-02-03 05:14:45 +01:00
clear_header_list (uiout);
uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table.id);
2000-02-03 05:14:45 +01:00
}
void
2000-07-30 03:48:28 +02:00
ui_out_table_body (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
if (!uiout->table.flag)
internal_error (__FILE__, __LINE__,
"table_body outside a table is not valid; it must be \
2000-02-03 05:14:45 +01:00
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 \
2000-02-03 05:14:45 +01:00
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 \
2000-02-03 05:14:45 +01:00
columns.");
uiout->table.body_flag = 1;
uiout->table.header_next = uiout->table.header_first;
2000-02-03 05:14:45 +01:00
uo_table_body (uiout);
}
static void
2000-07-30 03:48:28 +02:00
ui_out_table_end (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
if (!uiout->table.flag)
internal_error (__FILE__, __LINE__,
"misplaced table_end or missing table_begin.");
2000-02-03 05:14:45 +01:00
uiout->table.entry_level = 0;
uiout->table.body_flag = 0;
uiout->table.flag = 0;
2000-02-03 05:14:45 +01:00
uo_table_end (uiout);
if (uiout->table.id)
xfree (uiout->table.id);
2000-02-03 05:14:45 +01:00
clear_header_list (uiout);
}
void
2000-07-30 03:48:28 +02:00
ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
const char *col_name,
2001-06-11 18:34:47 +02:00
const char *colhdr)
2000-02-03 05:14:45 +01:00
{
if (!uiout->table.flag || uiout->table.body_flag)
internal_error (__FILE__, __LINE__,
"table header must be specified after table_begin \
2000-02-03 05:14:45 +01:00
and before table_body.");
append_header_to_list (uiout, width, alignment, col_name, colhdr);
2000-02-03 05:14:45 +01:00
uo_table_header (uiout, width, alignment, col_name, colhdr);
2000-02-03 05:14:45 +01:00
}
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);
}
2000-02-03 05:14:45 +01:00
void
ui_out_begin (struct ui_out *uiout,
enum ui_out_type type,
const char *id)
2000-02-03 05:14:45 +01:00
{
int new_level;
if (uiout->table.flag && !uiout->table.body_flag)
internal_error (__FILE__, __LINE__,
"table header or table_body expected; lists must be \
2000-02-03 05:14:45 +01:00
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);
/* 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_end (struct ui_out *uiout,
enum ui_out_type type)
{
int old_level = pop_level (uiout, type);
uo_end (uiout, type, old_level);
2000-02-03 05:14:45 +01:00
}
struct ui_out_end_cleanup_data
{
struct ui_out *uiout;
enum ui_out_type type;
};
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);
}
static struct cleanup *
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 *
2001-05-12 06:08:24 +02:00
make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
const char *id)
{
ui_out_begin (uiout, ui_out_type_tuple, id);
2001-05-12 06:08:24 +02:00
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_begin (uiout, ui_out_type_list, id);
return make_cleanup_ui_out_end (uiout, ui_out_type_list);
}
2000-02-03 05:14:45 +01:00
void
2001-06-11 18:34:47 +02:00
ui_out_field_int (struct ui_out *uiout,
const char *fldname,
int value)
2000-02-03 05:14:45 +01:00
{
int fldno;
int width;
int align;
struct ui_out_level *current = current_level (uiout);
2000-02-03 05:14:45 +01:00
verify_field (uiout, &fldno, &width, &align);
2000-02-03 05:14:45 +01:00
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;
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);
}
2000-02-03 05:14:45 +01:00
void
2001-06-11 18:34:47 +02:00
ui_out_field_core_addr (struct ui_out *uiout,
const char *fldname,
CORE_ADDR address)
2000-02-03 05:14:45 +01:00
{
char addstr[20];
/* 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. */
2000-02-03 05:14:45 +01:00
/* print_address_numeric (address, 1, local_stream); */
if (TARGET_ADDR_BIT <= 32)
* language.c (local_hex_format_custom): Remove. (local_hex_string): Rename to hex_string, use C format, and move to utils.c (local_hex_string_custom): Rename to hex_string_custom and change interface. Now uses C format. Move to utils.c (local_octal_format_custom): Remove. (local_decimal_format_custom): Remove. (unknown_language_defn): Remove language-specific number formatting entries. (auto_language_defn): Ditto. (local_language_defn): Ditto. * language.h (struct language_format_info): Delete declaration. (struct language_defn): Remove language_format_info fields la_binary_format, la_octal_format, la_decimal_format, la_hex_format. (local_binary_format): Remove macro. (local_binary_format_prefix): Remove macro. (local_binary_format_specifier): Remove macro. (local_binary_format_suffix): Remove macro. (local_octal_format): Remove macro. (local_octal_format_prefix): Remove macro. (local_octal_format_specifier): Remove macro. (local_octal_format_suffix): Remove macro. (local_decimal_format): Remove macro. (local_decimal_format_prefix): Remove macro. (local_decimal_format_specifier): Remove macro. (local_decimal_format_suffix): Remove macro. (local_hex_format): Remove macro. (local_hex_format_prefix): Remove macro. (local_hex_format_specifier): Remove macro. (local_hex_format_suffix): Remove macro. (local_decimal_format_custom): Remove. (local_octal_format_custom): Remove. (local_hex_format_custom): Remove. (local_hex_string): Rename to hex_string and move to defs.h. (local_hex_string_custom): Rename to hex_string_custom, change interface, and move to defs.h. * utils.c: (int_string): New function. (hex_string): New function (from language.c). (hex_string_custom): New function (from language.c). (octal2str): New function. (decimal2str): Add width parameter. (paddr_u): Use new decimal2str interface. (paddr_d): Ditto. * defs.h (hex_string): Declare. (hex_string_custom): Declare. (int_string): Declare. * printcmd.c (print_scalar_formatted): Remove localized binary formatting. * valprint.c (print_longest): Use int_string. (print_floating): Use C hex format. (print_hex_chars): Ditto. (print_binary_chars): Remove language-specific formatting. (print_octal_chars): Use C octal format. (print_decimal_chars): Delocalize format. (print_decimal): Remove. * ada-lang.c (ada_language_defn): Remove language-specific number formatting entries. * p-lang.c (pascal_language_defn): Ditto. * c-lang.c (c_language_defn): Ditto. (cplus_language_defn): Ditto. (asm_language_defn): Ditto. (minimal_language_defn): Ditto. * f-lang.c (f_language_defn): Ditto. * jv-lang.c (java_language_defn): Ditto. * m2-lang.c (m2_language_defn): Ditto. * scm-lang.c (scm_language_defn): Ditto. * objc-lang.c (objc_language_defn): Ditto. * memattr.c (mem_info_command): Use renamed hex_string_custom with new interface. * pa64solib.c (pa64_sharedlibrary_info_command): Ditto. * ui-out.c (ui_out_field_core_addr): Ditto. * breakpoint.c (breakpoint_adjustment_warning): Ditto. * exec.c (print_section_info): Ditto. * i387-tdep.c (print_i387_status_word): Ditto. (print_i387_control_word): Ditto. (i387_print_float_info): Ditto. * maint.c (maint_print_section_info): Ditto. * solib.c (info_sharedlibrary_command): Ditto. * somsolib.c (som_sharedlibrary_info_command): Ditto. * symtab.c (print_msymbol_info): Ditto. * tracepoint.c (tracepoints_info): Ditto. * solib-frv.c (lm_base): Ditto. (frv_current_sos): Ditto. (enable_break2): Ditto. (enable_break): Ditto. * dbxread.c (read_dbx_symtab): Use renamed hex_string. (process_one_symbol): Ditto. * infcmd.c (program_info): Ditto. * mdebugread.c (parse_partial_symbols): Ditto. * symfile.c (add_symbol_file_command): Ditto. * cli/cli-cmds.c (edit_command): Ditto. (list_command): Ditto. * infcall.c (call_function_by_hand): Ditto. * remote-vx.c (vx_run_files_info): Ditto. (vx_wait): Ditto. (vx_attach): Ditto. (vx_detach): Ditto. (vx_kill): Ditto. * aix-thread.c (pdc_symbol_addrs): Ditto. (pdc_read_regs): Ditto. (pdc_write_regs): Ditto. (pdc_read_data): Ditto. (pdc_write_data): Ditto. * d10v-tdep.c (display_trace): Ditto. * rs6000-nat.c (find_toc_address): Ditto. * aix-thread.c: Don't include language.h. * buildsym.c: Ditto. * dbxread.c: Ditto. * mdebugread.c: Ditto. * rs6000-nat.c: Ditto. * buildsym.c (make_blockvector): Use renamed hex_string.
2004-09-11 12:24:53 +02:00
strcpy (addstr, hex_string_custom (address, 8));
else
* language.c (local_hex_format_custom): Remove. (local_hex_string): Rename to hex_string, use C format, and move to utils.c (local_hex_string_custom): Rename to hex_string_custom and change interface. Now uses C format. Move to utils.c (local_octal_format_custom): Remove. (local_decimal_format_custom): Remove. (unknown_language_defn): Remove language-specific number formatting entries. (auto_language_defn): Ditto. (local_language_defn): Ditto. * language.h (struct language_format_info): Delete declaration. (struct language_defn): Remove language_format_info fields la_binary_format, la_octal_format, la_decimal_format, la_hex_format. (local_binary_format): Remove macro. (local_binary_format_prefix): Remove macro. (local_binary_format_specifier): Remove macro. (local_binary_format_suffix): Remove macro. (local_octal_format): Remove macro. (local_octal_format_prefix): Remove macro. (local_octal_format_specifier): Remove macro. (local_octal_format_suffix): Remove macro. (local_decimal_format): Remove macro. (local_decimal_format_prefix): Remove macro. (local_decimal_format_specifier): Remove macro. (local_decimal_format_suffix): Remove macro. (local_hex_format): Remove macro. (local_hex_format_prefix): Remove macro. (local_hex_format_specifier): Remove macro. (local_hex_format_suffix): Remove macro. (local_decimal_format_custom): Remove. (local_octal_format_custom): Remove. (local_hex_format_custom): Remove. (local_hex_string): Rename to hex_string and move to defs.h. (local_hex_string_custom): Rename to hex_string_custom, change interface, and move to defs.h. * utils.c: (int_string): New function. (hex_string): New function (from language.c). (hex_string_custom): New function (from language.c). (octal2str): New function. (decimal2str): Add width parameter. (paddr_u): Use new decimal2str interface. (paddr_d): Ditto. * defs.h (hex_string): Declare. (hex_string_custom): Declare. (int_string): Declare. * printcmd.c (print_scalar_formatted): Remove localized binary formatting. * valprint.c (print_longest): Use int_string. (print_floating): Use C hex format. (print_hex_chars): Ditto. (print_binary_chars): Remove language-specific formatting. (print_octal_chars): Use C octal format. (print_decimal_chars): Delocalize format. (print_decimal): Remove. * ada-lang.c (ada_language_defn): Remove language-specific number formatting entries. * p-lang.c (pascal_language_defn): Ditto. * c-lang.c (c_language_defn): Ditto. (cplus_language_defn): Ditto. (asm_language_defn): Ditto. (minimal_language_defn): Ditto. * f-lang.c (f_language_defn): Ditto. * jv-lang.c (java_language_defn): Ditto. * m2-lang.c (m2_language_defn): Ditto. * scm-lang.c (scm_language_defn): Ditto. * objc-lang.c (objc_language_defn): Ditto. * memattr.c (mem_info_command): Use renamed hex_string_custom with new interface. * pa64solib.c (pa64_sharedlibrary_info_command): Ditto. * ui-out.c (ui_out_field_core_addr): Ditto. * breakpoint.c (breakpoint_adjustment_warning): Ditto. * exec.c (print_section_info): Ditto. * i387-tdep.c (print_i387_status_word): Ditto. (print_i387_control_word): Ditto. (i387_print_float_info): Ditto. * maint.c (maint_print_section_info): Ditto. * solib.c (info_sharedlibrary_command): Ditto. * somsolib.c (som_sharedlibrary_info_command): Ditto. * symtab.c (print_msymbol_info): Ditto. * tracepoint.c (tracepoints_info): Ditto. * solib-frv.c (lm_base): Ditto. (frv_current_sos): Ditto. (enable_break2): Ditto. (enable_break): Ditto. * dbxread.c (read_dbx_symtab): Use renamed hex_string. (process_one_symbol): Ditto. * infcmd.c (program_info): Ditto. * mdebugread.c (parse_partial_symbols): Ditto. * symfile.c (add_symbol_file_command): Ditto. * cli/cli-cmds.c (edit_command): Ditto. (list_command): Ditto. * infcall.c (call_function_by_hand): Ditto. * remote-vx.c (vx_run_files_info): Ditto. (vx_wait): Ditto. (vx_attach): Ditto. (vx_detach): Ditto. (vx_kill): Ditto. * aix-thread.c (pdc_symbol_addrs): Ditto. (pdc_read_regs): Ditto. (pdc_write_regs): Ditto. (pdc_read_data): Ditto. (pdc_write_data): Ditto. * d10v-tdep.c (display_trace): Ditto. * rs6000-nat.c (find_toc_address): Ditto. * aix-thread.c: Don't include language.h. * buildsym.c: Ditto. * dbxread.c: Ditto. * mdebugread.c: Ditto. * rs6000-nat.c: Ditto. * buildsym.c (make_blockvector): Use renamed hex_string.
2004-09-11 12:24:53 +02:00
strcpy (addstr, hex_string_custom (address, 16));
2000-02-03 05:14:45 +01:00
ui_out_field_string (uiout, fldname, addstr);
}
void
2001-06-11 18:34:47 +02:00
ui_out_field_stream (struct ui_out *uiout,
const char *fldname,
struct ui_stream *buf)
2000-02-03 05:14:45 +01:00
{
long length;
char *buffer = ui_file_xstrdup (buf->stream, &length);
2000-12-15 02:01:51 +01:00
struct cleanup *old_cleanup = make_cleanup (xfree, buffer);
2000-02-03 05:14:45 +01:00
if (length > 0)
ui_out_field_string (uiout, fldname, buffer);
else
ui_out_field_skip (uiout, fldname);
ui_file_rewind (buf->stream);
do_cleanups (old_cleanup);
}
/* used to ommit a field */
void
2001-06-11 18:34:47 +02:00
ui_out_field_skip (struct ui_out *uiout,
const char *fldname)
2000-02-03 05:14:45 +01:00
{
int fldno;
int width;
int align;
verify_field (uiout, &fldno, &width, &align);
2000-02-03 05:14:45 +01:00
uo_field_skip (uiout, fldno, width, align, fldname);
}
void
ui_out_field_string (struct ui_out *uiout,
2001-06-11 18:34:47 +02:00
const char *fldname,
2000-02-03 05:14:45 +01:00
const char *string)
{
int fldno;
int width;
int align;
verify_field (uiout, &fldno, &width, &align);
2000-02-03 05:14:45 +01:00
uo_field_string (uiout, fldno, width, align, fldname, string);
}
/* VARARGS */
void
2001-06-11 18:34:47 +02:00
ui_out_field_fmt (struct ui_out *uiout,
const char *fldname,
const char *format, ...)
2000-02-03 05:14:45 +01:00
{
va_list args;
int fldno;
int width;
int align;
/* will not align, but has to call anyway */
verify_field (uiout, &fldno, &width, &align);
2000-02-03 05:14:45 +01:00
va_start (args, format);
uo_field_fmt (uiout, fldno, width, align, fldname, format, args);
va_end (args);
}
void
2000-07-30 03:48:28 +02:00
ui_out_spaces (struct ui_out *uiout, int numspaces)
2000-02-03 05:14:45 +01:00
{
uo_spaces (uiout, numspaces);
}
void
2001-06-11 18:34:47 +02:00
ui_out_text (struct ui_out *uiout,
const char *string)
2000-02-03 05:14:45 +01:00
{
uo_text (uiout, string);
}
void
2001-06-11 18:34:47 +02:00
ui_out_message (struct ui_out *uiout, int verbosity,
const char *format,...)
2000-02-03 05:14:45 +01:00
{
va_list args;
va_start (args, format);
uo_message (uiout, verbosity, format, args);
va_end (args);
}
struct ui_stream *
2000-07-30 03:48:28 +02:00
ui_out_stream_new (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
struct ui_stream *tempbuf;
tempbuf = XMALLOC (struct ui_stream);
tempbuf->uiout = uiout;
tempbuf->stream = mem_fileopen ();
return tempbuf;
}
void
2000-07-30 03:48:28 +02:00
ui_out_stream_delete (struct ui_stream *buf)
2000-02-03 05:14:45 +01:00
{
ui_file_delete (buf->stream);
2000-12-15 02:01:51 +01:00
xfree (buf);
2000-02-03 05:14:45 +01:00
}
static void
do_stream_delete (void *buf)
{
ui_out_stream_delete (buf);
}
struct cleanup *
make_cleanup_ui_out_stream_delete (struct ui_stream *buf)
{
return make_cleanup (do_stream_delete, buf);
}
void
2000-07-30 03:48:28 +02:00
ui_out_wrap_hint (struct ui_out *uiout, char *identstring)
2000-02-03 05:14:45 +01:00
{
uo_wrap_hint (uiout, identstring);
}
void
2000-07-30 03:48:28 +02:00
ui_out_flush (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
uo_flush (uiout);
}
int
ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream)
{
return uo_redirect (uiout, outstream);
}
2000-02-03 05:14:45 +01:00
/* set the flags specified by the mask given */
int
2000-07-30 03:48:28 +02:00
ui_out_set_flags (struct ui_out *uiout, int mask)
2000-02-03 05:14:45 +01:00
{
int oldflags = uiout->flags;
2000-02-03 05:14:45 +01:00
uiout->flags |= mask;
2000-02-03 05:14:45 +01:00
return oldflags;
}
/* clear the flags specified by the mask given */
int
2000-07-30 03:48:28 +02:00
ui_out_clear_flags (struct ui_out *uiout, int mask)
2000-02-03 05:14:45 +01:00
{
int oldflags = uiout->flags;
2000-02-03 05:14:45 +01:00
uiout->flags &= ~mask;
return oldflags;
}
/* test the flags against the mask given */
int
2000-07-30 03:48:28 +02:00
ui_out_test_flags (struct ui_out *uiout, int mask)
2000-02-03 05:14:45 +01:00
{
return (uiout->flags & mask);
}
/* obtain the current verbosity level (as stablished by the
'set verbositylevel' command */
int
2000-07-30 03:48:28 +02:00
ui_out_get_verblvl (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
/* FIXME: not implemented yet */
return 0;
}
#if 0
void
2000-07-30 03:48:28 +02:00
ui_out_result_begin (struct ui_out *uiout, char *class)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_result_end (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_info_begin (struct ui_out *uiout, char *class)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_info_end (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_notify_begin (struct ui_out *uiout, char *class)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_notify_end (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_error_begin (struct ui_out *uiout, char *class)
2000-02-03 05:14:45 +01:00
{
}
void
2000-07-30 03:48:28 +02:00
ui_out_error_end (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
#endif
#if 0
void
gdb_error (ui_out * uiout, int severity, char *format,...)
{
va_list args;
}
void
2000-10-31 06:49:55 +01:00
gdb_query (struct ui_out *uiout, int qflags, char *qprompt)
2000-02-03 05:14:45 +01:00
{
}
#endif
int
ui_out_is_mi_like_p (struct ui_out *uiout)
{
return uiout->impl->is_mi_like_p;
}
2000-02-03 05:14:45 +01:00
/* default gdb-out hook functions */
static void
default_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows,
const char *tblid)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_table_body (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_table_end (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
const char *col_name,
2001-06-10 02:22:41 +02:00
const char *colhdr)
2000-02-03 05:14:45 +01:00
{
}
static void
default_begin (struct ui_out *uiout,
enum ui_out_type type,
int level,
const char *id)
2000-02-03 05:14:45 +01:00
{
}
static void
default_end (struct ui_out *uiout,
enum ui_out_type type,
int level)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_field_int (struct ui_out *uiout, int fldno, int width,
2001-06-10 02:22:41 +02:00
enum ui_align align,
const char *fldname, int value)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_field_skip (struct ui_out *uiout, int fldno, int width,
2001-06-10 02:22:41 +02:00
enum ui_align align, const char *fldname)
2000-02-03 05:14:45 +01:00
{
}
static void
default_field_string (struct ui_out *uiout,
int fldno,
int width,
enum ui_align align,
2001-06-10 02:22:41 +02:00
const char *fldname,
2000-02-03 05:14:45 +01:00
const char *string)
{
}
static void
2000-07-30 03:48:28 +02:00
default_field_fmt (struct ui_out *uiout, int fldno, int width,
2001-06-10 02:22:41 +02:00
enum ui_align align,
const char *fldname,
const char *format,
2000-07-30 03:48:28 +02:00
va_list args)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_spaces (struct ui_out *uiout, int numspaces)
2000-02-03 05:14:45 +01:00
{
}
static void
2001-06-10 02:22:41 +02:00
default_text (struct ui_out *uiout, const char *string)
2000-02-03 05:14:45 +01:00
{
}
static void
2001-06-10 02:22:41 +02:00
default_message (struct ui_out *uiout, int verbosity,
const char *format,
2000-07-30 03:48:28 +02:00
va_list args)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_wrap_hint (struct ui_out *uiout, char *identstring)
2000-02-03 05:14:45 +01:00
{
}
static void
2000-07-30 03:48:28 +02:00
default_flush (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
/* Interface to the implementation functions */
void
2001-06-11 18:34:47 +02:00
uo_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows,
2001-06-11 18:34:47 +02:00
const char *tblid)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->table_begin)
return;
uiout->impl->table_begin (uiout, nbrofcols, nr_rows, tblid);
2000-02-03 05:14:45 +01:00
}
void
uo_table_body (struct ui_out *uiout)
{
if (!uiout->impl->table_body)
return;
uiout->impl->table_body (uiout);
}
void
uo_table_end (struct ui_out *uiout)
{
if (!uiout->impl->table_end)
return;
uiout->impl->table_end (uiout);
}
void
2001-06-11 18:34:47 +02:00
uo_table_header (struct ui_out *uiout, int width, enum ui_align align,
const char *col_name,
2001-06-11 18:34:47 +02:00
const char *colhdr)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->table_header)
return;
uiout->impl->table_header (uiout, width, align, col_name, colhdr);
2000-02-03 05:14:45 +01:00
}
void
uo_begin (struct ui_out *uiout,
enum ui_out_type type,
int level,
const char *id)
2000-02-03 05:14:45 +01:00
{
if (uiout->impl->begin == NULL)
2000-02-03 05:14:45 +01:00
return;
uiout->impl->begin (uiout, type, level, id);
2000-02-03 05:14:45 +01:00
}
void
uo_end (struct ui_out *uiout,
enum ui_out_type type,
int level)
2000-02-03 05:14:45 +01:00
{
if (uiout->impl->end == NULL)
2000-02-03 05:14:45 +01:00
return;
uiout->impl->end (uiout, type, level);
2000-02-03 05:14:45 +01:00
}
void
2001-06-11 18:34:47 +02:00
uo_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align align,
const char *fldname,
int value)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->field_int)
return;
uiout->impl->field_int (uiout, fldno, width, align, fldname, value);
}
void
2001-06-11 18:34:47 +02:00
uo_field_skip (struct ui_out *uiout, int fldno, int width, enum ui_align align,
const char *fldname)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->field_skip)
return;
uiout->impl->field_skip (uiout, fldno, width, align, fldname);
}
void
uo_field_string (struct ui_out *uiout, int fldno, int width,
2001-06-11 18:34:47 +02:00
enum ui_align align,
const char *fldname,
const char *string)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->field_string)
return;
uiout->impl->field_string (uiout, fldno, width, align, fldname, string);
}
void
2001-06-11 18:34:47 +02:00
uo_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align,
const char *fldname,
const char *format,
va_list args)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->field_fmt)
return;
uiout->impl->field_fmt (uiout, fldno, width, align, fldname, format, args);
}
void
uo_spaces (struct ui_out *uiout, int numspaces)
{
if (!uiout->impl->spaces)
return;
uiout->impl->spaces (uiout, numspaces);
}
void
2001-06-11 18:34:47 +02:00
uo_text (struct ui_out *uiout,
const char *string)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->text)
return;
uiout->impl->text (uiout, string);
}
void
2001-06-11 18:34:47 +02:00
uo_message (struct ui_out *uiout, int verbosity,
const char *format,
va_list args)
2000-02-03 05:14:45 +01:00
{
if (!uiout->impl->message)
return;
uiout->impl->message (uiout, verbosity, format, args);
}
void
uo_wrap_hint (struct ui_out *uiout, char *identstring)
{
if (!uiout->impl->wrap_hint)
return;
uiout->impl->wrap_hint (uiout, identstring);
}
void
uo_flush (struct ui_out *uiout)
{
if (!uiout->impl->flush)
return;
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;
}
2000-02-03 05:14:45 +01:00
/* local functions */
/* list of column headers manipulation routines */
static void
2000-07-30 03:48:28 +02:00
clear_header_list (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
while (uiout->table.header_first != NULL)
2000-02-03 05:14:45 +01:00
{
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);
2000-02-03 05:14:45 +01:00
}
gdb_assert (uiout->table.header_first == NULL);
uiout->table.header_last = NULL;
uiout->table.header_next = NULL;
2000-02-03 05:14:45 +01:00
}
static void
append_header_to_list (struct ui_out *uiout,
int width,
int alignment,
const char *col_name,
2001-06-11 18:34:47 +02:00
const char *colhdr)
2000-02-03 05:14:45 +01:00
{
struct ui_out_hdr *temphdr;
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 */
if (colhdr != NULL)
temphdr->colhdr = xstrdup (colhdr);
else
temphdr->colhdr = NULL;
if (col_name != NULL)
temphdr->col_name = xstrdup (colhdr);
else
temphdr->col_name = xstrdup (colhdr);
2000-02-03 05:14:45 +01:00
temphdr->next = NULL;
if (uiout->table.header_first == NULL)
2000-02-03 05:14:45 +01:00
{
temphdr->colno = 1;
uiout->table.header_first = temphdr;
uiout->table.header_last = temphdr;
2000-02-03 05:14:45 +01:00
}
else
{
temphdr->colno = uiout->table.header_last->colno + 1;
uiout->table.header_last->next = temphdr;
uiout->table.header_last = temphdr;
2000-02-03 05:14:45 +01:00
}
uiout->table.header_next = uiout->table.header_last;
2000-02-03 05:14:45 +01:00
}
/* Extract the format information for the NEXT header and and advance
the header pointer. Return 0 if there was no next header. */
2000-02-03 05:14:45 +01:00
static int
get_next_header (struct ui_out *uiout,
2000-02-03 05:14:45 +01:00
int *colno,
int *width,
int *alignment,
char **colhdr)
{
/* There may be no headers at all or we may have used all columns. */
if (uiout->table.header_next == NULL)
2000-02-03 05:14:45 +01:00
return 0;
*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;
2000-02-03 05:14:45 +01:00
return 1;
}
/* Verify that the field/tuple/list is correctly positioned. Return
the field number and corresponding alignment (if
available/applicable). */
2000-02-03 05:14:45 +01:00
static void
verify_field (struct ui_out *uiout, int *fldno, int *width, int *align)
2000-02-03 05:14:45 +01:00
{
struct ui_out_level *current = current_level (uiout);
char *text;
if (uiout->table.flag)
2000-02-03 05:14:45 +01:00
{
if (!uiout->table.body_flag)
internal_error (__FILE__, __LINE__,
"table_body missing; table fields must be \
2000-02-03 05:14:45 +01:00
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. */
2000-02-03 05:14:45 +01:00
}
current->field_count += 1;
2000-02-03 05:14:45 +01:00
if (uiout->table.body_flag
&& uiout->table.entry_level == uiout->level
&& get_next_header (uiout, fldno, width, align, &text))
2000-02-03 05:14:45 +01:00
{
if (*fldno != current->field_count)
internal_error (__FILE__, __LINE__,
"ui-out internal error in handling headers.");
2000-02-03 05:14:45 +01:00
}
else
{
*width = 0;
*align = ui_noalign;
*fldno = current->field_count;
2000-02-03 05:14:45 +01:00
}
}
2000-02-03 05:14:45 +01:00
/* access to ui_out format private members */
void
2000-07-30 03:48:28 +02:00
ui_out_get_field_separator (struct ui_out *uiout)
2000-02-03 05:14:45 +01:00
{
}
/* Access to ui-out members data */
struct ui_out_data *
ui_out_data (struct ui_out *uiout)
{
return uiout->data;
}
/* initalize private members at startup */
struct ui_out *
ui_out_new (struct ui_out_impl *impl,
struct ui_out_data *data,
int flags)
{
struct ui_out *uiout = XMALLOC (struct ui_out);
uiout->data = data;
uiout->impl = impl;
uiout->flags = flags;
uiout->table.flag = 0;
uiout->table.body_flag = 0;
uiout->level = 0;
memset (uiout->levels, 0, sizeof (uiout->levels));
uiout->table.header_first = NULL;
uiout->table.header_last = NULL;
uiout->table.header_next = NULL;
2000-02-03 05:14:45 +01:00
return uiout;
}
/* standard gdb initialization hook */
void
2000-07-30 03:48:28 +02:00
_initialize_ui_out (void)
2000-02-03 05:14:45 +01:00
{
/* nothing needs to be done */
}