[RFA,14/15] Make psymtab_storage::free_psymtabs private
Commit Message
This adds a new psymtab allocation method to psymtab_storage and
changes the free_psymtabs member to be private. While not strictly
necessary, this seems like a decent cleanup, and also makes it simpler
to move psymtabs off of obstacks entirely, should that prove
desirable.
2018-05-10 Tom Tromey <tom@tromey.com>
* psymtab.h (psymtab_storage::allocate_psymtab): New method.
<free_psymtabs>: Now private.
* psymtab.c (psymtab_storage::allocate_psymtab): Implement.
(allocate_psymtab): Use new method.
---
gdb/ChangeLog | 7 +++++++
gdb/psymtab.c | 44 +++++++++++++++++++++++++-------------------
gdb/psymtab.h | 14 ++++++++++----
3 files changed, 42 insertions(+), 23 deletions(-)
Comments
On 2018-05-10 06:23 PM, Tom Tromey wrote:
> This adds a new psymtab allocation method to psymtab_storage and
> changes the free_psymtabs member to be private. While not strictly
> necessary, this seems like a decent cleanup, and also makes it simpler
> to move psymtabs off of obstacks entirely, should that prove
> desirable.
>
> 2018-05-10 Tom Tromey <tom@tromey.com>
>
> * psymtab.h (psymtab_storage::allocate_psymtab): New method.
> <free_psymtabs>: Now private.
> * psymtab.c (psymtab_storage::allocate_psymtab): Implement.
> (allocate_psymtab): Use new method.
> ---
> gdb/ChangeLog | 7 +++++++
> gdb/psymtab.c | 44 +++++++++++++++++++++++++-------------------
> gdb/psymtab.h | 14 ++++++++++----
> 3 files changed, 42 insertions(+), 23 deletions(-)
>
> diff --git a/gdb/psymtab.c b/gdb/psymtab.c
> index d121eace54..f109e9f1ee 100644
> --- a/gdb/psymtab.c
> +++ b/gdb/psymtab.c
> @@ -78,6 +78,29 @@ psymtab_storage::~psymtab_storage ()
> psymbol_bcache_free (psymbol_cache);
> }
>
> +/* See psymtab.h. */
> +
> +struct partial_symtab *
> +psymtab_storage::allocate_psymtab ()
> +{
> + struct partial_symtab *psymtab;
> +
> + if (free_psymtabs)
!= nullptr
Otherwise, LGTM.
Simon
>>>>> "Simon" == Simon Marchi <simon.marchi@ericsson.com> writes:
>> +struct partial_symtab *
>> +psymtab_storage::allocate_psymtab ()
>> +{
>> + struct partial_symtab *psymtab;
>> +
>> + if (free_psymtabs)
Simon> != nullptr
Simon> Otherwise, LGTM.
I made this change.
Tom
@@ -78,6 +78,29 @@ psymtab_storage::~psymtab_storage ()
psymbol_bcache_free (psymbol_cache);
}
+/* See psymtab.h. */
+
+struct partial_symtab *
+psymtab_storage::allocate_psymtab ()
+{
+ struct partial_symtab *psymtab;
+
+ if (free_psymtabs)
+ {
+ psymtab = free_psymtabs;
+ free_psymtabs = psymtab->next;
+ }
+ else
+ psymtab = XOBNEW (obstack (), struct partial_symtab);
+
+ memset (psymtab, 0, sizeof (struct partial_symtab));
+
+ psymtab->next = psymtabs;
+ psymtabs = psymtab;
+
+ return psymtab;
+}
+
/* Ensure that the partial symbols for OBJFILE have been loaded. This
@@ -1775,30 +1798,13 @@ init_psymbol_list (struct objfile *objfile, int total_symbols)
struct partial_symtab *
allocate_psymtab (const char *filename, struct objfile *objfile)
{
- struct partial_symtab *psymtab;
+ struct partial_symtab *psymtab
+ = objfile->partial_symtabs->allocate_psymtab ();
- if (objfile->partial_symtabs->free_psymtabs)
- {
- psymtab = objfile->partial_symtabs->free_psymtabs;
- objfile->partial_symtabs->free_psymtabs = psymtab->next;
- }
- else
- psymtab = (struct partial_symtab *)
- obstack_alloc (objfile->partial_symtabs->obstack (),
- sizeof (struct partial_symtab));
-
- memset (psymtab, 0, sizeof (struct partial_symtab));
psymtab->filename
= (const char *) bcache (filename, strlen (filename) + 1,
objfile->per_bfd->filename_cache);
- /* Prepend it to the psymtab list for the objfile it belongs to.
- Psymtabs are searched in most recent inserted -> least recent
- inserted order. */
-
- psymtab->next = objfile->partial_symtabs->psymtabs;
- objfile->partial_symtabs->psymtabs = psymtab;
-
if (symtab_create_debug)
{
/* Be a bit clever with debugging messages, and don't print objfile
@@ -66,6 +66,12 @@ public:
return OBSTACK_CALLOC (obstack (), number, struct partial_symtab *);
}
+ /* Allocate a new psymtab on the psymtab obstack. The new psymtab
+ will be linked in to the "psymtabs" list, but otherwise all other
+ fields will be zero. */
+
+ struct partial_symtab *allocate_psymtab ();
+
/* Each objfile points to a linked list of partial symtabs derived from
this file, one partial symtab structure for each compilation unit
@@ -80,10 +86,6 @@ public:
struct addrmap *psymtabs_addrmap = nullptr;
- /* List of freed partial symtabs, available for re-use. */
-
- struct partial_symtab *free_psymtabs = nullptr;
-
/* A byte cache where we can stash arbitrary "chunks" of bytes that
will not change. */
@@ -97,6 +99,10 @@ public:
private:
+ /* List of freed partial symtabs, available for re-use. */
+
+ struct partial_symtab *free_psymtabs = nullptr;
+
/* The obstack where allocations are made. */
struct obstack *m_obstack;