aboutsummaryrefslogtreecommitdiff
path: root/gdb/mi
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2019-07-17 08:34:23 -0600
committerTom Tromey <tromey@adacore.com>2019-07-17 10:34:05 -0600
commit381befeedf9316991d47f4213850545a96593d23 (patch)
tree861827252f3c46a71630c50e1a6c6d26c754df41 /gdb/mi
parent6b78c3f83c8bcbfa714aab7627ece9673b2d602a (diff)
downloadgdb-381befeedf9316991d47f4213850545a96593d23.zip
gdb-381befeedf9316991d47f4213850545a96593d23.tar.gz
gdb-381befeedf9316991d47f4213850545a96593d23.tar.bz2
Rename field_int to field_signed
This renames ui_out::field_int to field_signed, and field_fmt_int to field_fmt_signed; and changes the type of the "value" parameter from int to LONGEST. Tested by the buildbot. gdb/ChangeLog 2019-07-17 Tom Tromey <tromey@adacore.com> * ui-out.h (class ui_out) <field_signed, field_fmt_signed, do_field_signed>: Rename. Change type of "value". * ui-out.c (ui_out::field_signed): Rename from field_int. Change type of "value". (ui_out::field_fmt_signed): Rename from field_fmt_int. Change type of "value". * tui/tui-out.h (class tui_ui_out) <do_field_signed>: Rename from do_field_int. Change type of "value". * tui/tui-out.c (tui_ui_out::do_field_signed): Rename from do_field_int. Change type of "value". * tracepoint.c (trace_status_mi, tfind_1) (print_one_static_tracepoint_marker): Update. * thread.c (print_thread_info_1, print_selected_thread_frame): Update. * stack.c (print_frame, print_frame_info): Update. * spu-tdep.c (info_spu_signal_command, info_spu_dma_cmdlist): Update. * source.c (print_source_lines_base): Update. * skip.c (info_skip_command): Update. * record-btrace.c (btrace_ui_out_decode_error) (btrace_call_history_src_line): Update. * python/py-framefilter.c (py_print_single_arg, py_print_frame): Update. * progspace.c (print_program_space): Update. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Update. * mi/mi-out.h (class mi_ui_out) <do_field_signed>: Rename from do_field_int. Change type of "value". * mi/mi-out.c (mi_ui_out::do_table_begin) (mi_ui_out::do_table_header): Update. (mi_ui_out::do_field_signed): Rename from do_field_int. Change type of "value". * mi/mi-main.c (mi_cmd_thread_list_ids, print_one_inferior) (mi_cmd_data_list_changed_registers, output_register) (mi_cmd_data_read_memory, mi_load_progress) (mi_cmd_trace_frame_collected): Update. * mi/mi-interp.c (mi_on_normal_stop_1, mi_output_solib_attribs): Update. * mi/mi-cmd-var.c (print_varobj, mi_cmd_var_create) (mi_cmd_var_delete, mi_cmd_var_info_num_children) (mi_cmd_var_list_children, varobj_update_one): Update. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth) (mi_cmd_stack_list_args, list_arg_or_local): Update. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Update. * inferior.c (print_inferior): Update. * gdb_bfd.c (print_one_bfd): Update. * disasm.c (gdb_pretty_print_disassembler::pretty_print_insn): Update. * darwin-nat-info.c (darwin_debug_regions_recurse): Update. * cli-out.h (class cli_ui_out) <do_field_signed>: Rename from do_field_int. Change type of "value". * cli-out.c (cli_ui_out::do_field_signed): Rename from do_field_int. Change type of "value". * breakpoint.c (watchpoint_check, print_breakpoint_location) (print_one_breakpoint_location, print_it_catch_fork) (print_one_catch_fork, print_it_catch_vfork) (print_one_catch_vfork, print_it_catch_solib) (print_it_catch_exec, print_it_ranged_breakpoint) (print_mention_watchpoint, print_mention_masked_watchpoint) (bkpt_print_it, update_static_tracepoint): Update. * break-catch-throw.c (print_it_exception_catchpoint): Update. * break-catch-syscall.c (print_it_catch_syscall): Update. * ada-tasks.c (print_ada_task_info): Update. * ada-lang.c (print_it_exception, print_mention_exception): Update.
Diffstat (limited to 'gdb/mi')
-rw-r--r--gdb/mi/mi-cmd-file.c6
-rw-r--r--gdb/mi/mi-cmd-stack.c6
-rw-r--r--gdb/mi/mi-cmd-var.c26
-rw-r--r--gdb/mi/mi-interp.c8
-rw-r--r--gdb/mi/mi-main.c36
-rw-r--r--gdb/mi/mi-out.c12
-rw-r--r--gdb/mi/mi-out.h4
-rw-r--r--gdb/mi/mi-symbol-cmds.c2
8 files changed, 50 insertions, 50 deletions
diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 714ab01..963c8c7 100644
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -53,13 +53,13 @@ mi_cmd_file_list_exec_source_file (const char *command, char **argv, int argc)
error (_("-file-list-exec-source-file: No symtab"));
/* Print to the user the line, filename and fullname. */
- uiout->field_int ("line", st.line);
+ uiout->field_signed ("line", st.line);
uiout->field_string ("file", symtab_to_filename_for_display (st.symtab));
uiout->field_string ("fullname", symtab_to_fullname (st.symtab));
- uiout->field_int ("macro-info",
- COMPUNIT_MACRO_TABLE (SYMTAB_COMPUNIT (st.symtab)) != NULL);
+ uiout->field_signed ("macro-info",
+ COMPUNIT_MACRO_TABLE (SYMTAB_COMPUNIT (st.symtab)) != NULL);
}
/* A callback for map_partial_symbol_filenames. */
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index c8a4ce7..e8f8d15 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -204,7 +204,7 @@ mi_cmd_stack_info_depth (const char *command, char **argv, int argc)
i++, fi = get_prev_frame (fi))
QUIT;
- current_uiout->field_int ("depth", i);
+ current_uiout->field_signed ("depth", i);
}
/* Print a list of the locals for the current frame. With argument of
@@ -391,7 +391,7 @@ mi_cmd_stack_list_args (const char *command, char **argv, int argc)
{
QUIT;
ui_out_emit_tuple tuple_emitter (uiout, "frame");
- uiout->field_int ("level", i);
+ uiout->field_signed ("level", i);
list_args_or_locals (user_frame_print_options,
arguments, print_values, fi, skip_unavailable);
}
@@ -521,7 +521,7 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what,
uiout->field_stream ("name", stb);
if (what == all && SYMBOL_IS_ARGUMENT (arg->sym))
- uiout->field_int ("arg", 1);
+ uiout->field_signed ("arg", 1);
if (values == PRINT_SIMPLE_VALUES)
{
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 662ffa3..f5219e0 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -60,7 +60,7 @@ print_varobj (struct varobj *var, enum print_values print_values,
uiout->field_string ("exp", exp.c_str ());
}
- uiout->field_int ("numchild", varobj_get_num_children (var));
+ uiout->field_signed ("numchild", varobj_get_num_children (var));
if (mi_print_value_p (var, print_values))
{
@@ -75,17 +75,17 @@ print_varobj (struct varobj *var, enum print_values print_values,
thread_id = varobj_get_thread_id (var);
if (thread_id > 0)
- uiout->field_int ("thread-id", thread_id);
+ uiout->field_signed ("thread-id", thread_id);
if (varobj_get_frozen (var))
- uiout->field_int ("frozen", 1);
+ uiout->field_signed ("frozen", 1);
gdb::unique_xmalloc_ptr<char> display_hint = varobj_get_display_hint (var);
if (display_hint)
uiout->field_string ("displayhint", display_hint.get ());
if (varobj_is_dynamic_p (var))
- uiout->field_int ("dynamic", 1);
+ uiout->field_signed ("dynamic", 1);
}
/* VAROBJ operations */
@@ -138,7 +138,7 @@ mi_cmd_var_create (const char *command, char **argv, int argc)
print_varobj (var, PRINT_ALL_VALUES, 0 /* don't print expression */);
- uiout->field_int ("has_more", varobj_has_more (var, 0));
+ uiout->field_signed ("has_more", varobj_has_more (var, 0));
}
void
@@ -183,7 +183,7 @@ mi_cmd_var_delete (const char *command, char **argv, int argc)
numdel = varobj_delete (var, children_only_p);
- uiout->field_int ("ndeleted", numdel);
+ uiout->field_signed ("ndeleted", numdel);
}
/* Parse a string argument into a format value. */
@@ -313,7 +313,7 @@ mi_cmd_var_info_num_children (const char *command, char **argv, int argc)
/* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
- uiout->field_int ("numchild", varobj_get_num_children (var));
+ uiout->field_signed ("numchild", varobj_get_num_children (var));
}
/* Return 1 if given the argument PRINT_VALUES we should display
@@ -380,7 +380,7 @@ mi_cmd_var_list_children (const char *command, char **argv, int argc)
const std::vector<varobj *> &children
= varobj_list_children (var, &from, &to);
- uiout->field_int ("numchild", to - from);
+ uiout->field_signed ("numchild", to - from);
if (argc == 2 || argc == 4)
print_values = mi_parse_print_values (argv[0]);
else
@@ -409,7 +409,7 @@ mi_cmd_var_list_children (const char *command, char **argv, int argc)
}
}
- uiout->field_int ("has_more", varobj_has_more (var, to));
+ uiout->field_signed ("has_more", varobj_has_more (var, to));
}
void
@@ -732,8 +732,8 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
}
if (r.type_changed || r.children_changed)
- uiout->field_int ("new_num_children",
- varobj_get_num_children (r.varobj));
+ uiout->field_signed ("new_num_children",
+ varobj_get_num_children (r.varobj));
gdb::unique_xmalloc_ptr<char> display_hint
= varobj_get_display_hint (r.varobj);
@@ -741,10 +741,10 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
uiout->field_string ("displayhint", display_hint.get ());
if (varobj_is_dynamic_p (r.varobj))
- uiout->field_int ("dynamic", 1);
+ uiout->field_signed ("dynamic", 1);
varobj_get_child_range (r.varobj, &from, &to);
- uiout->field_int ("has_more", varobj_has_more (r.varobj, to));
+ uiout->field_signed ("has_more", varobj_has_more (r.varobj, to));
if (!r.newobj.empty ())
{
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 03ab169..9033a61 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -633,19 +633,19 @@ mi_on_normal_stop_1 (struct bpstats *bs, int print_frame)
if (console_print)
print_stop_event (mi->cli_uiout);
- mi_uiout->field_int ("thread-id", tp->global_num);
+ mi_uiout->field_signed ("thread-id", tp->global_num);
if (non_stop)
{
ui_out_emit_list list_emitter (mi_uiout, "stopped-threads");
- mi_uiout->field_int (NULL, tp->global_num);
+ mi_uiout->field_signed (NULL, tp->global_num);
}
else
mi_uiout->field_string ("stopped-threads", "all");
core = target_core_of_thread (tp->ptid);
if (core != -1)
- mi_uiout->field_int ("core", core);
+ mi_uiout->field_signed ("core", core);
}
fputs_unfiltered ("*stopped", mi->raw_stdout);
@@ -1034,7 +1034,7 @@ mi_output_solib_attribs (ui_out *uiout, struct so_list *solib)
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);
+ uiout->field_signed ("symbols-loaded", solib->symbols_loaded);
if (!gdbarch_has_global_solist (target_gdbarch ()))
uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num);
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 26ffeb07..5dc436b 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -592,13 +592,13 @@ mi_cmd_thread_list_ids (const char *command, char **argv, int argc)
current_thread = tp->global_num;
num++;
- current_uiout->field_int ("thread-id", tp->global_num);
+ current_uiout->field_signed ("thread-id", tp->global_num);
}
}
if (current_thread != -1)
- current_uiout->field_int ("current-thread-id", current_thread);
- current_uiout->field_int ("number-of-threads", num);
+ current_uiout->field_signed ("current-thread-id", current_thread);
+ current_uiout->field_signed ("number-of-threads", num);
}
void
@@ -658,7 +658,7 @@ print_one_inferior (struct inferior *inferior, void *xdata)
uiout->field_string ("exit-code",
int_string (inferior->exit_code, 8, 0, 0, 1));
if (inferior->pid != 0)
- uiout->field_int ("pid", inferior->pid);
+ uiout->field_signed ("pid", inferior->pid);
if (inferior->pspace->pspace_exec_filename != NULL)
{
@@ -677,7 +677,7 @@ print_one_inferior (struct inferior *inferior, void *xdata)
ui_out_emit_list list_emitter (uiout, "cores");
for (int b : data.cores)
- uiout->field_int (NULL, b);
+ uiout->field_signed (NULL, b);
}
if (top_data->recurse)
@@ -964,7 +964,7 @@ mi_cmd_data_list_changed_registers (const char *command, char **argv, int argc)
if (register_changed_p (regnum, prev_regs.get (),
this_regs.get ()))
- uiout->field_int (NULL, regnum);
+ uiout->field_signed (NULL, regnum);
}
}
@@ -980,7 +980,7 @@ mi_cmd_data_list_changed_registers (const char *command, char **argv, int argc)
{
if (register_changed_p (regnum, prev_regs.get (),
this_regs.get ()))
- uiout->field_int (NULL, regnum);
+ uiout->field_signed (NULL, regnum);
}
else
error (_("bad register number"));
@@ -1124,7 +1124,7 @@ output_register (struct frame_info *frame, int regnum, int format,
return;
ui_out_emit_tuple tuple_emitter (uiout, NULL);
- uiout->field_int ("number", regnum);
+ uiout->field_signed ("number", regnum);
if (format == 'N')
format = 0;
@@ -1353,8 +1353,8 @@ mi_cmd_data_read_memory (const char *command, char **argv, int argc)
/* Output the header information. */
uiout->field_core_addr ("addr", gdbarch, addr);
- uiout->field_int ("nr-bytes", nr_bytes);
- uiout->field_int ("total-bytes", total_bytes);
+ uiout->field_signed ("nr-bytes", nr_bytes);
+ uiout->field_signed ("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);
@@ -2191,8 +2191,8 @@ mi_load_progress (const char *section_name,
{
ui_out_emit_tuple tuple_emitter (uiout.get (), NULL);
uiout->field_string ("section", section_name);
- uiout->field_int ("section-size", total_section);
- uiout->field_int ("total-size", grand_total);
+ uiout->field_signed ("section-size", total_section);
+ uiout->field_signed ("total-size", grand_total);
}
mi_out_put (uiout.get (), mi->raw_stdout);
fputs_unfiltered ("\n", mi->raw_stdout);
@@ -2209,10 +2209,10 @@ mi_load_progress (const char *section_name,
{
ui_out_emit_tuple tuple_emitter (uiout.get (), NULL);
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);
+ uiout->field_signed ("section-sent", sent_so_far);
+ uiout->field_signed ("section-size", total_section);
+ uiout->field_signed ("total-sent", total_sent);
+ uiout->field_signed ("total-size", grand_total);
}
mi_out_put (uiout.get (), mi->raw_stdout);
fputs_unfiltered ("\n", mi->raw_stdout);
@@ -2656,7 +2656,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
tsv->value_known = target_get_trace_state_variable_value (tsv->number,
&tsv->value);
- uiout->field_int ("current", tsv->value);
+ uiout->field_signed ("current", tsv->value);
}
else
{
@@ -2681,7 +2681,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
ui_out_emit_tuple tuple_emitter (uiout, NULL);
uiout->field_core_addr ("address", gdbarch, r.start);
- uiout->field_int ("length", r.length);
+ uiout->field_signed ("length", r.length);
gdb::byte_vector data (r.length);
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index 75e3f03..a668717 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -35,8 +35,8 @@ mi_ui_out::do_table_begin (int nr_cols, int nr_rows,
const char *tblid)
{
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);
+ do_field_signed (-1, -1, ui_left, "nr_rows", nr_rows);
+ do_field_signed (-1, -1, ui_left, "nr_cols", nr_cols);
open ("hdr", ui_out_type_list);
}
@@ -67,8 +67,8 @@ mi_ui_out::do_table_header (int width, ui_align alignment,
const std::string &col_hdr)
{
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_signed (0, 0, ui_center, "width", width);
+ do_field_signed (0, 0, ui_center, "alignment", alignment);
do_field_string (0, 0, ui_center, "col_name", col_name.c_str (),
ui_out_style_kind::DEFAULT);
do_field_string (0, width, alignment, "colhdr", col_hdr.c_str (),
@@ -95,8 +95,8 @@ mi_ui_out::do_end (ui_out_type type)
/* Output an int field. */
void
-mi_ui_out::do_field_int (int fldno, int width, ui_align alignment,
- const char *fldname, int value)
+mi_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
+ const char *fldname, LONGEST value)
{
do_field_string (fldno, width, alignment, fldname, plongest (value),
ui_out_style_kind::DEFAULT);
diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h
index 1328684..01d15e3 100644
--- a/gdb/mi/mi-out.h
+++ b/gdb/mi/mi-out.h
@@ -52,8 +52,8 @@ protected:
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_signed (int fldno, int width, ui_align align,
+ const char *fldname, LONGEST value) override;
virtual void do_field_unsigned (int fldno, int width, ui_align align,
const char *fldname, ULONGEST value)
override;
diff --git a/gdb/mi/mi-symbol-cmds.c b/gdb/mi/mi-symbol-cmds.c
index 78a5590..63142e8 100644
--- a/gdb/mi/mi-symbol-cmds.c
+++ b/gdb/mi/mi-symbol-cmds.c
@@ -56,6 +56,6 @@ mi_cmd_symbol_list_lines (const char *command, char **argv, int argc)
{
ui_out_emit_tuple tuple_emitter (uiout, NULL);
uiout->field_core_addr ("pc", gdbarch, SYMTAB_LINETABLE (s)->item[i].pc);
- uiout->field_int ("line", SYMTAB_LINETABLE (s)->item[i].line);
+ uiout->field_signed ("line", SYMTAB_LINETABLE (s)->item[i].line);
}
}