espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-24 20:28:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

make language_of_main static

Browse Source 
This makes the global language_of_main static.  Now it can be set only
via a new argument to set_main_name.

2014-01-15  Tom Tromey  <tromey@redhat.com>

	* dbxread.c (process_one_symbol): Update.
	* dwarf2read.c (read_partial_die): Update.
	* symfile.c (set_initial_language): Call main_language.
	* symtab.c (language_of_main): Now static.
	(set_main_name): Add 'lang' parameter.
	(find_main_name): Update.
	(main_language): New function.
	(symtab_observer_executable_changed): Update.
	* symtab.h (set_main_name): Update.
	(language_of_main): Remove.
	(main_language): Declare.
This commit is contained in:
Tom Tromey
2013-12-30 20:05:34 -07:00
parent 6ef55de768
commit 9e6c82ad4f
6 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gdb/symtab.c
View File

@ -4999,10 +4999,10 @@ skip_prologue_using_sal (struct gdbarch *gdbarch, CORE_ADDR func_addr)
/* Track MAIN */
static char *name_of_main;
enum language language_of_main = language_unknown;
static enum language language_of_main = language_unknown;
void
set_main_name (const char *name)
set_main_name (const char *name, enum language lang)
{
if (name_of_main != NULL)
{
@ -5013,7 +5013,7 @@ set_main_name (const char *name)
if (name != NULL)
{
name_of_main = xstrdup (name);
language_of_main = language_unknown;
language_of_main = lang;
}
}
@ -5044,27 +5044,27 @@ find_main_name (void)
new_main_name = ada_main_name ();
if (new_main_name != NULL)
{
set_main_name (new_main_name);
set_main_name (new_main_name, language_ada);
return;
}
new_main_name = go_main_name ();
if (new_main_name != NULL)
{
set_main_name (new_main_name);
set_main_name (new_main_name, language_go);
return;
}
new_main_name = pascal_main_name ();
if (new_main_name != NULL)
{
set_main_name (new_main_name);
set_main_name (new_main_name, language_pascal);
return;
}
/* The languages above didn't identify the name of the main procedure.
Fallback to "main". */
set_main_name ("main");
set_main_name ("main", language_unknown);
}
char *
@ -5076,13 +5076,22 @@ main_name (void)
return name_of_main;
}
/* Return the language of the main function. If it is not known,
return language_unknown. */
enum language
main_language (void)
{
return language_of_main;
}
/* Handle ``executable_changed'' events for the symtab module. */
static void
symtab_observer_executable_changed (void)
{
/* NAME_OF_MAIN may no longer be the same, so reset it for now. */
set_main_name (NULL);
set_main_name (NULL, language_unknown);
}
/* Return 1 if the supplied producer string matches the ARM RealView