espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-01 01:45:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make target_desc::compatible an std::vector

Browse Source 
This patch changes target_desc::compatible to be a vector of
bfd_arch_info *.  This way, we don't need to manually free the vector in
the target_desc destructor.

gdb/ChangeLog:

	* target-descriptions.c (arch_p): Remove typedef.
	(DEF_VEC_P (arch_p)): Remove.
	(struct target_desc) <compatible>: Change type to std::vector.
	<~target_desc>: Don't manually free compatible.
	(tdesc_compatible_p): Adjust.
	(tdesc_add_compatible): Adjust.
	(class print_c_tdesc) <visit_pre>: Adjust.
This commit is contained in:
Simon Marchi
2017-12-05 16:30:22 -05:00
committed by Simon Marchi
parent 129c10bcb9
commit 40e2a9835f
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2017-12-05 Simon Marchi <simon.marchi@polymtl.ca>
* target-descriptions.c (arch_p): Remove typedef.
(DEF_VEC_P (arch_p)): Remove.
(struct target_desc) <compatible>: Change type to std::vector.
<~target_desc>: Don't manually free compatible.
(tdesc_compatible_p): Adjust.
(tdesc_add_compatible): Adjust.
(class print_c_tdesc) <visit_pre>: Adjust.
2017-12-05 Simon Marchi <simon.marchi@polymtl.ca> 2017-12-05 Simon Marchi <simon.marchi@polymtl.ca>
* target-descriptions.c (property_s): Remove typedef. * target-descriptions.c (property_s): Remove typedef.

39
gdb/target-descriptions.c
View File

@ -386,10 +386,6 @@ typedef struct tdesc_feature : tdesc_element
} *tdesc_feature_p; } *tdesc_feature_p;
DEF_VEC_P(tdesc_feature_p); DEF_VEC_P(tdesc_feature_p);
/* A compatible architecture from a target description. */
typedef const struct bfd_arch_info *arch_p;
DEF_VEC_P(arch_p);
/* A target description. */ /* A target description. */
struct target_desc : tdesc_element struct target_desc : tdesc_element
@ -407,8 +403,6 @@ struct target_desc : tdesc_element
ix++) ix++)
delete feature; delete feature;
VEC_free (tdesc_feature_p, features); VEC_free (tdesc_feature_p, features);
VEC_free (arch_p, compatible);
} }
target_desc (const target_desc &) = delete; target_desc (const target_desc &) = delete;
@ -422,7 +416,7 @@ struct target_desc : tdesc_element
enum gdb_osabi osabi = GDB_OSABI_UNKNOWN; enum gdb_osabi osabi = GDB_OSABI_UNKNOWN;
/* The list of compatible architectures reported by the target. */ /* The list of compatible architectures reported by the target. */
VEC(arch_p) *compatible = NULL; std::vector<const bfd_arch_info *> compatible;
/* Any architecture-specific properties specified by the target. */ /* Any architecture-specific properties specified by the target. */
std::vector<property> properties; std::vector<property> properties;
@ -695,11 +689,7 @@ int
tdesc_compatible_p (const struct target_desc *target_desc, tdesc_compatible_p (const struct target_desc *target_desc,
const struct bfd_arch_info *arch) const struct bfd_arch_info *arch)
{ {
const struct bfd_arch_info *compat; for (const bfd_arch_info *compat : target_desc->compatible)
int ix;
for (ix = 0; VEC_iterate (arch_p, target_desc->compatible, ix, compat);
ix++)
{ {
if (compat == arch if (compat == arch
|| arch->compatible (arch, compat) || arch->compatible (arch, compat)
@ -1765,24 +1755,20 @@ void
tdesc_add_compatible (struct target_desc *target_desc, tdesc_add_compatible (struct target_desc *target_desc,
const struct bfd_arch_info *compatible) const struct bfd_arch_info *compatible)
{ {
const struct bfd_arch_info *compat;
int ix;
/* If this instance of GDB is compiled without BFD support for the /* If this instance of GDB is compiled without BFD support for the
compatible architecture, simply ignore it -- we would not be able compatible architecture, simply ignore it -- we would not be able
to handle it anyway. */ to handle it anyway. */
if (compatible == NULL) if (compatible == NULL)
return; return;
for (ix = 0; VEC_iterate (arch_p, target_desc->compatible, ix, compat); for (const bfd_arch_info *compat : target_desc->compatible)
ix++)
if (compat == compatible) if (compat == compatible)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
_("Attempted to add duplicate " _("Attempted to add duplicate "
"compatible architecture \"%s\""), "compatible architecture \"%s\""),
compatible->printable_name); compatible->printable_name);
VEC_safe_push (arch_p, target_desc->compatible, compatible); target_desc->compatible.push_back (compatible);
} }
void void
@ -1953,19 +1939,12 @@ public:
printf_unfiltered ("\n"); printf_unfiltered ("\n");
} }
int ix; for (const struct bfd_arch_info *compatible : e->compatible)
const struct bfd_arch_info *compatible; printf_unfiltered
struct property *prop; (" tdesc_add_compatible (result, bfd_scan_arch (\"%s\"));\n",
compatible->printable_name);
for (ix = 0; VEC_iterate (arch_p, e->compatible, ix, compatible); if (!e->compatible.empty ())
ix++)
{
printf_unfiltered
(" tdesc_add_compatible (result, bfd_scan_arch (\"%s\"));\n",
compatible->printable_name);
}
if (ix)
printf_unfiltered ("\n"); printf_unfiltered ("\n");
for (const property &prop : e->properties) for (const property &prop : e->properties)