From patchwork Wed May 23 04:58:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27437 Received: (qmail 114720 invoked by alias); 23 May 2018 04:59:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 113879 invoked by uid 89); 23 May 2018 04:59:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, T_FILL_THIS_FORM_SHORT autolearn=ham version=3.3.2 spammy= X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.110) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 May 2018 04:59:07 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway24.websitewelcome.com (Postfix) with ESMTP id E560F4E2B for ; Tue, 22 May 2018 23:59:05 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id LLrdfrojUPvAdLLrdf7FHG; Tue, 22 May 2018 23:59:05 -0500 X-Authority-Reason: nr=8 Received: from 174-29-44-154.hlrn.qwest.net ([174.29.44.154]:56108 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fLLrd-003S5D-Kk; Tue, 22 May 2018 23:59:05 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 22/42] Move current_subfile to buildsym_compunit Date: Tue, 22 May 2018 22:58:31 -0600 Message-Id: <20180523045851.11660-23-tom@tromey.com> In-Reply-To: <20180523045851.11660-1-tom@tromey.com> References: <20180523045851.11660-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fLLrd-003S5D-Kk X-Source-Sender: 174-29-44-154.hlrn.qwest.net (bapiya.Home) [174.29.44.154]:56108 X-Source-Auth: tom+tromey.com X-Email-Count: 23 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This moves the global current_subfile into buildsym_compunit. gdb/ChangeLog 2018-05-22 Tom Tromey * xcoffread.c (process_linenos): Update. * stabsread.c (define_symbol, read_type, read_enum_type): Update. * mdebugread.c (psymtab_to_symtab_1): Update. * dwarf2read.c (setup_type_unit_groups) (lnp_state_machine::handle_set_file, dwarf_record_line_p) (lnp_state_machine::record_line, dwarf_decode_lines): Update. * dbxread.c (process_one_symbol): Update. * coffread.c (coff_symtab_read, enter_linenos) (process_coff_symbol): Update. * buildsym.h (current_subfile): Don't declare. (get_current_subfile): Declare. * buildsym.c (struct buildsym_compunit) : New member. (start_subfile, free_buildsym_compunit, push_subfile) (prepare_for_building, start_symtab): Update. (get_current_subfile): New function. --- gdb/ChangeLog | 19 +++++++++++++++++++ gdb/buildsym.c | 25 ++++++++++++++++++------- gdb/buildsym.h | 6 ++++-- gdb/coffread.c | 8 ++++---- gdb/dbxread.c | 8 ++++---- gdb/dwarf2read.c | 26 +++++++++++++------------- gdb/mdebugread.c | 2 +- gdb/stabsread.c | 8 ++++---- gdb/xcoffread.c | 4 +++- 9 files changed, 70 insertions(+), 36 deletions(-) diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 54592b7795..4f820f5dc5 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -216,6 +216,8 @@ struct buildsym_compunit std::vector m_context_stack; struct context_stack m_popped_context {}; + + struct subfile *m_current_subfile = nullptr; }; /* The work-in-progress of the compunit we are building. @@ -767,7 +769,7 @@ start_subfile (const char *name) if (FILENAME_CMP (subfile_name, name) == 0) { - current_subfile = subfile; + buildsym_compunit->m_current_subfile = subfile; if (subfile_name != subfile->name) xfree (subfile_name); return; @@ -785,7 +787,7 @@ start_subfile (const char *name) subfile->next = buildsym_compunit->subfiles; buildsym_compunit->subfiles = subfile; - current_subfile = subfile; + buildsym_compunit->m_current_subfile = subfile; subfile->name = xstrdup (name); @@ -845,7 +847,6 @@ free_buildsym_compunit (void) return; delete buildsym_compunit; buildsym_compunit = NULL; - current_subfile = NULL; } /* For stabs readers, the first N_SO symbol is assumed to be the @@ -901,8 +902,10 @@ void push_subfile () { gdb_assert (buildsym_compunit != nullptr); - gdb_assert (! (current_subfile == NULL || current_subfile->name == NULL)); - buildsym_compunit->m_subfile_stack.push_back (current_subfile->name); + gdb_assert (! (buildsym_compunit->m_current_subfile == NULL + || buildsym_compunit->m_current_subfile->name == NULL)); + buildsym_compunit->m_subfile_stack.push_back + (buildsym_compunit->m_current_subfile->name); } const char * @@ -1035,7 +1038,6 @@ prepare_for_building () gdb_assert (file_symbols == NULL); gdb_assert (global_symbols == NULL); gdb_assert (pending_addrmap == NULL); - gdb_assert (current_subfile == NULL); gdb_assert (buildsym_compunit == nullptr); } @@ -1074,7 +1076,7 @@ start_symtab (struct objfile *objfile, const char *name, const char *comp_dir, start_subfile (name); /* Save this so that we don't have to go looking for it at the end of the subfiles list. */ - buildsym_compunit->main_subfile = current_subfile; + buildsym_compunit->main_subfile = buildsym_compunit->m_current_subfile; return buildsym_compunit->compunit_symtab; } @@ -1765,6 +1767,15 @@ get_context_stack_depth () return buildsym_compunit->m_context_stack.size (); } +/* See buildsym.h. */ + +struct subfile * +get_current_subfile () +{ + gdb_assert (buildsym_compunit != nullptr); + return buildsym_compunit->m_current_subfile; +} + /* Initialize anything that needs initializing when starting to read a diff --git a/gdb/buildsym.h b/gdb/buildsym.h index fe158d183c..ad56ac597f 100644 --- a/gdb/buildsym.h +++ b/gdb/buildsym.h @@ -64,8 +64,6 @@ struct subfile struct symtab *symtab; }; -EXTERN struct subfile *current_subfile; - /* Record the symbols defined for each context in a list. We don't create a struct block for the context until we know how long to make it. */ @@ -274,6 +272,10 @@ extern struct context_stack *get_current_context_stack (); extern int get_context_stack_depth (); +/* Return the current subfile. */ + +extern struct subfile *get_current_subfile (); + #undef EXTERN #endif /* defined (BUILDSYM_H) */ diff --git a/gdb/coffread.c b/gdb/coffread.c index 85718b252a..a8e3f59a65 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -857,7 +857,7 @@ coff_symtab_read (minimal_symbol_reader &reader, language_unknown, since such a ``file name'' is not recognized. Override that with the minimal language to allow printing values in this symtab. */ - current_subfile->language = language_minimal; + get_current_subfile ()->language = language_minimal; complete_symtab ("_globals_", 0, 0); /* Done with all files, everything from here on out is globals. */ @@ -1132,7 +1132,7 @@ coff_symtab_read (minimal_symbol_reader &reader, of the closing '}', and for which we do not have any other statement-line-number. */ if (fcn_last_line == 1) - record_line (current_subfile, fcn_first_line, + record_line (get_current_subfile (), fcn_first_line, gdbarch_addr_bits_remove (gdbarch, fcn_first_line_addr)); else @@ -1511,7 +1511,7 @@ enter_linenos (long file_offset, int first_line, CORE_ADDR addr = lptr.l_addr.l_paddr; addr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); - record_line (current_subfile, + record_line (get_current_subfile (), first_line + L_LNNO32 (&lptr), gdbarch_addr_bits_remove (gdbarch, addr)); } @@ -1634,7 +1634,7 @@ process_coff_symbol (struct coff_symbol *cs, name = cs->c_name; name = EXTERNAL_NAME (name, objfile->obfd); - SYMBOL_SET_LANGUAGE (sym, current_subfile->language, + SYMBOL_SET_LANGUAGE (sym, get_current_subfile ()->language, &objfile->objfile_obstack); SYMBOL_SET_NAMES (sym, name, strlen (name), 1, objfile); diff --git a/gdb/dbxread.c b/gdb/dbxread.c index fe7f4a2815..713178809b 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -2571,7 +2571,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, { CORE_ADDR addr = last_function_start + valu; - record_line (current_subfile, 0, + record_line (get_current_subfile (), 0, gdbarch_addr_bits_remove (gdbarch, addr)); } @@ -2707,7 +2707,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, name. Patch things up. */ if (previous_stab_code == (unsigned char) N_SO) { - patch_subfile_names (current_subfile, name); + patch_subfile_names (get_current_subfile (), name); break; /* Ignore repeated SOs. */ } end_symtab (valu, SECT_OFF_TEXT (objfile)); @@ -2777,12 +2777,12 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, CORE_ADDR addr = processing_gcc_compilation == 2 ? last_function_start : valu; - record_line (current_subfile, desc, + record_line (get_current_subfile (), desc, gdbarch_addr_bits_remove (gdbarch, addr)); sline_found_in_function = 1; } else - record_line (current_subfile, desc, + record_line (get_current_subfile (), desc, gdbarch_addr_bits_remove (gdbarch, valu)); break; diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 354ff920e5..131dcfbb55 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -11614,18 +11614,18 @@ setup_type_unit_groups (struct die_info *die, struct dwarf2_cu *cu) dwarf2_start_subfile (fe.name, fe.include_dir (cu->line_header)); - if (current_subfile->symtab == NULL) + if (get_current_subfile ()->symtab == NULL) { /* NOTE: start_subfile will recognize when it's been passed a file it has already seen. So we can't assume there's a simple mapping from cu->line_header->file_names to subfiles, plus cu->line_header->file_names may contain dups. */ - current_subfile->symtab - = allocate_symtab (cust, current_subfile->name); + get_current_subfile ()->symtab + = allocate_symtab (cust, get_current_subfile ()->name); } - fe.symtab = current_subfile->symtab; + fe.symtab = get_current_subfile ()->symtab; tu_group->symtabs[i] = fe.symtab; } } @@ -20577,7 +20577,7 @@ lnp_state_machine::handle_set_file (file_name_index file) { const char *dir = fe->include_dir (m_line_header); - m_last_subfile = current_subfile; + m_last_subfile = get_current_subfile (); m_line_has_non_zero_discriminator = m_discriminator != 0; dwarf2_start_subfile (fe->name, dir); } @@ -20642,7 +20642,7 @@ dwarf_record_line_p (unsigned int line, unsigned int last_line, int line_has_non_zero_discriminator, struct subfile *last_subfile) { - if (current_subfile != last_subfile) + if (get_current_subfile () != last_subfile) return 1; if (line != last_line) return 1; @@ -20723,7 +20723,7 @@ lnp_state_machine::record_line (bool end_sequence) fe->included_p = 1; if (m_record_lines_p && m_is_stmt) { - if (m_last_subfile != current_subfile || end_sequence) + if (m_last_subfile != get_current_subfile () || end_sequence) { dwarf_finish_line (m_gdbarch, m_last_subfile, m_address, m_record_line_callback); @@ -20735,11 +20735,11 @@ lnp_state_machine::record_line (bool end_sequence) m_line_has_non_zero_discriminator, m_last_subfile)) { - dwarf_record_line_1 (m_gdbarch, current_subfile, + dwarf_record_line_1 (m_gdbarch, get_current_subfile (), m_line, m_address, m_record_line_callback); } - m_last_subfile = current_subfile; + m_last_subfile = get_current_subfile (); m_last_line = m_line; } } @@ -21073,12 +21073,12 @@ dwarf_decode_lines (struct line_header *lh, const char *comp_dir, dwarf2_start_subfile (fe.name, fe.include_dir (lh)); - if (current_subfile->symtab == NULL) + if (get_current_subfile ()->symtab == NULL) { - current_subfile->symtab - = allocate_symtab (cust, current_subfile->name); + get_current_subfile ()->symtab + = allocate_symtab (cust, get_current_subfile ()->name); } - fe.symtab = current_subfile->symtab; + fe.symtab = get_current_subfile ()->symtab; } } } diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index e56e009589..704c064fd8 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -4075,7 +4075,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, /* Handle encoded stab line number. */ valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); - record_line (current_subfile, sh.index, + record_line (get_current_subfile (), sh.index, gdbarch_addr_bits_remove (gdbarch, valu)); } } diff --git a/gdb/stabsread.c b/gdb/stabsread.c index bb50a16829..8c90241165 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -697,7 +697,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_LINE (sym) = 0; /* unknown */ } - SYMBOL_SET_LANGUAGE (sym, current_subfile->language, + SYMBOL_SET_LANGUAGE (sym, get_current_subfile ()->language, &objfile->objfile_obstack); if (is_cplus_marker (string[0])) @@ -1298,7 +1298,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, */ /* Pascal accepts names for pointer types. */ - if (current_subfile->language == language_pascal) + if (get_current_subfile ()->language == language_pascal) { TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_LINKAGE_NAME (sym); } @@ -1642,7 +1642,7 @@ again: return error_type (pp, objfile); } type_name = NULL; - if (current_subfile->language == language_cplus) + if (get_current_subfile ()->language == language_cplus) { char *name = (char *) alloca (p - *pp + 1); @@ -3699,7 +3699,7 @@ read_enum_type (const char **pp, struct type *type, sym = allocate_symbol (objfile); SYMBOL_SET_LINKAGE_NAME (sym, name); - SYMBOL_SET_LANGUAGE (sym, current_subfile->language, + SYMBOL_SET_LANGUAGE (sym, get_current_subfile ()->language, &objfile->objfile_obstack); SYMBOL_ACLASS_INDEX (sym) = LOC_CONST; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 89896baded..af03c11e8b 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -716,6 +716,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) /* Line numbers are not necessarily ordered. xlc compilation will put static function to the end. */ + struct subfile *current_subfile = get_current_subfile (); lineTb = arrange_linetable (lv); if (lv == lineTb) { @@ -778,8 +779,9 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) if (fakename == NULL) fakename = " ?"; start_subfile (fakename); - xfree (current_subfile->name); + xfree (get_current_subfile ()->name); } + struct subfile *current_subfile = get_current_subfile (); current_subfile->name = xstrdup (inclTable[ii].name); #endif