aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-10-21 12:06:42 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2017-10-21 12:15:42 -0400
commita664f67e50eff30198097d51cec0ec4690abb2a1 (patch)
tree80218f000d3530c920868dae8d186f3a5ec49fb6 /gdb/target-delegates.c
parentUse std::string in memory_map_parsing_data (diff)
downloadbinutils-gdb-a664f67e50eff30198097d51cec0ec4690abb2a1.tar.gz
binutils-gdb-a664f67e50eff30198097d51cec0ec4690abb2a1.tar.bz2
binutils-gdb-a664f67e50eff30198097d51cec0ec4690abb2a1.zip
Get rid of VEC (mem_region)
This patch removes VEC (mem_region). Doing so requires touching a lot of little things here and there. The fields in mem_attrib are now initialized during construction. The values match those that were in default_mem_attrib (now removed). unknown_mem_attrib is also removed, and replaced with a static method (mem_attrib::unknown) that returns the equivalent. mem_region is initialized in a way similar to mem_region_init (now removed) did. I found the organization of mem_region_list and target_mem_region_list a bit confusing. Sometimes mem_region_list points to the same vector as target_mem_region_list (and therefore does not own it), and sometimes (when the user manually edits the mem regions) points to another vector, and in this case owns it. To avoid this ambiguity, I think it is simpler to have two vectors, one for target-defined regions and one for user-defined regions, and have mem_region_list point to one or the other. There are now no vector objects dynamically allocated, both are static. The make-target-delegates script does not generate valid code when a target method returns a type with a parameter list. For this reason, I created a typedef (mem_region_vector) that's only used in the target_ops structure. If you speak perl, you are welcome to improve the script! Regtested on the buildbot. gdb/ChangeLog: * memattr.h: Don't include vec.h. (struct mem_attrib): Initialize fields. <unknown>: New static method. (struct mem_region): Add constructors, operator<, initialize fields. * memattr.c: Include algorithm. (default_mem_attrib, unknown_mem_attrib): Remove. (user_mem_region_list): New global. (target_mem_region_list, mem_region_list): Change type to std::vector<mem_region>. (mem_use_target): Now a function. (target_mem_regions_valid): Change type to bool. (mem_region_lessthan, mem_region_cmp, mem_region_init): Remove. (require_user_regions): Adjust. (require_target_regions): Adjust. (create_mem_region): Adjust. (lookup_mem_region): Adjust. (invalidate_target_mem_regions): Adjust. (mem_clear): Rename to... (user_mem_clear): ... this, and adjust. (mem_command): Adjust. (info_mem_command): Adjust. (mem_enable, enable_mem_command, mem_disable, disable_mem_command): Adjust. (mem_delete): Adjust. (delete_mem_command): Adjust. * memory-map.h (parse_memory_map): Return an std::vector. * memory-map.c (parse_memory_map): Likewise. (struct memory_map_parsing_data): Add constructor. <memory_map>: Point to std::vector. (memory_map_start_memory): Adjust. (memory_map_end_memory): Adjust. (memory_map_end_property): Adjust. (clear_result): Remove. * remote.c (remote_memory_map): Return an std::vector. * target-debug.h (target_debug_print_VEC_mem_region_s__p): Remove. (target_debug_print_mem_region_vector): New. * target-delegates.c: Regenerate. * target.h (mem_region_vector): New typedef. (to_memory_map): Return mem_region_vector. (target_memory_map): Return an std::vector. * target.c (target_memory_map): Return an std::vector. (flash_erase_command): Adjust.
Diffstat (limited to 'gdb/target-delegates.c')
-rw-r--r--gdb/target-delegates.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 00efbb14985..e0d7a9a8b2b 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -2148,29 +2148,29 @@ debug_get_memory_xfer_limit (struct target_ops *self)
return result;
}
-static VEC(mem_region_s) *
+static mem_region_vector
delegate_memory_map (struct target_ops *self)
{
self = self->beneath;
return self->to_memory_map (self);
}
-static VEC(mem_region_s) *
+static mem_region_vector
tdefault_memory_map (struct target_ops *self)
{
- return NULL;
+ return std::vector<mem_region> ();
}
-static VEC(mem_region_s) *
+static mem_region_vector
debug_memory_map (struct target_ops *self)
{
- VEC(mem_region_s) * result;
+ mem_region_vector result;
fprintf_unfiltered (gdb_stdlog, "-> %s->to_memory_map (...)\n", debug_target.to_shortname);
result = debug_target.to_memory_map (&debug_target);
fprintf_unfiltered (gdb_stdlog, "<- %s->to_memory_map (", debug_target.to_shortname);
target_debug_print_struct_target_ops_p (&debug_target);
fputs_unfiltered (") = ", gdb_stdlog);
- target_debug_print_VEC_mem_region_s__p (result);
+ target_debug_print_mem_region_vector (result);
fputs_unfiltered ("\n", gdb_stdlog);
return result;
}