From 9e6c82ad4f55d0ff125721b94fa2191f1cc1000a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 30 Dec 2013 20:05:34 -0700 Subject: [PATCH] make language_of_main static 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 * 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. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/dbxread.c | 2 +- gdb/dwarf2read.c | 8 +------- gdb/symfile.c | 6 ++---- gdb/symtab.c | 25 +++++++++++++++++-------- gdb/symtab.h | 4 ++-- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0e28f6544c..ae6d843aca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2014-01-15 Tom Tromey + + * 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. + 2014-01-15 Tom Tromey * symfile.c (init_entry_point_info): Use new "initialized" field. diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 9a10a1f101..eab5113386 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -3250,7 +3250,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, N_MAIN within a given objfile, complain() and choose arbitrarily. (kingdon) */ if (name != NULL) - set_main_name (name); + set_main_name (name, language_unknown); break; /* The following symbol types can be ignored. */ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 609698b2e3..0c3d16cd12 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -15322,13 +15322,7 @@ read_partial_die (const struct die_reader_specs *reader, practice. */ if (DW_UNSND (&attr) == DW_CC_program && cu->language == language_fortran) - { - set_main_name (part_die->name); - - /* As this DIE has a static linkage the name would be difficult - to look up later. */ - language_of_main = language_fortran; - } + set_main_name (part_die->name, language_fortran); break; case DW_AT_inline: if (DW_UNSND (&attr) == DW_INL_inlined diff --git a/gdb/symfile.c b/gdb/symfile.c index a567f6ddd2..06d2119072 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1654,11 +1654,9 @@ symbol_file_command (char *args, int from_tty) void set_initial_language (void) { - enum language lang = language_unknown; + enum language lang = main_language (); - if (language_of_main != language_unknown) - lang = language_of_main; - else + if (lang == language_unknown) { char *name = main_name (); struct symbol *sym = lookup_symbol (name, NULL, VAR_DOMAIN, NULL); diff --git a/gdb/symtab.c b/gdb/symtab.c index 5e988c88ef..a8073b8ef7 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -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 diff --git a/gdb/symtab.h b/gdb/symtab.h index 97e9ad7b76..4a933747ed 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1324,9 +1324,9 @@ extern struct cleanup *make_cleanup_free_search_symbols (struct symbol_search FIXME: cagney/2001-03-20: Can't make main_name() const since some of the calling code currently assumes that the string isn't const. */ -extern void set_main_name (const char *name); +extern void set_main_name (const char *name, enum language lang); extern /*const */ char *main_name (void); -extern enum language language_of_main; +extern enum language main_language (void); /* Check global symbols in objfile. */ struct symbol *lookup_global_symbol_from_objfile (const struct objfile *, -- 2.34.1