aboutsummaryrefslogtreecommitdiff
path: root/gdb/memory-map.c
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2018-01-07 09:29:52 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2018-01-07 09:38:16 -0500
commit4d0fdd9b357aff1fea3ef3def55d12464a41bf5b (patch)
tree3d31052e1794ddbe5942daabe65d3fc1d900cf76 /gdb/memory-map.c
parentf979c73fd0be9a8a683f79af40c7b939c2a65d9f (diff)
downloadgdb-4d0fdd9b357aff1fea3ef3def55d12464a41bf5b.zip
gdb-4d0fdd9b357aff1fea3ef3def55d12464a41bf5b.tar.gz
gdb-4d0fdd9b357aff1fea3ef3def55d12464a41bf5b.tar.bz2
Replace VEC(gdb_xml_value_s) with std::vector
This patch replaces VEC(gdb_xml_value_s), which is passed to XML visitors, with an std::vector. In order to be able to remove the cleanup in gdb_xml_parser::start_element, the gdb_xml_parser structure is made to own the value with a gdb::unique_xmalloc_ptr. This patch has been tested on the buildbot. gdb/ChangeLog: * xml-support.h (struct gdb_xml_value): Add constructor. <value>: Change type to unique_xmalloc_ptr. (gdb_xml_value_s): Remove typedef. (DEF_VEC_O (gdb_xml_value_s)): Remove. (gdb_xml_element_start_handler): Change parameter type to std::vector. (xml_find_attribute): Likewise. * xml-support.c (xml_find_attribute): Change parameter type to std::vector and adjust. (gdb_xml_values_cleanup): Remove. (gdb_xml_parser::start_element): Adjust to std::vector. (xinclude_start_include): Change paraeter type to std::vector and adjust. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. * memory-map.c (memory_map_start_memory): Likewise. (memory_map_start_property): Likewise. * osdata.c (osdata_start_osdata): Likewise. (osdata_start_item): Likewise. (osdata_start_column): Likewise. * remote.c (start_thread): Likewise. * solib-aix.c (library_list_start_library): Likewise. (library_list_start_list): Likewise. * solib-svr4.c (library_list_start_library): Likewise. (svr4_library_list_start_list): Likewise. * solib-target.c (library_list_start_segment): Likewise. (library_list_start_section): Likewise. (library_list_start_library): Likewise. (library_list_start_list): Likewise. * tracepoint.c (traceframe_info_start_memory): Likewise. (traceframe_info_start_tvar): Likewise. * xml-syscall.c (syscall_start_syscall): Likewise. * xml-tdesc.c (tdesc_start_target): Likewise. (tdesc_start_feature): Likewise. (tdesc_start_reg): Likewise. (tdesc_start_union): Likewise. (tdesc_start_struct): Likewise. (tdesc_start_flags): Likewise. (tdesc_start_enum): Likewise. (tdesc_start_field): Likewise. (tdesc_start_enum_value): Likewise. (tdesc_start_vector): Likewise.
Diffstat (limited to 'gdb/memory-map.c')
-rw-r--r--gdb/memory-map.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 55b207e..6a1220e 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -58,18 +58,19 @@ struct memory_map_parsing_data
static void
memory_map_start_memory (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- void *user_data, VEC(gdb_xml_value_s) *attributes)
+ void *user_data,
+ std::vector<gdb_xml_value> &attributes)
{
struct memory_map_parsing_data *data
= (struct memory_map_parsing_data *) user_data;
ULONGEST *start_p, *length_p, *type_p;
start_p
- = (ULONGEST *) xml_find_attribute (attributes, "start")->value;
+ = (ULONGEST *) xml_find_attribute (attributes, "start")->value.get ();
length_p
- = (ULONGEST *) xml_find_attribute (attributes, "length")->value;
+ = (ULONGEST *) xml_find_attribute (attributes, "length")->value.get ();
type_p
- = (ULONGEST *) xml_find_attribute (attributes, "type")->value;
+ = (ULONGEST *) xml_find_attribute (attributes, "type")->value.get ();
data->memory_map->emplace_back (*start_p, *start_p + *length_p,
(enum mem_access_mode) *type_p);
@@ -97,13 +98,14 @@ memory_map_end_memory (struct gdb_xml_parser *parser,
static void
memory_map_start_property (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- void *user_data, VEC(gdb_xml_value_s) *attributes)
+ void *user_data,
+ std::vector<gdb_xml_value> &attributes)
{
struct memory_map_parsing_data *data
= (struct memory_map_parsing_data *) user_data;
char *name;
- name = (char *) xml_find_attribute (attributes, "name")->value;
+ name = (char *) xml_find_attribute (attributes, "name")->value.get ();
data->property_name.assign (name);
}