From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>
Subject: [PATCH 1/3] make language_of_main static
Date: Mon, 06 Jan 2014 17:11:00 -0000 [thread overview]
Message-ID: <1389028297-16977-2-git-send-email-tromey@redhat.com> (raw)
In-Reply-To: <1389028297-16977-1-git-send-email-tromey@redhat.com>
This makes the global language_of_main static. Now it can be set only
via a new argument to set_main_name.
2014-01-06 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.
---
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/dbxread.c b/gdb/dbxread.c
index 1bab8b8..71eb5f8 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -3251,7 +3251,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 23bcfe0..0bd7100 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15313,13 +15313,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 4f0fea8..b4b4150 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1628,11 +1628,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 f215586..188bc8a 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5006,10 +5006,10 @@ skip_prologue_using_sal (struct gdbarch *gdbarch, CORE_ADDR func_addr)
\f
/* 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)
{
@@ -5020,7 +5020,7 @@ set_main_name (const char *name)
if (name != NULL)
{
name_of_main = xstrdup (name);
- language_of_main = language_unknown;
+ language_of_main = lang;
}
}
@@ -5051,27 +5051,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 *
@@ -5083,13 +5083,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 97e9ad7..4a93374 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 *,
--
1.8.1.4
next prev parent reply other threads:[~2014-01-06 17:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 17:11 [PATCH 0/3] main_name cleanups Tom Tromey
2014-01-06 17:11 ` Tom Tromey [this message]
2014-01-06 17:11 ` [PATCH 2/3] move main name into the progspace Tom Tromey
2014-01-06 17:11 ` [PATCH 3/3] move the "main" data into the per-BFD object Tom Tromey
2014-01-06 17:39 ` Doug Evans
2014-01-06 18:00 ` Tom Tromey
2014-01-06 18:23 ` Doug Evans
2014-01-06 21:11 ` Tom Tromey
2014-01-13 20:21 ` Tom Tromey
2014-01-06 19:02 ` [PATCH 0/3] main_name cleanups Pedro Alves
2014-01-13 20:31 ` Tom Tromey
2014-01-15 18:01 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389028297-16977-2-git-send-email-tromey@redhat.com \
--to=tromey@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).