mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: make target_desc_info::filename an std::string

Browse Source 
To make the management of memory automatic.

As to why I chose to make this an std::string and not an
std::unique_xmalloc_ptr<char>: some parts of the code consider both a
NULL value and an empty string value to mean "no filename".
target_desc_info_from_user_p, however, doesn't check for a non-NULL but
empty string value.  So it seems like having two ways of denoting "no
filename" can lead to these kinds of inconsistencies.  Using
std::string, "no filename" is only represented by an empty value.

As a bonus, using an std::string lets us copy target_desc_info objects
using the default assignment operator.

gdb/ChangeLog:

	* target-descriptions.c (struct target_desc_info) <filename>:
	Make std::string.
	(copy_inferior_target_desc_info): Adjust.
	(target_desc_info_free): Adjust.
	(target_find_description): Adjust.
	(set_tdesc_filename_cmd): Adjust.
	(show_tdesc_filename_cmd): Adjust.
	(unset_tdesc_filename_cmd): Adjust.
	(maint_print_c_tdesc_cmd): Adjust.

Change-Id: I4e3a6ad8ccda2b88c202471d4f54249753cad127
This commit is contained in:
Simon Marchi 2021-05-07 16:28:56 -04:00
parent 0b2f7ade53
commit 91e3c425d6
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/ChangeLog
View File

@ -1,3 +1,15 @@
2021-05-07 Simon Marchi <simon.marchi@polymtl.ca>
* target-descriptions.c (struct target_desc_info) <filename>:
Make std::string.
(copy_inferior_target_desc_info): Adjust.
(target_desc_info_free): Adjust.
(target_find_description): Adjust.
(set_tdesc_filename_cmd): Adjust.
(show_tdesc_filename_cmd): Adjust.
(unset_tdesc_filename_cmd): Adjust.
(maint_print_c_tdesc_cmd): Adjust.
2021-05-07 Simon Marchi <simon.marchi@polymtl.ca>
* target-descriptions.c (struct target_desc_info): Initialize

34
gdb/target-descriptions.c
View File

@ -456,10 +456,12 @@ struct target_desc_info
const struct target_desc *tdesc = nullptr;
/* The filename to read a target description from, as set by "set
tdesc filename ..." */
/* If not empty, the filename to read a target description from, as set by
"set tdesc filename ...".
char *filename = nullptr;
If empty, there is not filename specified by the user. */
std::string filename;
};
/* Get the inferior INF's target description info, allocating one on
@ -484,7 +486,7 @@ static struct gdbarch_data *tdesc_data;
int
target_desc_info_from_user_p (struct target_desc_info *info)
{
return info != NULL && info->filename != NULL;
return info != nullptr && !info->filename.empty ();
}
/* See target-descriptions.h. */
@ -495,9 +497,7 @@ copy_inferior_target_desc_info (struct inferior *destinf, struct inferior *srcin
struct target_desc_info *src = get_tdesc_info (srcinf);
struct target_desc_info *dest = get_tdesc_info (destinf);
dest->fetched = src->fetched;
dest->tdesc = src->tdesc;
dest->filename = src->filename != NULL ? xstrdup (src->filename) : NULL;
*dest = *src;
}
/* See target-descriptions.h. */
@ -505,11 +505,7 @@ copy_inferior_target_desc_info (struct inferior *destinf, struct inferior *srcin
void
target_desc_info_free (struct target_desc_info *tdesc_info)
{
if (tdesc_info != NULL)
{
xfree (tdesc_info->filename);
delete tdesc_info;
}
delete tdesc_info;
}
/* The string manipulated by the "set tdesc filename ..." command. */
@ -539,8 +535,8 @@ target_find_description (void)
/* First try to fetch an XML description from the user-specified
file. */
tdesc_info->tdesc = nullptr;
if (tdesc_info->filename != nullptr && *tdesc_info->filename != '\0')
tdesc_info->tdesc = file_read_description_xml (tdesc_info->filename);
if (!tdesc_info->filename.empty ())
tdesc_info->tdesc = file_read_description_xml (tdesc_info->filename.data ());
/* Next try to read the description from the current target using
target objects. */
@ -1295,8 +1291,7 @@ set_tdesc_filename_cmd (const char *args, int from_tty,
{
target_desc_info *tdesc_info = get_tdesc_info (current_inferior ());
xfree (tdesc_info->filename);
tdesc_info->filename = xstrdup (tdesc_filename_cmd_string);
tdesc_info->filename = tdesc_filename_cmd_string;
target_clear_description ();
target_find_description ();
@ -1307,7 +1302,7 @@ show_tdesc_filename_cmd (struct ui_file *file, int from_tty,
struct cmd_list_element *c,
const char *value)
{
value = get_tdesc_info (current_inferior ())->filename;
value = get_tdesc_info (current_inferior ())->filename.data ();
if (value != NULL && *value != '\0')
printf_filtered (_("The target description will be read from \"%s\".\n"),
@ -1322,8 +1317,7 @@ unset_tdesc_filename_cmd (const char *args, int from_tty)
{
target_desc_info *tdesc_info = get_tdesc_info (current_inferior ());
xfree (tdesc_info->filename);
tdesc_info->filename = nullptr;
tdesc_info->filename.clear ();
target_clear_description ();
target_find_description ();
}
@ -1779,7 +1773,7 @@ maint_print_c_tdesc_cmd (const char *args, int from_tty)
initialization code will reject the new description. */
target_desc_info *tdesc_info = get_tdesc_info (current_inferior ());
tdesc = tdesc_info->tdesc;
filename = tdesc_info->filename;
filename = tdesc_info->filename.data ();
}
else
{