2008-12-02 08:57:38 +01:00
|
|
|
/* Routines for handling XML generic OS data provided by target.
|
|
|
|
|
2011-01-01 16:34:07 +01:00
|
|
|
Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
2008-12-02 08:57:38 +01:00
|
|
|
|
|
|
|
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 3 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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "target.h"
|
|
|
|
#include "vec.h"
|
|
|
|
#include "xml-support.h"
|
|
|
|
#include "osdata.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include "ui-out.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
|
|
|
#if !defined(HAVE_LIBEXPAT)
|
|
|
|
|
|
|
|
struct osdata *
|
|
|
|
osdata_parse (const char *xml)
|
|
|
|
{
|
|
|
|
static int have_warned;
|
|
|
|
|
|
|
|
if (!have_warned)
|
|
|
|
{
|
|
|
|
have_warned = 1;
|
|
|
|
warning (_("Can not parse XML OS data; XML support was disabled "
|
|
|
|
"at compile time"));
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* HAVE_LIBEXPAT */
|
|
|
|
|
|
|
|
#include "xml-support.h"
|
|
|
|
|
|
|
|
/* Internal parsing data passed to all XML callbacks. */
|
|
|
|
struct osdata_parsing_data
|
|
|
|
{
|
|
|
|
struct osdata *osdata;
|
|
|
|
char *property_name;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Handle the start of a <osdata> element. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
osdata_start_osdata (struct gdb_xml_parser *parser,
|
|
|
|
const struct gdb_xml_element *element,
|
|
|
|
void *user_data, VEC(gdb_xml_value_s) *attributes)
|
|
|
|
{
|
|
|
|
struct osdata_parsing_data *data = user_data;
|
|
|
|
char *type;
|
|
|
|
struct osdata *osdata;
|
|
|
|
|
|
|
|
if (data->osdata)
|
|
|
|
gdb_xml_error (parser, _("Seen more than on osdata element"));
|
|
|
|
|
2011-02-02 17:12:59 +01:00
|
|
|
type = xml_find_attribute (attributes, "type")->value;
|
2008-12-02 08:57:38 +01:00
|
|
|
osdata = XZALLOC (struct osdata);
|
|
|
|
osdata->type = xstrdup (type);
|
|
|
|
data->osdata = osdata;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the start of a <item> element. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
osdata_start_item (struct gdb_xml_parser *parser,
|
|
|
|
const struct gdb_xml_element *element,
|
|
|
|
void *user_data, VEC(gdb_xml_value_s) *attributes)
|
|
|
|
{
|
|
|
|
struct osdata_parsing_data *data = user_data;
|
|
|
|
struct osdata_item item = { NULL };
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
VEC_safe_push (osdata_item_s, data->osdata->items, &item);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the start of a <column> element. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
osdata_start_column (struct gdb_xml_parser *parser,
|
|
|
|
const struct gdb_xml_element *element,
|
|
|
|
void *user_data, VEC(gdb_xml_value_s) *attributes)
|
|
|
|
{
|
|
|
|
struct osdata_parsing_data *data = user_data;
|
2011-02-02 17:12:59 +01:00
|
|
|
const char *name = xml_find_attribute (attributes, "name")->value;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
data->property_name = xstrdup (name);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the end of a <column> element. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
osdata_end_column (struct gdb_xml_parser *parser,
|
|
|
|
const struct gdb_xml_element *element,
|
|
|
|
void *user_data, const char *body_text)
|
|
|
|
{
|
|
|
|
struct osdata_parsing_data *data = user_data;
|
|
|
|
struct osdata *osdata = data->osdata;
|
|
|
|
struct osdata_item *item = VEC_last (osdata_item_s, osdata->items);
|
|
|
|
struct osdata_column *col = VEC_safe_push (osdata_column_s,
|
|
|
|
item->columns, NULL);
|
|
|
|
|
|
|
|
/* Transfer memory ownership. NAME was already strdup'ed. */
|
|
|
|
col->name = data->property_name;
|
|
|
|
col->value = xstrdup (body_text);
|
|
|
|
data->property_name = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Discard the constructed osdata (if an error occurs). */
|
|
|
|
|
|
|
|
static void
|
|
|
|
clear_parsing_data (void *p)
|
|
|
|
{
|
|
|
|
struct osdata_parsing_data *data = p;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
osdata_free (data->osdata);
|
|
|
|
data->osdata = NULL;
|
|
|
|
xfree (data->property_name);
|
|
|
|
data->property_name = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The allowed elements and attributes for OS data object.
|
|
|
|
The root element is a <osdata>. */
|
|
|
|
|
|
|
|
const struct gdb_xml_attribute column_attributes[] = {
|
|
|
|
{ "name", GDB_XML_AF_NONE, NULL, NULL },
|
|
|
|
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct gdb_xml_element item_children[] = {
|
|
|
|
{ "column", column_attributes, NULL,
|
|
|
|
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
|
|
|
|
osdata_start_column, osdata_end_column },
|
|
|
|
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct gdb_xml_attribute osdata_attributes[] = {
|
|
|
|
{ "type", GDB_XML_AF_NONE, NULL, NULL },
|
|
|
|
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct gdb_xml_element osdata_children[] = {
|
|
|
|
{ "item", NULL, item_children,
|
|
|
|
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
|
|
|
|
osdata_start_item, NULL },
|
|
|
|
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct gdb_xml_element osdata_elements[] = {
|
|
|
|
{ "osdata", osdata_attributes, osdata_children,
|
|
|
|
GDB_XML_EF_NONE, osdata_start_osdata, NULL },
|
|
|
|
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct osdata *
|
|
|
|
osdata_parse (const char *xml)
|
|
|
|
{
|
2011-01-25 10:49:59 +01:00
|
|
|
struct cleanup *back_to;
|
2008-12-02 08:57:38 +01:00
|
|
|
struct osdata_parsing_data data = { NULL };
|
|
|
|
|
2011-01-25 10:49:59 +01:00
|
|
|
back_to = make_cleanup (clear_parsing_data, &data);
|
2008-12-02 08:57:38 +01:00
|
|
|
|
2011-01-25 10:49:59 +01:00
|
|
|
if (gdb_xml_parse_quick (_("osdata"), "osdata.dtd",
|
|
|
|
osdata_elements, xml, &data) == 0)
|
|
|
|
{
|
|
|
|
/* Parsed successfully, don't need to delete the result. */
|
|
|
|
discard_cleanups (back_to);
|
|
|
|
return data.osdata;
|
|
|
|
}
|
2008-12-02 08:57:38 +01:00
|
|
|
|
|
|
|
do_cleanups (back_to);
|
2011-01-25 10:49:59 +01:00
|
|
|
return NULL;
|
2008-12-02 08:57:38 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-12-02 16:52:15 +01:00
|
|
|
static void
|
|
|
|
osdata_item_clear (struct osdata_item *item)
|
|
|
|
{
|
|
|
|
if (item->columns != NULL)
|
|
|
|
{
|
|
|
|
struct osdata_column *col;
|
|
|
|
int ix;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 16:52:15 +01:00
|
|
|
for (ix = 0;
|
|
|
|
VEC_iterate (osdata_column_s, item->columns,
|
|
|
|
ix, col);
|
|
|
|
ix++)
|
|
|
|
{
|
|
|
|
xfree (col->name);
|
|
|
|
xfree (col->value);
|
|
|
|
}
|
|
|
|
VEC_free (osdata_column_s, item->columns);
|
|
|
|
item->columns = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
void
|
|
|
|
osdata_free (struct osdata *osdata)
|
|
|
|
{
|
|
|
|
if (osdata == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (osdata->items != NULL)
|
|
|
|
{
|
|
|
|
struct osdata_item *item;
|
|
|
|
int ix;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
for (ix = 0;
|
|
|
|
VEC_iterate (osdata_item_s, osdata->items,
|
|
|
|
ix, item);
|
|
|
|
ix++)
|
|
|
|
osdata_item_clear (item);
|
|
|
|
VEC_free (osdata_item_s, osdata->items);
|
|
|
|
}
|
|
|
|
|
|
|
|
xfree (osdata);
|
|
|
|
}
|
|
|
|
|
2008-12-02 16:52:15 +01:00
|
|
|
static void
|
|
|
|
osdata_free_cleanup (void *arg)
|
|
|
|
{
|
|
|
|
struct osdata *osdata = arg;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 16:52:15 +01:00
|
|
|
osdata_free (osdata);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
make_cleanup_osdata_free (struct osdata *data)
|
|
|
|
{
|
|
|
|
return make_cleanup (osdata_free_cleanup, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct osdata *
|
|
|
|
get_osdata (const char *type)
|
2008-12-02 08:57:38 +01:00
|
|
|
{
|
2008-12-02 16:52:15 +01:00
|
|
|
struct osdata *osdata = NULL;
|
2008-12-02 08:57:38 +01:00
|
|
|
char *xml = target_get_osdata (type);
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
if (xml)
|
|
|
|
{
|
2008-12-02 16:52:15 +01:00
|
|
|
struct cleanup *old_chain = make_cleanup (xfree, xml);
|
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
if (xml[0] == '\0')
|
2010-06-19 01:06:30 +02:00
|
|
|
{
|
|
|
|
if (type)
|
|
|
|
warning (_("Empty data returned by target. Wrong osdata type?"));
|
|
|
|
else
|
|
|
|
warning (_("Empty type list returned by target. No type data?"));
|
|
|
|
}
|
2008-12-02 16:52:15 +01:00
|
|
|
else
|
|
|
|
osdata = osdata_parse (xml);
|
|
|
|
|
|
|
|
do_cleanups (old_chain);
|
2008-12-02 08:57:38 +01:00
|
|
|
}
|
2008-12-02 16:52:15 +01:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
if (!osdata)
|
2011-03-16 18:59:03 +01:00
|
|
|
error (_("Can not fetch data now."));
|
2008-12-02 08:57:38 +01:00
|
|
|
|
|
|
|
return osdata;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
get_osdata_column (struct osdata_item *item, const char *name)
|
|
|
|
{
|
|
|
|
struct osdata_column *col;
|
|
|
|
int ix_cols;
|
|
|
|
|
|
|
|
for (ix_cols = 0;
|
|
|
|
VEC_iterate (osdata_column_s, item->columns,
|
|
|
|
ix_cols, col);
|
|
|
|
ix_cols++)
|
|
|
|
if (strcmp (col->name, name) == 0)
|
|
|
|
return col->value;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-21 17:14:50 +01:00
|
|
|
static void
|
2008-12-02 08:57:38 +01:00
|
|
|
info_osdata_command (char *type, int from_tty)
|
|
|
|
{
|
2011-08-04 Pedro Alves <pedro@codesourcery.com>
* ui-out.h (uiout): Rename to ...
(current_uiout): ... this.
* ui-out.c (uiout): Rename to ...
(current_uiout): ... this.
* ada-lang.c (print_it_exception, print_one_exception)
(print_mention_exception): Adjust.
* breakpoint.c (watchpoint_check): Adjust.
(print_breakpoint_location, print_one_breakpoint, breakpoint_1)
(default_collect_info, watchpoints_info, print_one_catch_fork)
(print_one_catch_vfork, print_one_catch_syscall)
(print_one_catch_exec, mention, print_it_ranged_breakpoint)
(print_one_ranged_breakpoint, print_mention_ranged_breakpoint)
(print_it_watchpoint, print_mention_watchpoint)
(print_it_masked_watchpoint, print_mention_masked_watchpoint)
(print_it_exception_catchpoint, print_one_exception_catchpoint)
(print_mention_exception_catchpoint, say_where, bkpt_print_it)
(bkpt_print_mention, momentary_bkpt_print_it)
(tracepoint_print_mention, update_static_tracepoint)
(tracepoints_info, save_breakpoints): Adjust.
* cli-out.c (field_separator): Adjust.
* cp-abi.c (list_cp_abis, show_cp_abi_cmd): Adjust.
* exceptions.c (catch_exceptions_with_msg, catch_errors): Adjust.
* frame.c (get_current_frame): Adjust.
* infcmd.c (run_command_1, print_return_value): Adjust.
* inferior.c (inferior_command, info_inferiors_command): Adjust.
* infrun.c (print_end_stepping_range_reason): Adjust.
(print_signal_exited_reason, print_exited_reason): Adjust.
(print_signal_received_reason, print_no_history_reason): Adjust.
* interps.c (interp_set): Adjust.
* osdata.c (info_osdata_command): Adjust.
* progspace.c (maintenance_info_program_spaces_command): Adjust.
* remote-fileio.c (remote_fileio_request): Adjust.
* remote.c (show_remote_cmd): Adjust.
* solib.c (info_sharedlibrary_command): Adjust.
* source.c (print_source_lines_base): Adjust.
* stack.c (print_stack_frame): Adjust.
(do_gdb_disassembly, print_frame_info, print_frame): Adjust.
* symfile-mem.c (add_vsyscall_page): Adjust.
* symfile.c (load_progress, generic_load)
(print_transfer_performance): Adjust.
* thread.c (info_threads_command, restore_selected_frame)
(thread_command): Adjust.
* top.c (make_cleanup_restore_ui_file): Adjust.
* tracepoint.c (tvariables_info_1, trace_status_mi, tfind_1)
(print_one_static_tracepoint_marker): Adjust.
* cli/cli-cmds.c (print_disassembly): Adjust.
* cli/cli-decode.c (print_doc_line): Adjust.
* cli/cli-interp.c (safe_execute_command): Adjust.
* cli/cli-logging.c (set_logging_redirect, pop_output_files)
(handle_redirections): Adjust.
* cli/cli-script.c (show_user_1): Adjust.
* cli/cli-setshow.c (do_setshow_command, cmd_show_list): Adjust.
* mi/mi-cmd-break.c (breakpoint_notify): Adjust.
* mi/mi-cmd-disas.c (mi_cmd_disassemble): Adjust.
* mi/mi-cmd-env.c (mi_cmd_env_pwd, mi_cmd_env_path)
(mi_cmd_env_dir): Adjust.
* mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file)
(print_partial_file_name, mi_cmd_file_list_exec_source_files): Adjust.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames)
(mi_cmd_stack_info_depth, mi_cmd_stack_list_args)
(list_args_or_locals): Adjust.
* mi/mi-cmd-var.c (print_varobj, mi_cmd_var_create)
(mi_cmd_var_delete, mi_cmd_var_set_format, mi_cmd_var_set_frozen)
(mi_cmd_var_show_format, mi_cmd_var_info_num_children)
(mi_cmd_var_list_children, mi_cmd_var_info_type)
(mi_cmd_var_info_path_expression, mi_cmd_var_info_expression)
(mi_cmd_var_show_attributes, mi_cmd_var_evaluate_expression)
(mi_cmd_var_assign, mi_cmd_var_update, varobj_update_one): Adjust.
* mi/mi-interp.c (mi_on_normal_stop): Adjust.
* mi/mi-main.c (mi_cmd_gdb_exit, mi_cmd_thread_select)
(mi_cmd_thread_list_ids, mi_cmd_thread_info, print_one_inferior)
(list_available_thread_groups, mi_cmd_list_thread_groups)
(mi_cmd_data_list_register_names)
(mi_cmd_data_list_changed_registers)
(mi_cmd_data_list_register_values, get_register)
(mi_cmd_data_evaluate_expression, mi_cmd_data_read_memory)
(mi_cmd_data_read_memory_bytes, mi_cmd_list_features)
(mi_cmd_list_target_features, mi_cmd_add_inferior)
(mi_execute_command, mi_load_progress): Adjust.
* mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Adjust.
* python/py-auto-load.c (print_script, info_auto_load_scripts):
Adjust.
* python/py-breakpoint.c (bppy_get_commands): Adjust.
* tui/tui-interp.c (tui_command_loop): Adjust.
* tui/tui-io.c (tui_setup_io, tui_initialize_io): Adjust.
2011-08-04 21:10:14 +02:00
|
|
|
struct ui_out *uiout = current_uiout;
|
2008-12-02 16:52:15 +01:00
|
|
|
struct osdata *osdata = NULL;
|
2011-11-21 17:54:28 +01:00
|
|
|
struct osdata_item *last = NULL;
|
2008-12-02 16:52:15 +01:00
|
|
|
struct cleanup *old_chain;
|
2011-11-21 17:54:28 +01:00
|
|
|
int ncols = 0;
|
|
|
|
int nrows;
|
2008-12-02 08:57:38 +01:00
|
|
|
|
|
|
|
osdata = get_osdata (type);
|
2008-12-02 16:52:15 +01:00
|
|
|
old_chain = make_cleanup_osdata_free (osdata);
|
2008-12-02 08:57:38 +01:00
|
|
|
|
2011-11-21 17:54:28 +01:00
|
|
|
nrows = VEC_length (osdata_item_s, osdata->items);
|
2008-12-02 08:57:38 +01:00
|
|
|
|
2011-11-21 17:54:28 +01:00
|
|
|
if (!type && nrows == 0)
|
2010-06-19 01:06:30 +02:00
|
|
|
error (_("Available types of OS data not reported."));
|
2011-11-21 17:54:28 +01:00
|
|
|
|
|
|
|
if (!VEC_empty (osdata_item_s, osdata->items))
|
|
|
|
{
|
|
|
|
last = VEC_last (osdata_item_s, osdata->items);
|
|
|
|
if (last->columns)
|
|
|
|
ncols = VEC_length (osdata_column_s, last->columns);
|
|
|
|
}
|
2010-06-19 01:06:30 +02:00
|
|
|
|
2011-11-21 17:54:28 +01:00
|
|
|
make_cleanup_ui_out_table_begin_end (uiout, ncols, nrows,
|
2008-12-02 16:52:15 +01:00
|
|
|
"OSDataTable");
|
2008-12-02 08:57:38 +01:00
|
|
|
|
2011-11-21 17:54:28 +01:00
|
|
|
/* With no columns/items, we just output an empty table, but we
|
|
|
|
still output the table. This matters for MI. */
|
|
|
|
if (ncols == 0)
|
|
|
|
{
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
if (last && last->columns)
|
|
|
|
{
|
|
|
|
struct osdata_column *col;
|
|
|
|
int ix;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
for (ix = 0;
|
|
|
|
VEC_iterate (osdata_column_s, last->columns,
|
|
|
|
ix, col);
|
|
|
|
ix++)
|
2011-11-21 17:54:28 +01:00
|
|
|
{
|
|
|
|
char col_name[32];
|
|
|
|
|
|
|
|
snprintf (col_name, 32, "col%d", ix);
|
|
|
|
ui_out_table_header (uiout, 10, ui_left,
|
|
|
|
col_name, col->name);
|
|
|
|
}
|
2008-12-02 08:57:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ui_out_table_body (uiout);
|
|
|
|
|
2011-11-21 17:54:28 +01:00
|
|
|
if (nrows != 0)
|
2008-12-02 08:57:38 +01:00
|
|
|
{
|
|
|
|
struct osdata_item *item;
|
|
|
|
int ix_items;
|
2010-05-16 02:46:46 +02:00
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
for (ix_items = 0;
|
|
|
|
VEC_iterate (osdata_item_s, osdata->items,
|
|
|
|
ix_items, item);
|
|
|
|
ix_items++)
|
|
|
|
{
|
2008-12-02 16:52:15 +01:00
|
|
|
struct cleanup *old_chain;
|
2008-12-02 08:57:38 +01:00
|
|
|
struct ui_stream *stb;
|
|
|
|
int ix_cols;
|
|
|
|
struct osdata_column *col;
|
|
|
|
|
|
|
|
stb = ui_out_stream_new (uiout);
|
|
|
|
old_chain = make_cleanup_ui_out_stream_delete (stb);
|
2008-12-02 16:52:15 +01:00
|
|
|
make_cleanup_ui_out_tuple_begin_end (uiout, "item");
|
2008-12-02 08:57:38 +01:00
|
|
|
|
|
|
|
for (ix_cols = 0;
|
|
|
|
VEC_iterate (osdata_column_s, item->columns,
|
|
|
|
ix_cols, col);
|
|
|
|
ix_cols++)
|
2011-11-21 17:54:28 +01:00
|
|
|
{
|
|
|
|
char col_name[32];
|
|
|
|
|
|
|
|
snprintf (col_name, 32, "col%d", ix_cols);
|
|
|
|
ui_out_field_string (uiout, col_name, col->value);
|
|
|
|
}
|
|
|
|
|
2008-12-02 08:57:38 +01:00
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
|
|
|
ui_out_text (uiout, "\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-02 16:52:15 +01:00
|
|
|
do_cleanups (old_chain);
|
2008-12-02 08:57:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
extern initialize_file_ftype _initialize_osdata; /* -Wmissing-prototypes */
|
|
|
|
|
|
|
|
void
|
|
|
|
_initialize_osdata (void)
|
|
|
|
{
|
|
|
|
add_info ("os", info_osdata_command,
|
|
|
|
_("Show OS data ARG."));
|
|
|
|
}
|