From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>
Subject: [PATCH 3/3] move the "main" data into the per-BFD object
Date: Mon, 06 Jan 2014 17:11:00 -0000 [thread overview]
Message-ID: <1389028297-16977-4-git-send-email-tromey@redhat.com> (raw)
In-Reply-To: <1389028297-16977-1-git-send-email-tromey@redhat.com>
This adds the "main"-related data into the per-BFD. This is needed
because once symbol sharing across objfiles is complete, computing the
main name as a side effect of symbol reading will no longer work --
the symbols simply won't be re-read.
After this change, set_main_name is only used by the main_name
machinery itself, so this patch makes it static.
2014-01-06 Tom Tromey <tromey@redhat.com>
* dbxread.c (process_one_symbol): Use set_objfile_main_name.
* dwarf2read.c (read_partial_die): Use set_objfile_main_name.
* objfiles.c (get_objfile_bfd_data): Initialize language_of_main.
(set_objfile_main_name): New function.
* objfiles.h (struct objfile_per_bfd_storage) <name_of_main,
language_of_main>: New fields.
(set_objfile_main_name): Declare.
* symtab.c (find_main_name): Loop over objfiles to find the main
name and language.
(set_main_name): Now static.
* symtab.h (set_main_name): Don't declare.
---
gdb/ChangeLog | 14 ++++++++++++++
gdb/dbxread.c | 2 +-
gdb/dwarf2read.c | 2 +-
gdb/objfiles.c | 15 +++++++++++++++
gdb/objfiles.h | 12 ++++++++++++
gdb/symtab.c | 13 ++++++++++++-
gdb/symtab.h | 1 -
7 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 71eb5f8..6512735 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, language_unknown);
+ set_objfile_main_name (objfile, name, language_unknown);
break;
/* The following symbol types can be ignored. */
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 0bd7100..68de1df 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15313,7 +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, language_fortran);
+ set_objfile_main_name (objfile, part_die->name, language_fortran);
break;
case DW_AT_inline:
if (DW_UNSND (&attr) == DW_INL_inlined
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 73847bd..84b13d7 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -152,6 +152,7 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
obstack_init (&storage->storage_obstack);
storage->filename_cache = bcache_xmalloc (NULL, NULL);
storage->macro_cache = bcache_xmalloc (NULL, NULL);
+ storage->language_of_main = language_unknown;
}
return storage;
@@ -186,6 +187,20 @@ set_objfile_per_bfd (struct objfile *objfile)
objfile->per_bfd = get_objfile_bfd_data (objfile, objfile->obfd);
}
+/* Set the objfile's per-BFD notion of the "main" name and
+ language. */
+
+void
+set_objfile_main_name (struct objfile *objfile,
+ const char *name, enum language lang)
+{
+ if (objfile->per_bfd->name_of_main == NULL
+ || strcmp (objfile->per_bfd->name_of_main, name) != 0)
+ objfile->per_bfd->name_of_main
+ = obstack_copy0 (&objfile->per_bfd->storage_obstack, name, strlen (name));
+ objfile->per_bfd->language_of_main = lang;
+}
+
\f
/* Called via bfd_map_over_sections to build up the section table that
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index c2b6177..a7db251 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -192,6 +192,13 @@ struct objfile_per_bfd_storage
name, and the second is the demangled name or just a zero byte
if the name doesn't demangle. */
struct htab *demangled_names_hash;
+
+ /* The name and language of any "main" found in this objfile. The
+ name can be NULL, which means that the information was not
+ recorded. */
+
+ const char *name_of_main;
+ enum language language_of_main;
};
/* Master structure for keeping track of each file from which
@@ -685,4 +692,9 @@ void set_objfile_per_bfd (struct objfile *obj);
const char *objfile_name (const struct objfile *objfile);
+/* Set the objfile's notion of the "main" name and language. */
+
+extern void set_objfile_main_name (struct objfile *objfile,
+ const char *name, enum language lang);
+
#endif /* !defined (OBJFILES_H) */
diff --git a/gdb/symtab.c b/gdb/symtab.c
index d01a7d7..0c25609 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5057,7 +5057,7 @@ main_info_cleanup (struct program_space *pspace, void *data)
xfree (info);
}
-void
+static void
set_main_name (const char *name, enum language lang)
{
struct main_info *info = get_main_info ();
@@ -5082,6 +5082,17 @@ static void
find_main_name (void)
{
const char *new_main_name;
+ struct objfile *objfile;
+
+ ALL_OBJFILES (objfile)
+ {
+ if (objfile->per_bfd->name_of_main != NULL)
+ {
+ set_main_name (objfile->per_bfd->name_of_main,
+ objfile->per_bfd->language_of_main);
+ return;
+ }
+ }
/* Try to see if the main procedure is in Ada. */
/* FIXME: brobecker/2005-03-07: Another way of doing this would
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 4a93374..25ac028 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1324,7 +1324,6 @@ 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, enum language lang);
extern /*const */ char *main_name (void);
extern enum language main_language (void);
--
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 ` [PATCH 2/3] move main name into the progspace Tom Tromey
2014-01-06 17:11 ` Tom Tromey [this message]
2014-01-06 17:39 ` [PATCH 3/3] move the "main" data into the per-BFD object 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 17:11 ` [PATCH 1/3] make language_of_main static 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-4-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).