OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a use of is_mi_like_p from tracepoint.c

Browse Source 
This removes a use of is_mi_like_p and changes a printf_filtered into
a call to ui_out::text.

ChangeLog
2018-04-30  Tom Tromey  <tom@tromey.com>

	* tracepoint.c (tvariables_info_1): Remove use of is_mi_like_p.
This commit is contained in:
Tom Tromey 2018-04-29 20:50:43 -06:00
parent 40c03530b1
commit f3c6ababac
2 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2018-04-30 Tom Tromey <tom@tromey.com>
* tracepoint.c (tvariables_info_1): Remove use of is_mi_like_p.
2018-04-30 Tom Tromey <tom@tromey.com>
* spu-tdep.c (info_spu_mailbox_list, info_spu_dma_cmdlist)

69
gdb/tracepoint.c
View File

@ -420,51 +420,50 @@ tvariables_info_1 (void)
{
struct ui_out *uiout = current_uiout;
if (tvariables.empty () && !uiout->is_mi_like_p ())
{
printf_filtered (_("No trace state variables.\n"));
return;
}
/* Try to acquire values from the target. */
for (trace_state_variable &tsv : tvariables)
tsv.value_known
= target_get_trace_state_variable_value (tsv.number, &tsv.value);
ui_out_emit_table table_emitter (uiout, 3, tvariables.size (),
"trace-variables");
uiout->table_header (15, ui_left, "name", "Name");
uiout->table_header (11, ui_left, "initial", "Initial");
uiout->table_header (11, ui_left, "current", "Current");
{
ui_out_emit_table table_emitter (uiout, 3, tvariables.size (),
"trace-variables");
uiout->table_header (15, ui_left, "name", "Name");
uiout->table_header (11, ui_left, "initial", "Initial");
uiout->table_header (11, ui_left, "current", "Current");
uiout->table_body ();
uiout->table_body ();
for (const trace_state_variable &tsv : tvariables)
{
const char *c;
for (const trace_state_variable &tsv : tvariables)
{
const char *c;
ui_out_emit_tuple tuple_emitter (uiout, "variable");
ui_out_emit_tuple tuple_emitter (uiout, "variable");
uiout->field_string ("name", std::string ("$") + tsv.name);
uiout->field_string ("initial", plongest (tsv.initial_value));
uiout->field_string ("name", std::string ("$") + tsv.name);
uiout->field_string ("initial", plongest (tsv.initial_value));
if (tsv.value_known)
c = plongest (tsv.value);
else if (uiout->is_mi_like_p ())
/* For MI, we prefer not to use magic string constants, but rather
omit the field completely. The difference between unknown and
undefined does not seem important enough to represent. */
c = NULL;
else if (current_trace_status ()->running || traceframe_number >= 0)
/* The value is/was defined, but we don't have it. */
c = "<unknown>";
else
/* It is not meaningful to ask about the value. */
c = "<undefined>";
if (c)
uiout->field_string ("current", c);
uiout->text ("\n");
}
if (tsv.value_known)
c = plongest (tsv.value);
else if (uiout->is_mi_like_p ())
/* For MI, we prefer not to use magic string constants, but rather
omit the field completely. The difference between unknown and
undefined does not seem important enough to represent. */
c = NULL;
else if (current_trace_status ()->running || traceframe_number >= 0)
/* The value is/was defined, but we don't have it. */
c = "<unknown>";
else
/* It is not meaningful to ask about the value. */
c = "<undefined>";
if (c)
uiout->field_string ("current", c);
uiout->text ("\n");
}
}
if (tvariables.empty ())
uiout->text (_("No trace state variables.\n"));
}
/* List all the trace state variables. */