diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2018-04-09 15:16:19 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2018-04-09 15:16:19 -0400 |
| commit | c252925ccc8c3c2ce2a65d12a50acfee53914ce3 (patch) | |
| tree | 6fa48792604458aec63c02752d1412d5adf655d9 /gdb/mi | |
| parent | c9638d2669ced9348eac869dadc7be24df85a9a8 (diff) | |
| download | binutils-c252925ccc8c3c2ce2a65d12a50acfee53914ce3.zip binutils-c252925ccc8c3c2ce2a65d12a50acfee53914ce3.tar.gz binutils-c252925ccc8c3c2ce2a65d12a50acfee53914ce3.tar.bz2 | |
Remove VEC(tsv_s), use std::vector instead
This patch removes VEC(tsv_s), using an std::vector instead. I C++ified
trace_state_variable a bit in the process, using std::string for the
name. I also thought it would be nicer to pass a const reference to
target_download_trace_state_variable, since we know it will never be
NULL. This highlighted that the make-target-delegates script didn't
handle references well, so I adjusted this as well. It will surely be
useful in the future.
gdb/ChangeLog:
* tracepoint.h (struct trace_state_variable): Add constructor.
<name>: Change type to std::string.
* tracepoint.c (tsv_s): Remove.
(DEF_VEC_O(tsv_s)): Remove.
(tvariables): Change to std::vector.
(create_trace_state_variable): Adjust to std::vector.
(find_trace_state_variable): Likewise.
(find_trace_state_variable_by_number): Likewise.
(delete_trace_state_variable): Likewise.
(trace_variable_command): Adjust to std::string.
(delete_trace_variable_command): Likewise.
(tvariables_info_1): Adjust to std::vector.
(save_trace_state_variables): Likewise.
(start_tracing): Likewise.
(merge_uploaded_trace_state_variables): Adjust to std::vector
and std::string.
* target.h (struct target_ops)
<to_download_trace_state_variable>: Pass reference to
trace_state_variable.
* target-debug.h (target_debug_print_const_trace_state_variable_r): New.
* target-delegates.c: Re-generate.
* mi/mi-interp.c (mi_tsv_created): Adjust to std::string.
(mi_tsv_deleted): Likewise.
* mi/mi-main.c (mi_cmd_trace_frame_collected): Likewise.
* remote.c (remote_download_trace_state_variable): Change
pointer to reference and adjust.
* make-target-delegates (parse_argtypes): Handle references.
(write_function_header): Likewise.
(munge_type): Likewise.
Diffstat (limited to 'gdb/mi')
| -rw-r--r-- | gdb/mi/mi-interp.c | 4 | ||||
| -rw-r--r-- | gdb/mi/mi-main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 0a96138..8bfb129 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -760,7 +760,7 @@ mi_tsv_created (const struct trace_state_variable *tsv) fprintf_unfiltered (mi->event_channel, "tsv-created," "name=\"%s\",initial=\"%s\"\n", - tsv->name, plongest (tsv->initial_value)); + tsv->name.c_str (), plongest (tsv->initial_value)); gdb_flush (mi->event_channel); } @@ -783,7 +783,7 @@ mi_tsv_deleted (const struct trace_state_variable *tsv) if (tsv != NULL) fprintf_unfiltered (mi->event_channel, "tsv-deleted," - "name=\"%s\"\n", tsv->name); + "name=\"%s\"\n", tsv->name.c_str ()); else fprintf_unfiltered (mi->event_channel, "tsv-deleted\n"); diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index deb96b4..d735460 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -2665,7 +2665,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc) if (tsv != NULL) { - uiout->field_fmt ("name", "$%s", tsv->name); + uiout->field_fmt ("name", "$%s", tsv->name.c_str ()); tsv->value_known = target_get_trace_state_variable_value (tsv->number, &tsv->value); |