From c701c14c41914d9a32bde5159fbc3d6270f1fff3 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Mon, 31 May 1993 00:21:41 +0000 Subject: [PATCH] * {dbxread.c, dwarfread.c} (read_ofile_symtab): Rewrite to take single parameter, the pointer to the partial symtab, rather than a bunch of args that are derived from the partial symtab. Change prototypes and callers to match. --- gdb/ChangeLog | 5 +++++ gdb/dwarfread.c | 17 ++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8fa2a3f4d2..7a5b6cf220 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ Sun May 30 15:35:21 1993 Fred Fish (fnf@cygnus.com) + * {dbxread.c, dwarfread.c} (read_ofile_symtab): Rewrite to take + single parameter, the pointer to the partial symtab, rather than + a bunch of args that are derived from the partial symtab. Change + prototypes and callers to match. + * dbxread.c (read_ofile_symtab): Remove "#if 1" around code to set demangling style automatically. * defs.h (CPLUS_MARKER): Clarify comment that this is only for diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c index 5dc0c30717..b9872229e1 100644 --- a/gdb/dwarfread.c +++ b/gdb/dwarfread.c @@ -495,7 +495,7 @@ dwarf_psymtab_to_symtab PARAMS ((struct partial_symtab *)); static void psymtab_to_symtab_1 PARAMS ((struct partial_symtab *)); -static struct symtab * +static void read_ofile_symtab PARAMS ((struct partial_symtab *)); static void @@ -2300,19 +2300,18 @@ LOCAL FUNCTION SYNOPSIS - static struct symtab *read_ofile_symtab (struct partial_symtab *pst) + static void read_ofile_symtab (struct partial_symtab *pst) DESCRIPTION When expanding a partial symbol table entry to a full symbol table entry, this is the function that gets called to read in the symbols - for the compilation unit. - - Returns a pointer to the newly constructed symtab (which is now - the new first one on the objfile's symtab list). + for the compilation unit. A pointer to the newly constructed symtab, + which is now the new first one on the objfile's symtab list, is + stashed in the partial symbol table entry. */ -static struct symtab * +static void read_ofile_symtab (pst) struct partial_symtab *pst; { @@ -2372,7 +2371,7 @@ read_ofile_symtab (pst) process_dies (dbbase, dbbase + dbsize, pst -> objfile); do_cleanups (back_to); current_objfile = NULL; - return (pst -> objfile -> symtabs); + pst -> symtab = pst -> objfile -> symtabs; } /* @@ -2432,7 +2431,7 @@ psymtab_to_symtab_1 (pst) { buildsym_init (); old_chain = make_cleanup (really_free_pendings, 0); - pst -> symtab = read_ofile_symtab (pst); + read_ofile_symtab (pst); if (info_verbose) { printf_filtered ("%d DIE's, sorting...", diecount); -- 2.34.1