diff options
Diffstat (limited to 'gdb/mi')
| -rw-r--r-- | gdb/mi/mi-cmd-env.c | 9 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-file.c | 32 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-info.c | 12 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-stack.c | 12 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-var.c | 77 | ||||
| -rw-r--r-- | gdb/mi/mi-interp.c | 81 | ||||
| -rw-r--r-- | gdb/mi/mi-main.c | 149 | ||||
| -rw-r--r-- | gdb/mi/mi-out.c | 309 | ||||
| -rw-r--r-- | gdb/mi/mi-out.h | 69 | ||||
| -rw-r--r-- | gdb/mi/mi-symbol-cmds.c | 5 |
10 files changed, 361 insertions, 394 deletions
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c index 7b52c98..8686317 100644 --- a/gdb/mi/mi-cmd-env.c +++ b/gdb/mi/mi-cmd-env.c @@ -84,7 +84,7 @@ mi_cmd_env_pwd (char *command, char **argv, int argc) error (_("-environment-pwd: error finding name of working directory: %s"), safe_strerror (errno)); - ui_out_field_string (uiout, "cwd", gdb_dirbuf); + uiout->field_string ("cwd", gdb_dirbuf); } /* Change working directory. */ @@ -181,7 +181,7 @@ mi_cmd_env_path (char *command, char **argv, int argc) set_in_environ (current_inferior ()->environment, path_var_name, exec_path); xfree (exec_path); env = get_in_environ (current_inferior ()->environment, path_var_name); - ui_out_field_string (uiout, "path", env); + uiout->field_string ("path", env); } /* Add zero or more directories to the front of the source path. */ @@ -241,7 +241,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc) for (i = argc - 1; i >= 0; --i) env_mod_path (argv[i], &source_path); - ui_out_field_string (uiout, "source-path", source_path); + uiout->field_string ("source-path", source_path); forget_cached_source_info (); } @@ -264,8 +264,7 @@ mi_cmd_inferior_tty_show (char *command, char **argv, int argc) error (_("-inferior-tty-show: Usage: No args")); if (inferior_io_terminal) - ui_out_field_string (current_uiout, - "inferior_tty_terminal", inferior_io_terminal); + current_uiout->field_string ("inferior_tty_terminal", inferior_io_terminal); } void diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c index 310cd5b..cf1faa5 100644 --- a/gdb/mi/mi-cmd-file.c +++ b/gdb/mi/mi-cmd-file.c @@ -49,15 +49,13 @@ mi_cmd_file_list_exec_source_file (char *command, char **argv, int argc) error (_("-file-list-exec-source-file: No symtab")); /* Print to the user the line, filename and fullname. */ - ui_out_field_int (uiout, "line", st.line); - ui_out_field_string (uiout, "file", - symtab_to_filename_for_display (st.symtab)); + uiout->field_int ("line", st.line); + uiout->field_string ("file", symtab_to_filename_for_display (st.symtab)); - ui_out_field_string (uiout, "fullname", symtab_to_fullname (st.symtab)); + uiout->field_string ("fullname", symtab_to_fullname (st.symtab)); - ui_out_field_int (uiout, "macro-info", - COMPUNIT_MACRO_TABLE - (SYMTAB_COMPUNIT (st.symtab)) != NULL); + uiout->field_int ("macro-info", + COMPUNIT_MACRO_TABLE (SYMTAB_COMPUNIT (st.symtab)) != NULL); } /* A callback for map_partial_symbol_filenames. */ @@ -68,14 +66,14 @@ print_partial_file_name (const char *filename, const char *fullname, { struct ui_out *uiout = current_uiout; - ui_out_begin (uiout, ui_out_type_tuple, NULL); + uiout->begin (ui_out_type_tuple, NULL); - ui_out_field_string (uiout, "file", filename); + uiout->field_string ("file", filename); if (fullname) - ui_out_field_string (uiout, "fullname", fullname); + uiout->field_string ("fullname", fullname); - ui_out_end (uiout, ui_out_type_tuple); + uiout->end (ui_out_type_tuple); } void @@ -90,21 +88,21 @@ mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc) error (_("-file-list-exec-source-files: Usage: No args")); /* Print the table header. */ - ui_out_begin (uiout, ui_out_type_list, "files"); + uiout->begin (ui_out_type_list, "files"); /* Look at all of the file symtabs. */ ALL_FILETABS (objfile, cu, s) { - ui_out_begin (uiout, ui_out_type_tuple, NULL); + uiout->begin (ui_out_type_tuple, NULL); - ui_out_field_string (uiout, "file", symtab_to_filename_for_display (s)); - ui_out_field_string (uiout, "fullname", symtab_to_fullname (s)); + uiout->field_string ("file", symtab_to_filename_for_display (s)); + uiout->field_string ("fullname", symtab_to_fullname (s)); - ui_out_end (uiout, ui_out_type_tuple); + uiout->end (ui_out_type_tuple); } map_symbol_filenames (print_partial_file_name, NULL, 1 /*need_fullname*/); - ui_out_end (uiout, ui_out_type_list); + uiout->end (ui_out_type_list); } diff --git a/gdb/mi/mi-cmd-info.c b/gdb/mi/mi-cmd-info.c index 4d11474..480fd25 100644 --- a/gdb/mi/mi-cmd-info.c +++ b/gdb/mi/mi-cmd-info.c @@ -53,17 +53,17 @@ mi_cmd_info_ada_exceptions (char *command, char **argv, int argc) make_cleanup_ui_out_table_begin_end (uiout, 2, VEC_length (ada_exc_info, exceptions), "ada-exceptions"); - ui_out_table_header (uiout, 1, ui_left, "name", "Name"); - ui_out_table_header (uiout, 1, ui_left, "address", "Address"); - ui_out_table_body (uiout); + uiout->table_header (1, ui_left, "name", "Name"); + uiout->table_header (1, ui_left, "address", "Address"); + uiout->table_body (); for (ix = 0; VEC_iterate(ada_exc_info, exceptions, ix, info); ix++) { struct cleanup *sub_chain; sub_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_string (uiout, "name", info->name); - ui_out_field_core_addr (uiout, "address", gdbarch, info->addr); + uiout->field_string ("name", info->name); + uiout->field_core_addr ("address", gdbarch, info->addr); do_cleanups (sub_chain); } @@ -96,7 +96,7 @@ mi_cmd_info_gdb_mi_command (char *command, char **argv, int argc) cmd = mi_lookup (cmd_name); old_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "command"); - ui_out_field_string (uiout, "exists", cmd != NULL ? "true" : "false"); + uiout->field_string ("exists", cmd != NULL ? "true" : "false"); do_cleanups (old_chain); } diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 390fc7e..271cb84 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -202,7 +202,7 @@ mi_cmd_stack_info_depth (char *command, char **argv, int argc) i++, fi = get_prev_frame (fi)) QUIT; - ui_out_field_int (current_uiout, "depth", i); + current_uiout->field_int ("depth", i); } /* Print a list of the locals for the current frame. With argument of @@ -391,7 +391,7 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc) QUIT; cleanup_frame = make_cleanup_ui_out_tuple_begin_end (uiout, "frame"); - ui_out_field_int (uiout, "level", i); + uiout->field_int ("level", i); list_args_or_locals (arguments, print_values, fi, skip_unavailable); do_cleanups (cleanup_frame); } @@ -520,16 +520,16 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, fputs_filtered (SYMBOL_PRINT_NAME (arg->sym), stb); if (arg->entry_kind == print_entry_values_only) fputs_filtered ("@entry", stb); - ui_out_field_stream (uiout, "name", stb); + uiout->field_stream ("name", stb); if (what == all && SYMBOL_IS_ARGUMENT (arg->sym)) - ui_out_field_int (uiout, "arg", 1); + uiout->field_int ("arg", 1); if (values == PRINT_SIMPLE_VALUES) { check_typedef (arg->sym->type); type_print (arg->sym->type, "", stb, -1); - ui_out_field_stream (uiout, "type", stb); + uiout->field_stream ("type", stb); } if (arg->val || arg->error) @@ -558,7 +558,7 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, if (error_message != NULL) fprintf_filtered (stb, _("<error reading variable: %s>"), error_message); - ui_out_field_stream (uiout, "value", stb); + uiout->field_stream ("value", stb); } do_cleanups (old_chain); diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 4131f99..f0a9056 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -51,39 +51,39 @@ print_varobj (struct varobj *var, enum print_values print_values, struct ui_out *uiout = current_uiout; int thread_id; - ui_out_field_string (uiout, "name", varobj_get_objname (var)); + uiout->field_string ("name", varobj_get_objname (var)); if (print_expression) { std::string exp = varobj_get_expression (var); - ui_out_field_string (uiout, "exp", exp.c_str ()); + uiout->field_string ("exp", exp.c_str ()); } - ui_out_field_int (uiout, "numchild", varobj_get_num_children (var)); + uiout->field_int ("numchild", varobj_get_num_children (var)); if (mi_print_value_p (var, print_values)) { std::string val = varobj_get_value (var); - ui_out_field_string (uiout, "value", val.c_str ()); + uiout->field_string ("value", val.c_str ()); } std::string type = varobj_get_type (var); if (!type.empty ()) - ui_out_field_string (uiout, "type", type.c_str ()); + uiout->field_string ("type", type.c_str ()); thread_id = varobj_get_thread_id (var); if (thread_id > 0) - ui_out_field_int (uiout, "thread-id", thread_id); + uiout->field_int ("thread-id", thread_id); if (varobj_get_frozen (var)) - ui_out_field_int (uiout, "frozen", 1); + uiout->field_int ("frozen", 1); gdb::unique_xmalloc_ptr<char> display_hint = varobj_get_display_hint (var); if (display_hint) - ui_out_field_string (uiout, "displayhint", display_hint.get ()); + uiout->field_string ("displayhint", display_hint.get ()); if (varobj_is_dynamic_p (var)) - ui_out_field_int (uiout, "dynamic", 1); + uiout->field_int ("dynamic", 1); } /* VAROBJ operations */ @@ -144,7 +144,7 @@ mi_cmd_var_create (char *command, char **argv, int argc) print_varobj (var, PRINT_ALL_VALUES, 0 /* don't print expression */); - ui_out_field_int (uiout, "has_more", varobj_has_more (var, 0)); + uiout->field_int ("has_more", varobj_has_more (var, 0)); do_cleanups (old_cleanups); } @@ -197,7 +197,7 @@ mi_cmd_var_delete (char *command, char **argv, int argc) numdel = varobj_delete (var, children_only_p); - ui_out_field_int (uiout, "ndeleted", numdel); + uiout->field_int ("ndeleted", numdel); do_cleanups (old_cleanups); } @@ -250,11 +250,11 @@ mi_cmd_var_set_format (char *command, char **argv, int argc) varobj_set_display_format (var, format); /* Report the new current format. */ - ui_out_field_string (uiout, "format", varobj_format_string[(int) format]); + uiout->field_string ("format", varobj_format_string[(int) format]); /* Report the value in the new format. */ std::string val = varobj_get_value (var); - ui_out_field_string (uiout, "value", val.c_str ()); + uiout->field_string ("value", val.c_str ()); } void @@ -314,7 +314,7 @@ mi_cmd_var_show_format (char *command, char **argv, int argc) format = varobj_get_display_format (var); /* Report the current format. */ - ui_out_field_string (uiout, "format", varobj_format_string[(int) format]); + uiout->field_string ("format", varobj_format_string[(int) format]); } void @@ -329,7 +329,7 @@ mi_cmd_var_info_num_children (char *command, char **argv, int argc) /* Get varobj handle, if a valid var obj name was specified. */ var = varobj_get_handle (argv[0]); - ui_out_field_int (uiout, "numchild", varobj_get_num_children (var)); + uiout->field_int ("numchild", varobj_get_num_children (var)); } /* Return 1 if given the argument PRINT_VALUES we should display @@ -397,7 +397,7 @@ mi_cmd_var_list_children (char *command, char **argv, int argc) } children = varobj_list_children (var, &from, &to); - ui_out_field_int (uiout, "numchild", to - from); + uiout->field_int ("numchild", to - from); if (argc == 2 || argc == 4) print_values = mi_parse_print_values (argv[0]); else @@ -405,7 +405,7 @@ mi_cmd_var_list_children (char *command, char **argv, int argc) gdb::unique_xmalloc_ptr<char> display_hint = varobj_get_display_hint (var); if (display_hint) - ui_out_field_string (uiout, "displayhint", display_hint.get ()); + uiout->field_string ("displayhint", display_hint.get ()); if (from < to) { @@ -430,7 +430,7 @@ mi_cmd_var_list_children (char *command, char **argv, int argc) do_cleanups (cleanup_children); } - ui_out_field_int (uiout, "has_more", varobj_has_more (var, to)); + uiout->field_int ("has_more", varobj_has_more (var, to)); } void @@ -446,7 +446,7 @@ mi_cmd_var_info_type (char *command, char **argv, int argc) var = varobj_get_handle (argv[0]); std::string type_name = varobj_get_type (var); - ui_out_field_string (uiout, "type", type_name.c_str ()); + uiout->field_string ("type", type_name.c_str ()); } void @@ -463,7 +463,7 @@ mi_cmd_var_info_path_expression (char *command, char **argv, int argc) const char *path_expr = varobj_get_path_expr (var); - ui_out_field_string (uiout, "path_expr", path_expr); + uiout->field_string ("path_expr", path_expr); } void @@ -481,10 +481,10 @@ mi_cmd_var_info_expression (char *command, char **argv, int argc) lang = varobj_get_language (var); - ui_out_field_string (uiout, "lang", lang->la_natural_name); + uiout->field_string ("lang", lang->la_natural_name); std::string exp = varobj_get_expression (var); - ui_out_field_string (uiout, "exp", exp.c_str ()); + uiout->field_string ("exp", exp.c_str ()); } void @@ -508,7 +508,7 @@ mi_cmd_var_show_attributes (char *command, char **argv, int argc) else attstr = "noneditable"; - ui_out_field_string (uiout, "attr", attstr); + uiout->field_string ("attr", attstr); } void @@ -568,13 +568,13 @@ mi_cmd_var_evaluate_expression (char *command, char **argv, int argc) { std::string val = varobj_get_formatted_value (var, format); - ui_out_field_string (uiout, "value", val.c_str ()); + uiout->field_string ("value", val.c_str ()); } else { std::string val = varobj_get_value (var); - ui_out_field_string (uiout, "value", val.c_str ()); + uiout->field_string ("value", val.c_str ()); } } @@ -605,7 +605,7 @@ mi_cmd_var_assign (char *command, char **argv, int argc) "expression to variable object")); std::string val = varobj_get_value (var); - ui_out_field_string (uiout, "value", val.c_str ()); + uiout->field_string ("value", val.c_str ()); } /* Type used for parameters passing to mi_cmd_var_update_iter. */ @@ -718,7 +718,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values, if (mi_version (uiout) > 1) make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_string (uiout, "name", varobj_get_objname (r->varobj)); + uiout->field_string ("name", varobj_get_objname (r->varobj)); switch (r->status) { @@ -727,48 +727,47 @@ varobj_update_one (struct varobj *var, enum print_values print_values, { std::string val = varobj_get_value (r->varobj); - ui_out_field_string (uiout, "value", val.c_str ()); + uiout->field_string ("value", val.c_str ()); } - ui_out_field_string (uiout, "in_scope", "true"); + uiout->field_string ("in_scope", "true"); break; case VAROBJ_NOT_IN_SCOPE: - ui_out_field_string (uiout, "in_scope", "false"); + uiout->field_string ("in_scope", "false"); break; case VAROBJ_INVALID: - ui_out_field_string (uiout, "in_scope", "invalid"); + uiout->field_string ("in_scope", "invalid"); break; } if (r->status != VAROBJ_INVALID) { if (r->type_changed) - ui_out_field_string (uiout, "type_changed", "true"); + uiout->field_string ("type_changed", "true"); else - ui_out_field_string (uiout, "type_changed", "false"); + uiout->field_string ("type_changed", "false"); } if (r->type_changed) { std::string type_name = varobj_get_type (r->varobj); - ui_out_field_string (uiout, "new_type", type_name.c_str ()); + uiout->field_string ("new_type", type_name.c_str ()); } if (r->type_changed || r->children_changed) - ui_out_field_int (uiout, "new_num_children", + uiout->field_int ("new_num_children", varobj_get_num_children (r->varobj)); gdb::unique_xmalloc_ptr<char> display_hint = varobj_get_display_hint (r->varobj); if (display_hint) - ui_out_field_string (uiout, "displayhint", display_hint.get ()); + uiout->field_string ("displayhint", display_hint.get ()); if (varobj_is_dynamic_p (r->varobj)) - ui_out_field_int (uiout, "dynamic", 1); + uiout->field_int ("dynamic", 1); varobj_get_child_range (r->varobj, &from, &to); - ui_out_field_int (uiout, "has_more", - varobj_has_more (r->varobj, to)); + uiout->field_int ("has_more", varobj_has_more (r->varobj, to)); if (r->newobj) { diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 72d63d0..07b2a82 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -107,7 +107,7 @@ display_mi_prompt (struct mi_interp *mi) static struct mi_interp * as_mi_interp (struct interp *interp) { - if (ui_out_is_mi_like_p (interp_ui_out (interp))) + if (interp_ui_out (interp)->is_mi_like_p ()) return (struct mi_interp *) interp_data (interp); return NULL; } @@ -674,8 +674,7 @@ mi_on_normal_stop_1 (struct bpstats *bs, int print_frame) enum async_reply_reason reason; reason = thread_fsm_async_reply_reason (tp->thread_fsm); - ui_out_field_string (mi_uiout, "reason", - async_reason_lookup (reason)); + mi_uiout->field_string ("reason", async_reason_lookup (reason)); } print_stop_event (mi_uiout); @@ -683,21 +682,21 @@ mi_on_normal_stop_1 (struct bpstats *bs, int print_frame) if (should_print_stop_to_console (console_interp, tp)) print_stop_event (mi->cli_uiout); - ui_out_field_int (mi_uiout, "thread-id", tp->global_num); + mi_uiout->field_int ("thread-id", tp->global_num); if (non_stop) { struct cleanup *back_to = make_cleanup_ui_out_list_begin_end (mi_uiout, "stopped-threads"); - ui_out_field_int (mi_uiout, NULL, tp->global_num); + mi_uiout->field_int (NULL, tp->global_num); do_cleanups (back_to); } else - ui_out_field_string (mi_uiout, "stopped-threads", "all"); + mi_uiout->field_string ("stopped-threads", "all"); core = target_core_of_thread (inferior_ptid); if (core != -1) - ui_out_field_int (mi_uiout, "core", core); + mi_uiout->field_int ("core", core); } fputs_unfiltered ("*stopped", mi->raw_stdout); @@ -855,15 +854,15 @@ mi_tsv_modified (const struct trace_state_variable *tsv) fprintf_unfiltered (mi->event_channel, "tsv-modified"); - ui_out_redirect (mi_uiout, mi->event_channel); + mi_uiout->redirect (mi->event_channel); - ui_out_field_string (mi_uiout, "name", tsv->name); - ui_out_field_string (mi_uiout, "initial", + mi_uiout->field_string ("name", tsv->name); + mi_uiout->field_string ("initial", plongest (tsv->initial_value)); if (tsv->value_known) - ui_out_field_string (mi_uiout, "current", plongest (tsv->value)); + mi_uiout->field_string ("current", plongest (tsv->value)); - ui_out_redirect (mi_uiout, NULL); + mi_uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -905,7 +904,7 @@ mi_breakpoint_created (struct breakpoint *b) break if anything is output to mi_uiout prior to calling the breakpoint_created notifications. So, we use ui_out_redirect. */ - ui_out_redirect (mi_uiout, mi->event_channel); + mi_uiout->redirect (mi->event_channel); TRY { gdb_breakpoint_query (mi_uiout, b->number, NULL); @@ -915,7 +914,7 @@ mi_breakpoint_created (struct breakpoint *b) } END_CATCH - ui_out_redirect (mi_uiout, NULL); + mi_uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -984,7 +983,7 @@ mi_breakpoint_modified (struct breakpoint *b) break if anything is output to mi_uiout prior to calling the breakpoint_created notifications. So, we use ui_out_redirect. */ - ui_out_redirect (mi->mi_uiout, mi->event_channel); + mi->mi_uiout->redirect (mi->event_channel); TRY { gdb_breakpoint_query (mi->mi_uiout, b->number, NULL); @@ -994,7 +993,7 @@ mi_breakpoint_modified (struct breakpoint *b) } END_CATCH - ui_out_redirect (mi->mi_uiout, NULL); + mi->mi_uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -1139,19 +1138,18 @@ mi_solib_loaded (struct so_list *solib) fprintf_unfiltered (mi->event_channel, "library-loaded"); - ui_out_redirect (uiout, mi->event_channel); + uiout->redirect (mi->event_channel); - ui_out_field_string (uiout, "id", solib->so_original_name); - ui_out_field_string (uiout, "target-name", solib->so_original_name); - ui_out_field_string (uiout, "host-name", solib->so_name); - ui_out_field_int (uiout, "symbols-loaded", solib->symbols_loaded); + uiout->field_string ("id", solib->so_original_name); + uiout->field_string ("target-name", solib->so_original_name); + uiout->field_string ("host-name", solib->so_name); + uiout->field_int ("symbols-loaded", solib->symbols_loaded); if (!gdbarch_has_global_solist (target_gdbarch ())) { - ui_out_field_fmt (uiout, "thread-group", "i%d", - current_inferior ()->num); + uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num); } - ui_out_redirect (uiout, NULL); + uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -1178,18 +1176,17 @@ mi_solib_unloaded (struct so_list *solib) fprintf_unfiltered (mi->event_channel, "library-unloaded"); - ui_out_redirect (uiout, mi->event_channel); + uiout->redirect (mi->event_channel); - ui_out_field_string (uiout, "id", solib->so_original_name); - ui_out_field_string (uiout, "target-name", solib->so_original_name); - ui_out_field_string (uiout, "host-name", solib->so_name); + uiout->field_string ("id", solib->so_original_name); + uiout->field_string ("target-name", solib->so_original_name); + uiout->field_string ("host-name", solib->so_name); if (!gdbarch_has_global_solist (target_gdbarch ())) { - ui_out_field_fmt (uiout, "thread-group", "i%d", - current_inferior ()->num); + uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num); } - ui_out_redirect (uiout, NULL); + uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -1221,12 +1218,12 @@ mi_command_param_changed (const char *param, const char *value) fprintf_unfiltered (mi->event_channel, "cmd-param-changed"); - ui_out_redirect (mi_uiout, mi->event_channel); + mi_uiout->redirect (mi->event_channel); - ui_out_field_string (mi_uiout, "param", param); - ui_out_field_string (mi_uiout, "value", value); + mi_uiout->field_string ("param", param); + mi_uiout->field_string ("value", value); - ui_out_redirect (mi_uiout, NULL); + mi_uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -1260,11 +1257,11 @@ mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr, fprintf_unfiltered (mi->event_channel, "memory-changed"); - ui_out_redirect (mi_uiout, mi->event_channel); + mi_uiout->redirect (mi->event_channel); - ui_out_field_fmt (mi_uiout, "thread-group", "i%d", inferior->num); - ui_out_field_core_addr (mi_uiout, "addr", target_gdbarch (), memaddr); - ui_out_field_fmt (mi_uiout, "len", "%s", hex_string (len)); + mi_uiout->field_fmt ("thread-group", "i%d", inferior->num); + mi_uiout->field_core_addr ("addr", target_gdbarch (), memaddr); + mi_uiout->field_fmt ("len", "%s", hex_string (len)); /* Append 'type=code' into notification if MEMADDR falls in the range of sections contain code. */ @@ -1275,10 +1272,10 @@ mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr, sec->the_bfd_section); if (flags & SEC_CODE) - ui_out_field_string (mi_uiout, "type", "code"); + mi_uiout->field_string ("type", "code"); } - ui_out_redirect (mi_uiout, NULL); + mi_uiout->redirect (NULL); gdb_flush (mi->event_channel); @@ -1311,7 +1308,7 @@ mi_user_selected_context_changed (user_selected_what selection) mi_uiout = interp_ui_out (top_level_interpreter ()); - ui_out_redirect (mi_uiout, mi->event_channel); + mi_uiout->redirect (mi->event_channel); old_chain = make_cleanup_ui_out_redirect_pop (mi_uiout); diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 4d276c8..ace9ff7 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -665,17 +665,17 @@ print_one_inferior (struct inferior *inferior, void *xdata) struct cleanup *back_to = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_fmt (uiout, "id", "i%d", inferior->num); - ui_out_field_string (uiout, "type", "process"); + uiout->field_fmt ("id", "i%d", inferior->num); + uiout->field_string ("type", "process"); if (inferior->has_exit_code) - ui_out_field_string (uiout, "exit-code", + uiout->field_string ("exit-code", int_string (inferior->exit_code, 8, 0, 0, 1)); if (inferior->pid != 0) - ui_out_field_int (uiout, "pid", inferior->pid); + uiout->field_int ("pid", inferior->pid); if (inferior->pspace->pspace_exec_filename != NULL) { - ui_out_field_string (uiout, "executable", + uiout->field_string ("executable", inferior->pspace->pspace_exec_filename); } @@ -701,7 +701,7 @@ print_one_inferior (struct inferior *inferior, void *xdata) e = unique (b, e); for (; b != e; ++b) - ui_out_field_int (uiout, NULL, *b); + uiout->field_int (NULL, *b); do_cleanups (back_to_2); } @@ -730,7 +730,7 @@ output_cores (struct ui_out *uiout, const char *field_name, const char *xcores) make_cleanup (xfree, cores); for (p = strtok (p, ","); p; p = strtok (NULL, ",")) - ui_out_field_string (uiout, NULL, p); + uiout->field_string (NULL, p); do_cleanups (back_to); } @@ -853,12 +853,12 @@ list_available_thread_groups (VEC (int) *ids, int recurse) back_to = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_fmt (uiout, "id", "%s", pid); - ui_out_field_string (uiout, "type", "process"); + uiout->field_fmt ("id", "%s", pid); + uiout->field_string ("type", "process"); if (cmd) - ui_out_field_string (uiout, "description", cmd); + uiout->field_string ("description", cmd); if (user) - ui_out_field_string (uiout, "user", user); + uiout->field_string ("user", user); if (cores) output_cores (uiout, "cores", cores); @@ -882,9 +882,9 @@ list_available_thread_groups (VEC (int) *ids, int recurse) const char *tid = get_osdata_column (child, "tid"); const char *tcore = get_osdata_column (child, "core"); - ui_out_field_string (uiout, "id", tid); + uiout->field_string ("id", tid); if (tcore) - ui_out_field_string (uiout, "core", tcore); + uiout->field_string ("core", tcore); do_cleanups (back_to_2); } @@ -1028,10 +1028,9 @@ mi_cmd_data_list_register_names (char *command, char **argv, int argc) { if (gdbarch_register_name (gdbarch, regnum) == NULL || *(gdbarch_register_name (gdbarch, regnum)) == '\0') - ui_out_field_string (uiout, NULL, ""); + uiout->field_string (NULL, ""); else - ui_out_field_string (uiout, NULL, - gdbarch_register_name (gdbarch, regnum)); + uiout->field_string (NULL, gdbarch_register_name (gdbarch, regnum)); } } @@ -1044,10 +1043,9 @@ mi_cmd_data_list_register_names (char *command, char **argv, int argc) if (gdbarch_register_name (gdbarch, regnum) == NULL || *(gdbarch_register_name (gdbarch, regnum)) == '\0') - ui_out_field_string (uiout, NULL, ""); + uiout->field_string (NULL, ""); else - ui_out_field_string (uiout, NULL, - gdbarch_register_name (gdbarch, regnum)); + uiout->field_string (NULL, gdbarch_register_name (gdbarch, regnum)); } do_cleanups (cleanup); } @@ -1099,7 +1097,7 @@ mi_cmd_data_list_changed_registers (char *command, char **argv, int argc) error (_("-data-list-changed-registers: " "Unable to read register contents.")); else if (changed) - ui_out_field_int (uiout, NULL, regnum); + uiout->field_int (NULL, regnum); } } @@ -1118,7 +1116,7 @@ mi_cmd_data_list_changed_registers (char *command, char **argv, int argc) error (_("-data-list-changed-registers: " "Unable to read register contents.")); else if (changed) - ui_out_field_int (uiout, NULL, regnum); + uiout->field_int (NULL, regnum); } else error (_("bad register number")); @@ -1269,7 +1267,7 @@ output_register (struct frame_info *frame, int regnum, int format, return; tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_int (uiout, "number", regnum); + uiout->field_int ("number", regnum); if (format == 'N') format = 0; @@ -1285,7 +1283,7 @@ output_register (struct frame_info *frame, int regnum, int format, val_print (value_type (val), value_embedded_offset (val), 0, stb, 0, val, &opts, current_language); - ui_out_field_stream (uiout, "value", stb); + uiout->field_stream ("value", stb); do_cleanups (tuple_cleanup); } @@ -1376,7 +1374,7 @@ mi_cmd_data_evaluate_expression (char *command, char **argv, int argc) opts.deref_ref = 0; common_val_print (val, stb, 0, &opts, current_language); - ui_out_field_stream (uiout, "value", stb); + uiout->field_stream ("value", stb); do_cleanups (old_chain); } @@ -1508,15 +1506,13 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) error (_("Unable to read memory.")); /* Output the header information. */ - ui_out_field_core_addr (uiout, "addr", gdbarch, addr); - ui_out_field_int (uiout, "nr-bytes", nr_bytes); - ui_out_field_int (uiout, "total-bytes", total_bytes); - ui_out_field_core_addr (uiout, "next-row", - gdbarch, addr + word_size * nr_cols); - ui_out_field_core_addr (uiout, "prev-row", - gdbarch, addr - word_size * nr_cols); - ui_out_field_core_addr (uiout, "next-page", gdbarch, addr + total_bytes); - ui_out_field_core_addr (uiout, "prev-page", gdbarch, addr - total_bytes); + uiout->field_core_addr ("addr", gdbarch, addr); + uiout->field_int ("nr-bytes", nr_bytes); + uiout->field_int ("total-bytes", total_bytes); + uiout->field_core_addr ("next-row", gdbarch, addr + word_size * nr_cols); + uiout->field_core_addr ("prev-row", gdbarch, addr - word_size * nr_cols); + uiout->field_core_addr ("next-page", gdbarch, addr + total_bytes); + uiout->field_core_addr ("prev-page", gdbarch, addr - total_bytes); /* Build the result as a two dimentional table. */ { @@ -1540,7 +1536,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) struct value_print_options opts; cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_core_addr (uiout, "addr", gdbarch, addr + row_byte); + uiout->field_core_addr ("addr", gdbarch, addr + row_byte); /* ui_out_field_core_addr_symbolic (uiout, "saddr", addr + row_byte); */ cleanup_list_data = make_cleanup_ui_out_list_begin_end (uiout, "data"); @@ -1551,14 +1547,14 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) { if (col_byte + word_size > nr_bytes) { - ui_out_field_string (uiout, NULL, "N/A"); + uiout->field_string (NULL, "N/A"); } else { ui_file_rewind (stream); print_scalar_formatted (&mbuf[col_byte], word_type, &opts, word_asize, stream); - ui_out_field_stream (uiout, NULL, stream); + uiout->field_stream (NULL, stream); } } do_cleanups (cleanup_list_data); @@ -1577,7 +1573,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) else fputc_unfiltered (mbuf[byte], stream); } - ui_out_field_stream (uiout, "ascii", stream); + uiout->field_stream ("ascii", stream); } do_cleanups (cleanup_tuple); } @@ -1649,10 +1645,9 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc) int i; int alloc_len; - ui_out_field_core_addr (uiout, "begin", gdbarch, read_result->begin); - ui_out_field_core_addr (uiout, "offset", gdbarch, read_result->begin - - addr); - ui_out_field_core_addr (uiout, "end", gdbarch, read_result->end); + uiout->field_core_addr ("begin", gdbarch, read_result->begin); + uiout->field_core_addr ("offset", gdbarch, read_result->begin - addr); + uiout->field_core_addr ("end", gdbarch, read_result->end); alloc_len = (read_result->end - read_result->begin) * 2 * unit_size + 1; data = (char *) xmalloc (alloc_len); @@ -1663,7 +1658,7 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc) { sprintf (p, "%02x", read_result->data[i]); } - ui_out_field_string (uiout, "contents", data); + uiout->field_string ("contents", data); xfree (data); do_cleanups (t); } @@ -1866,19 +1861,19 @@ mi_cmd_list_features (char *command, char **argv, int argc) struct ui_out *uiout = current_uiout; cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features"); - ui_out_field_string (uiout, NULL, "frozen-varobjs"); - ui_out_field_string (uiout, NULL, "pending-breakpoints"); - ui_out_field_string (uiout, NULL, "thread-info"); - ui_out_field_string (uiout, NULL, "data-read-memory-bytes"); - ui_out_field_string (uiout, NULL, "breakpoint-notifications"); - ui_out_field_string (uiout, NULL, "ada-task-info"); - ui_out_field_string (uiout, NULL, "language-option"); - ui_out_field_string (uiout, NULL, "info-gdb-mi-command"); - ui_out_field_string (uiout, NULL, "undefined-command-error-code"); - ui_out_field_string (uiout, NULL, "exec-run-start-option"); + uiout->field_string (NULL, "frozen-varobjs"); + uiout->field_string (NULL, "pending-breakpoints"); + uiout->field_string (NULL, "thread-info"); + uiout->field_string (NULL, "data-read-memory-bytes"); + uiout->field_string (NULL, "breakpoint-notifications"); + uiout->field_string (NULL, "ada-task-info"); + uiout->field_string (NULL, "language-option"); + uiout->field_string (NULL, "info-gdb-mi-command"); + uiout->field_string (NULL, "undefined-command-error-code"); + uiout->field_string (NULL, "exec-run-start-option"); if (ext_lang_initialized_p (get_ext_lang_defn (EXT_LANG_PYTHON))) - ui_out_field_string (uiout, NULL, "python"); + uiout->field_string (NULL, "python"); do_cleanups (cleanup); return; @@ -1897,9 +1892,9 @@ mi_cmd_list_target_features (char *command, char **argv, int argc) cleanup = make_cleanup_ui_out_list_begin_end (uiout, "features"); if (mi_async_p ()) - ui_out_field_string (uiout, NULL, "async"); + uiout->field_string (NULL, "async"); if (target_can_execute_reverse) - ui_out_field_string (uiout, NULL, "reverse"); + uiout->field_string (NULL, "reverse"); do_cleanups (cleanup); return; } @@ -1917,7 +1912,7 @@ mi_cmd_add_inferior (char *command, char **argv, int argc) inf = add_inferior_with_spaces (); - ui_out_field_fmt (current_uiout, "inferior", "i%d", inf->num); + current_uiout->field_fmt ("inferior", "i%d", inf->num); } /* Callback used to find the first inferior other than the current @@ -2190,7 +2185,7 @@ mi_execute_command (const char *cmd, int from_tty) if (/* The notifications are only output when the top-level interpreter (specified on the command line) is MI. */ - ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ())) + interp_ui_out (top_level_interpreter ())->is_mi_like_p () /* Don't try report anything if there are no threads -- the program is dead. */ && thread_count () != 0 @@ -2422,9 +2417,9 @@ mi_load_progress (const char *section_name, fputs_unfiltered (current_token, mi->raw_stdout); fputs_unfiltered ("+download", mi->raw_stdout); cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_string (uiout, "section", section_name); - ui_out_field_int (uiout, "section-size", total_section); - ui_out_field_int (uiout, "total-size", grand_total); + uiout->field_string ("section", section_name); + uiout->field_int ("section-size", total_section); + uiout->field_int ("total-size", grand_total); do_cleanups (cleanup_tuple); mi_out_put (uiout, mi->raw_stdout); fputs_unfiltered ("\n", mi->raw_stdout); @@ -2441,11 +2436,11 @@ mi_load_progress (const char *section_name, fputs_unfiltered (current_token, mi->raw_stdout); fputs_unfiltered ("+download", mi->raw_stdout); cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_string (uiout, "section", section_name); - ui_out_field_int (uiout, "section-sent", sent_so_far); - ui_out_field_int (uiout, "section-size", total_section); - ui_out_field_int (uiout, "total-sent", total_sent); - ui_out_field_int (uiout, "total-size", grand_total); + uiout->field_string ("section", section_name); + uiout->field_int ("section-sent", sent_so_far); + uiout->field_int ("section-size", total_section); + uiout->field_int ("total-sent", total_sent); + uiout->field_int ("total-size", grand_total); do_cleanups (cleanup_tuple); mi_out_put (uiout, mi->raw_stdout); fputs_unfiltered ("\n", mi->raw_stdout); @@ -2720,14 +2715,14 @@ print_variable_or_computed (const char *expression, enum print_values values) if (values != PRINT_NO_VALUES) make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_string (uiout, "name", expression); + uiout->field_string ("name", expression); switch (values) { case PRINT_SIMPLE_VALUES: type = check_typedef (value_type (val)); type_print (value_type (val), "", stb, -1); - ui_out_field_stream (uiout, "type", stb); + uiout->field_stream ("type", stb); if (TYPE_CODE (type) != TYPE_CODE_ARRAY && TYPE_CODE (type) != TYPE_CODE_STRUCT && TYPE_CODE (type) != TYPE_CODE_UNION) @@ -2737,7 +2732,7 @@ print_variable_or_computed (const char *expression, enum print_values values) get_no_prettyformat_print_options (&opts); opts.deref_ref = 1; common_val_print (val, stb, 0, &opts, current_language); - ui_out_field_stream (uiout, "value", stb); + uiout->field_stream ("value", stb); } break; case PRINT_ALL_VALUES: @@ -2747,7 +2742,7 @@ print_variable_or_computed (const char *expression, enum print_values values) get_no_prettyformat_print_options (&opts); opts.deref_ref = 1; common_val_print (val, stb, 0, &opts, current_language); - ui_out_field_stream (uiout, "value", stb); + uiout->field_stream ("value", stb); } break; } @@ -2929,16 +2924,16 @@ mi_cmd_trace_frame_collected (char *command, char **argv, int argc) tsvname = (char *) xrealloc (tsvname, strlen (tsv->name) + 2); tsvname[0] = '$'; strcpy (tsvname + 1, tsv->name); - ui_out_field_string (uiout, "name", tsvname); + uiout->field_string ("name", tsvname); tsv->value_known = target_get_trace_state_variable_value (tsv->number, &tsv->value); - ui_out_field_int (uiout, "current", tsv->value); + uiout->field_int ("current", tsv->value); } else { - ui_out_field_skip (uiout, "name"); - ui_out_field_skip (uiout, "current"); + uiout->field_skip ("name"); + uiout->field_skip ("current"); } do_cleanups (cleanup_child); @@ -2967,8 +2962,8 @@ mi_cmd_trace_frame_collected (char *command, char **argv, int argc) cleanup_child = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_core_addr (uiout, "address", gdbarch, r->start); - ui_out_field_int (uiout, "length", r->length); + uiout->field_core_addr ("address", gdbarch, r->start); + uiout->field_int ("length", r->length); data = (gdb_byte *) xmalloc (r->length); make_cleanup (xfree, data); @@ -2985,10 +2980,10 @@ mi_cmd_trace_frame_collected (char *command, char **argv, int argc) for (m = 0, p = data_str; m < r->length; ++m, p += 2) sprintf (p, "%02x", data[m]); - ui_out_field_string (uiout, "contents", data_str); + uiout->field_string ("contents", data_str); } else - ui_out_field_skip (uiout, "contents"); + uiout->field_skip ("contents"); } do_cleanups (cleanup_child); } diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 19fcf87..3761a5c 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -24,169 +24,85 @@ #include "mi-out.h" #include <vector> -struct mi_ui_out_data - { - int suppress_field_separator; - int mi_version; - std::vector<ui_file *> streams; - }; -typedef struct mi_ui_out_data mi_out_data; - -/* These are the MI output functions */ - -static void mi_out_data_dtor (struct ui_out *ui_out); -static void mi_table_begin (struct ui_out *uiout, int nbrofcols, - int nr_rows, const char *tblid); -static void mi_table_body (struct ui_out *uiout); -static void mi_table_end (struct ui_out *uiout); -static void mi_table_header (struct ui_out *uiout, int width, - enum ui_align alignment, - const std::string &col_name, - const std::string &col_hdr); -static void mi_begin (struct ui_out *uiout, enum ui_out_type type, - const char *id); -static void mi_end (struct ui_out *uiout, enum ui_out_type type); -static void mi_field_int (struct ui_out *uiout, int fldno, int width, - enum ui_align alig, const char *fldname, int value); -static void mi_field_skip (struct ui_out *uiout, int fldno, int width, - enum ui_align alig, const char *fldname); -static void mi_field_string (struct ui_out *uiout, int fldno, int width, - enum ui_align alig, const char *fldname, - const char *string); -static void mi_field_fmt (struct ui_out *uiout, int fldno, - int width, enum ui_align align, - const char *fldname, const char *format, - va_list args) ATTRIBUTE_PRINTF (6, 0); -static void mi_spaces (struct ui_out *uiout, int numspaces); -static void mi_text (struct ui_out *uiout, const char *string); -static void mi_message (struct ui_out *uiout, const char *format, va_list args) - ATTRIBUTE_PRINTF (2, 0); -static void mi_wrap_hint (struct ui_out *uiout, const char *identstring); -static void mi_flush (struct ui_out *uiout); -static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream); - -/* This is the MI ui-out implementation functions vector */ - -static const struct ui_out_impl mi_ui_out_impl = -{ - mi_table_begin, - mi_table_body, - mi_table_end, - mi_table_header, - mi_begin, - mi_end, - mi_field_int, - mi_field_skip, - mi_field_string, - mi_field_fmt, - mi_spaces, - mi_text, - mi_message, - mi_wrap_hint, - mi_flush, - mi_redirect, - mi_out_data_dtor, - 1, /* Needs MI hacks. */ -}; - -/* Prototypes for local functions */ - -static void field_separator (struct ui_out *uiout); -static void mi_open (struct ui_out *uiout, const char *name, - enum ui_out_type type); -static void mi_close (struct ui_out *uiout, enum ui_out_type type); - /* Mark beginning of a table. */ void -mi_table_begin (struct ui_out *uiout, - int nr_cols, - int nr_rows, - const char *tblid) +mi_ui_out::do_table_begin (int nr_cols, int nr_rows, + const char *tblid) { - mi_open (uiout, tblid, ui_out_type_tuple); - mi_field_int (uiout, -1, -1, ui_left, "nr_rows", nr_rows); - mi_field_int (uiout, -1, -1, ui_left, "nr_cols", nr_cols); - mi_open (uiout, "hdr", ui_out_type_list); + open (tblid, ui_out_type_tuple); + do_field_int (-1, -1, ui_left, "nr_rows", nr_rows); + do_field_int (-1, -1, ui_left, "nr_cols", nr_cols); + open ("hdr", ui_out_type_list); } /* Mark beginning of a table body. */ void -mi_table_body (struct ui_out *uiout) +mi_ui_out::do_table_body () { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - /* close the table header line if there were any headers */ - mi_close (uiout, ui_out_type_list); - mi_open (uiout, "body", ui_out_type_list); + close (ui_out_type_list); + open ("body", ui_out_type_list); } /* Mark end of a table. */ void -mi_table_end (struct ui_out *uiout) +mi_ui_out::do_table_end () { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - - mi_close (uiout, ui_out_type_list); /* body */ - mi_close (uiout, ui_out_type_tuple); + close (ui_out_type_list); /* body */ + close (ui_out_type_tuple); } /* Specify table header. */ void -mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment, - const std::string &col_name, const std::string &col_hdr) +mi_ui_out::do_table_header (int width, ui_align alignment, + const std::string &col_name, + const std::string &col_hdr) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - - mi_open (uiout, NULL, ui_out_type_tuple); - mi_field_int (uiout, 0, 0, ui_center, "width", width); - mi_field_int (uiout, 0, 0, ui_center, "alignment", alignment); - mi_field_string (uiout, 0, 0, ui_center, "col_name", col_name.c_str ()); - mi_field_string (uiout, 0, width, alignment, "colhdr", col_hdr.c_str ()); - mi_close (uiout, ui_out_type_tuple); + open (NULL, ui_out_type_tuple); + do_field_int (0, 0, ui_center, "width", width); + do_field_int (0, 0, ui_center, "alignment", alignment); + do_field_string (0, 0, ui_center, "col_name", col_name.c_str ()); + do_field_string (0, width, alignment, "colhdr", col_hdr.c_str ()); + close (ui_out_type_tuple); } /* Mark beginning of a list. */ void -mi_begin (struct ui_out *uiout, enum ui_out_type type, const char *id) +mi_ui_out::do_begin (ui_out_type type, const char *id) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - - mi_open (uiout, id, type); + open (id, type); } /* Mark end of a list. */ void -mi_end (struct ui_out *uiout, enum ui_out_type type) +mi_ui_out::do_end (ui_out_type type) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - - mi_close (uiout, type); + close (type); } /* Output an int field. */ -static void -mi_field_int (struct ui_out *uiout, int fldno, int width, - enum ui_align alignment, const char *fldname, int value) +void +mi_ui_out::do_field_int (int fldno, int width, ui_align alignment, + const char *fldname, int value) { char buffer[20]; /* FIXME: how many chars long a %d can become? */ - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); xsnprintf (buffer, sizeof (buffer), "%d", value); - mi_field_string (uiout, fldno, width, alignment, fldname, buffer); + do_field_string (fldno, width, alignment, fldname, buffer); } /* Used to omit a field. */ void -mi_field_skip (struct ui_out *uiout, int fldno, int width, - enum ui_align alignment, const char *fldname) +mi_ui_out::do_field_skip (int fldno, int width, ui_align alignment, + const char *fldname) { } @@ -194,14 +110,12 @@ mi_field_skip (struct ui_out *uiout, int fldno, int width, separators are both handled by mi_field_string. */ void -mi_field_string (struct ui_out *uiout, int fldno, int width, - enum ui_align align, const char *fldname, const char *string) +mi_ui_out::do_field_string (int fldno, int width, ui_align align, + const char *fldname, const char *string) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream; + ui_file *stream = m_streams.back (); + field_separator (); - stream = data->streams.back (); - field_separator (uiout); if (fldname) fprintf_unfiltered (stream, "%s=", fldname); fprintf_unfiltered (stream, "\""); @@ -213,15 +127,13 @@ mi_field_string (struct ui_out *uiout, int fldno, int width, /* This is the only field function that does not align. */ void -mi_field_fmt (struct ui_out *uiout, int fldno, int width, - enum ui_align align, const char *fldname, - const char *format, va_list args) +mi_ui_out::do_field_fmt (int fldno, int width, ui_align align, + const char *fldname, const char *format, + va_list args) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream; + ui_file *stream = m_streams.back (); + field_separator (); - stream = data->streams.back (); - field_separator (uiout); if (fldname) fprintf_unfiltered (stream, "%s=\"", fldname); else @@ -231,125 +143,115 @@ mi_field_fmt (struct ui_out *uiout, int fldno, int width, } void -mi_spaces (struct ui_out *uiout, int numspaces) +mi_ui_out::do_spaces (int numspaces) { } void -mi_text (struct ui_out *uiout, const char *string) +mi_ui_out::do_text (const char *string) { } void -mi_message (struct ui_out *uiout, const char *format, va_list args) +mi_ui_out::do_message (const char *format, va_list args) { } void -mi_wrap_hint (struct ui_out *uiout, const char *identstring) +mi_ui_out::do_wrap_hint (const char *identstring) { wrap_here (identstring); } void -mi_flush (struct ui_out *uiout) +mi_ui_out::do_flush () { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream = data->streams.back (); - gdb_flush (stream); + gdb_flush (m_streams.back ()); } int -mi_redirect (struct ui_out *uiout, struct ui_file *outstream) +mi_ui_out::do_redirect (ui_file *outstream) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - if (outstream != NULL) - data->streams.push_back (outstream); + m_streams.push_back (outstream); else - data->streams.pop_back (); + m_streams.pop_back (); return 0; } -/* local functions */ - -/* access to ui_out format private members */ - -static void -field_separator (struct ui_out *uiout) +void +mi_ui_out::field_separator () { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - ui_file *stream = data->streams.back (); - - if (data->suppress_field_separator) - data->suppress_field_separator = 0; + if (m_suppress_field_separator) + m_suppress_field_separator = false; else - fputc_unfiltered (',', stream); + fputc_unfiltered (',', m_streams.back ()); } -static void -mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) +void +mi_ui_out::open (const char *name, ui_out_type type) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - ui_file *stream = data->streams.back (); + ui_file *stream = m_streams.back (); + + field_separator (); + m_suppress_field_separator = true; - field_separator (uiout); - data->suppress_field_separator = 1; if (name) fprintf_unfiltered (stream, "%s=", name); + switch (type) { case ui_out_type_tuple: fputc_unfiltered ('{', stream); break; + case ui_out_type_list: fputc_unfiltered ('[', stream); break; + default: internal_error (__FILE__, __LINE__, _("bad switch")); } } -static void -mi_close (struct ui_out *uiout, enum ui_out_type type) +void +mi_ui_out::close (ui_out_type type) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - ui_file *stream = data->streams.back (); + ui_file *stream = m_streams.back (); switch (type) { case ui_out_type_tuple: fputc_unfiltered ('}', stream); break; + case ui_out_type_list: fputc_unfiltered (']', stream); break; + default: internal_error (__FILE__, __LINE__, _("bad switch")); } - data->suppress_field_separator = 0; + + m_suppress_field_separator = false; } /* Clear the buffer. */ void -mi_out_rewind (struct ui_out *uiout) +mi_ui_out::rewind () { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - ui_file *stream = data->streams.back (); - - ui_file_rewind (stream); + ui_file_rewind (m_streams.back ()); } /* Dump the buffer onto the specified stream. */ void -mi_out_put (struct ui_out *uiout, struct ui_file *stream) +mi_ui_out::put (ui_file *stream) { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - ui_file *outstream = data->streams.back (); + ui_file *outstream = m_streams.back (); ui_file_put (outstream, ui_file_write_for_put, stream); ui_file_rewind (outstream); @@ -358,45 +260,64 @@ mi_out_put (struct ui_out *uiout, struct ui_file *stream) /* Return the current MI version. */ int -mi_version (struct ui_out *uiout) +mi_ui_out::version () { - mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - - return data->mi_version; + return m_mi_version; } /* Constructor for an `mi_out_data' object. */ -static void -mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream) +mi_ui_out::mi_ui_out (int mi_version, ui_file *stream) +: m_suppress_field_separator (false), + m_suppress_output (false), + m_mi_version (mi_version) { gdb_assert (stream != NULL); - self->streams.push_back (stream); + m_streams.push_back (stream); +} - self->suppress_field_separator = 0; - self->mi_version = mi_version; +mi_ui_out::~mi_ui_out () +{ } -/* The destructor. */ +/* Initialize private members at startup. */ -static void -mi_out_data_dtor (struct ui_out *ui_out) +mi_ui_out * +mi_out_new (int mi_version) { - mi_out_data *data = (mi_out_data *) ui_out_data (ui_out); + ui_file *stream = mem_fileopen (); - delete data; + return new mi_ui_out (mi_version, stream); } -/* Initialize private members at startup. */ +/* Helper function to return the given UIOUT as an mi_ui_out. It is an error + to call this function with an ui_out that is not an MI. */ -struct ui_out * -mi_out_new (int mi_version) +static mi_ui_out * +as_mi_ui_out (ui_out *uiout) { - ui_out_flags flags = 0; - mi_out_data *data = new mi_out_data (); - struct ui_file *stream = mem_fileopen (); + mi_ui_out *mi_uiout = dynamic_cast<mi_ui_out *> (uiout); + + gdb_assert (mi_uiout != NULL); + + return mi_uiout; +} - mi_out_data_ctor (data, mi_version, stream); - return ui_out_new (&mi_ui_out_impl, data, flags); +int +mi_version (ui_out *uiout) +{ + return as_mi_ui_out (uiout)->version (); +} + +void +mi_out_put (ui_out *uiout, struct ui_file *stream) +{ + return as_mi_ui_out (uiout)->put (stream); +} + +void +mi_out_rewind (ui_out *uiout) +{ + return as_mi_ui_out (uiout)->rewind (); } diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h index ba18950..933f1d0 100644 --- a/gdb/mi/mi-out.h +++ b/gdb/mi/mi-out.h @@ -20,14 +20,73 @@ #ifndef MI_OUT_H #define MI_OUT_H 1 +#include <vector> + struct ui_out; struct ui_file; -extern struct ui_out *mi_out_new (int mi_version); -extern void mi_out_put (struct ui_out *uiout, struct ui_file *stream); -extern void mi_out_rewind (struct ui_out *uiout); -/* Return the version number of the current MI. */ -extern int mi_version (struct ui_out *uiout); +class mi_ui_out : public ui_out +{ +public: + + explicit mi_ui_out (int mi_version, ui_file *stream); + virtual ~mi_ui_out (); + + /* MI-specific */ + void rewind (); + void put (struct ui_file *stream); + + /* Return the version number of the current MI. */ + int version (); + +protected: + + virtual void do_table_begin (int nbrofcols, int nr_rows, const char *tblid) + override; + virtual void do_table_body () override; + virtual void do_table_header (int width, ui_align align, + const std::string &col_name, + const std::string &col_hdr) override; + virtual void do_table_end () override; + + virtual void do_begin (ui_out_type type, const char *id) override; + virtual void do_end (ui_out_type type) override; + virtual void do_field_int (int fldno, int width, ui_align align, + const char *fldname, int value) override; + virtual void do_field_skip (int fldno, int width, ui_align align, + const char *fldname) override; + virtual void do_field_string (int fldno, int width, ui_align align, + const char *fldname, const char *string) override; + virtual void do_field_fmt (int fldno, int width, ui_align align, + const char *fldname, const char *format, va_list args) + override ATTRIBUTE_PRINTF (6,0); + virtual void do_spaces (int numspaces) override; + virtual void do_text (const char *string) override; + virtual void do_message (const char *format, va_list args) override + ATTRIBUTE_PRINTF (2,0); + virtual void do_wrap_hint (const char *identstring) override; + virtual void do_flush () override; + virtual int do_redirect (struct ui_file * outstream) override; + + virtual bool do_is_mi_like_p () override + { return true; } + +private: + + void field_separator (); + void open (const char *name, ui_out_type type); + void close (ui_out_type type); + + bool m_suppress_field_separator; + bool m_suppress_output; + int m_mi_version; + std::vector<ui_file *> m_streams; +}; + +mi_ui_out *mi_out_new (int mi_version); +int mi_version (ui_out *uiout); +void mi_out_put (ui_out *uiout, struct ui_file *stream); +void mi_out_rewind (ui_out *uiout); #endif /* MI_OUT_H */ diff --git a/gdb/mi/mi-symbol-cmds.c b/gdb/mi/mi-symbol-cmds.c index 6236d66..42d4902 100644 --- a/gdb/mi/mi-symbol-cmds.c +++ b/gdb/mi/mi-symbol-cmds.c @@ -56,9 +56,8 @@ mi_cmd_symbol_list_lines (char *command, char **argv, int argc) for (i = 0; i < SYMTAB_LINETABLE (s)->nitems; i++) { cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_core_addr (uiout, "pc", gdbarch, - SYMTAB_LINETABLE (s)->item[i].pc); - ui_out_field_int (uiout, "line", SYMTAB_LINETABLE (s)->item[i].line); + uiout->field_core_addr ("pc", gdbarch, SYMTAB_LINETABLE (s)->item[i].pc); + uiout->field_int ("line", SYMTAB_LINETABLE (s)->item[i].line); do_cleanups (cleanup_tuple); } |