OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert auto-load.c to type-safe registry API 

This changes auto-load.c to use the type-safe registry API.  It also
changes a couple of types to "bool", removing uses of "FALSE".

gdb/ChangeLog
2019-05-08  Tom Tromey  <tom@tromey.com>

	* auto-load.c (struct auto_load_pspace_info): Add destructor and
	initializers.
	<unsupported_script_warning_printed,
	script_not_found_warning_printed>: Now bool.
	(auto_load_pspace_data): Change type.
	(~auto_load_pspace_info): Rename from
	auto_load_pspace_data_cleanup.
	(get_auto_load_pspace_data, init_loaded_scripts_info)
	(clear_section_scripts, maybe_print_unsupported_script_warning)
	(maybe_print_script_not_found_warning, _initialize_auto_load):
	Update.
This commit is contained in:
Tom Tromey 2019-04-21 09:34:16 -06:00
parent f6aa743620
commit e85e19b4d7
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/ChangeLog
View File

@ -1,3 +1,17 @@
2019-05-08 Tom Tromey <tom@tromey.com>
* auto-load.c (struct auto_load_pspace_info): Add destructor and
initializers.
<unsupported_script_warning_printed,
script_not_found_warning_printed>: Now bool.
(auto_load_pspace_data): Change type.
(~auto_load_pspace_info): Rename from
auto_load_pspace_data_cleanup.
(get_auto_load_pspace_data, init_loaded_scripts_info)
(clear_section_scripts, maybe_print_unsupported_script_warning)
(maybe_print_script_not_found_warning, _initialize_auto_load):
Update.
2019-05-08 Tom Tromey <tom@tromey.com>
* objfiles.c (objfile_pspace_info): Add destructor and

60
gdb/auto-load.c
View File

@ -527,18 +527,21 @@ For more information about this security protection see the\n\
struct auto_load_pspace_info
{
auto_load_pspace_info () = default;
~auto_load_pspace_info ();
/* For each program space we keep track of loaded scripts, both when
specified as file names and as scripts to be executed directly. */
struct htab *loaded_script_files;
struct htab *loaded_script_texts;
struct htab *loaded_script_files = nullptr;
struct htab *loaded_script_texts = nullptr;
/* Non-zero if we've issued the warning about an auto-load script not being
supported. We only want to issue this warning once. */
int unsupported_script_warning_printed;
bool unsupported_script_warning_printed = false;
/* Non-zero if we've issued the warning about an auto-load script not being
found. We only want to issue this warning once. */
int script_not_found_warning_printed;
bool script_not_found_warning_printed = false;
};
/* Objects of this type are stored in the loaded_script hash table. */
@ -559,18 +562,15 @@ struct loaded_script
};
/* Per-program-space data key. */
static const struct program_space_data *auto_load_pspace_data;
static const struct program_space_key<struct auto_load_pspace_info>
auto_load_pspace_data;
static void
auto_load_pspace_data_cleanup (struct program_space *pspace, void *arg)
auto_load_pspace_info::~auto_load_pspace_info ()
{
struct auto_load_pspace_info *info = (struct auto_load_pspace_info *) arg;
if (info->loaded_script_files)
htab_delete (info->loaded_script_files);
if (info->loaded_script_texts)
htab_delete (info->loaded_script_texts);
xfree (info);
if (loaded_script_files)
htab_delete (loaded_script_files);
if (loaded_script_texts)
htab_delete (loaded_script_texts);
}
/* Get the current autoload data. If none is found yet, add it now. This
@ -581,13 +581,9 @@ get_auto_load_pspace_data (struct program_space *pspace)
{
struct auto_load_pspace_info *info;
info = ((struct auto_load_pspace_info *)
program_space_data (pspace, auto_load_pspace_data));
info = auto_load_pspace_data.get (pspace);
if (info == NULL)
{
info = XCNEW (struct auto_load_pspace_info);
set_program_space_data (pspace, auto_load_pspace_data, info);
}
info = auto_load_pspace_data.emplace (pspace);
return info;
}
@ -632,8 +628,8 @@ init_loaded_scripts_info (struct auto_load_pspace_info *pspace_info)
eq_loaded_script_entry,
xfree);
pspace_info->unsupported_script_warning_printed = FALSE;
pspace_info->script_not_found_warning_printed = FALSE;
pspace_info->unsupported_script_warning_printed = false;
pspace_info->script_not_found_warning_printed = false;
}
/* Wrapper on get_auto_load_pspace_data to also allocate the hash table
@ -747,17 +743,9 @@ clear_section_scripts (void)
struct program_space *pspace = current_program_space;
struct auto_load_pspace_info *info;
info = ((struct auto_load_pspace_info *)
program_space_data (pspace, auto_load_pspace_data));
info = auto_load_pspace_data.get (pspace);
if (info != NULL && info->loaded_script_files != NULL)
{
htab_delete (info->loaded_script_files);
htab_delete (info->loaded_script_texts);
info->loaded_script_files = NULL;
info->loaded_script_texts = NULL;
info->unsupported_script_warning_printed = FALSE;
info->script_not_found_warning_printed = FALSE;
}
auto_load_pspace_data.clear (pspace);
}
/* Look for the auto-load script in LANGUAGE associated with OBJFILE where
@ -1386,7 +1374,7 @@ of file %s.\n\
Use `info auto-load %s-scripts [REGEXP]' to list them."),
offset, section_name, objfile_name (objfile),
ext_lang_name (language));
pspace_info->unsupported_script_warning_printed = 1;
pspace_info->unsupported_script_warning_printed = true;
}
}
@ -1408,7 +1396,7 @@ of file %s.\n\
Use `info auto-load %s-scripts [REGEXP]' to list them."),
offset, section_name, objfile_name (objfile),
ext_lang_name (language));
pspace_info->script_not_found_warning_printed = 1;
pspace_info->script_not_found_warning_printed = true;
}
}
@ -1538,10 +1526,6 @@ _initialize_auto_load (void)
char *guile_name_help;
const char *suffix;
auto_load_pspace_data
= register_program_space_data_with_cleanup (NULL,
auto_load_pspace_data_cleanup);
gdb::observers::new_objfile.attach (auto_load_new_objfile);
add_setshow_boolean_cmd ("gdb-scripts", class_support,