From patchwork Thu Aug 1 17:04:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33899 Received: (qmail 116887 invoked by alias); 1 Aug 2019 17:04:23 -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 116793 invoked by uid 89); 1 Aug 2019 17:04:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 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_PASS autolearn=ham version=3.3.1 spammy=pull, sk:_initia, sk:set_def X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 01 Aug 2019 17:04:20 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 147D356051; Thu, 1 Aug 2019 13:04:17 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id vr-M1em8dLvA; Thu, 1 Aug 2019 13:04:17 -0400 (EDT) Received: from murgatroyd.Home (97-122-178-82.hlrn.qwest.net [97.122.178.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id B37B756018; Thu, 1 Aug 2019 13:04:16 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 6/8] Make current_source_* per-program-space Date: Thu, 1 Aug 2019 11:04:10 -0600 Message-Id: <20190801170412.5553-7-tromey@adacore.com> In-Reply-To: <20190801170412.5553-1-tromey@adacore.com> References: <20190801170412.5553-1-tromey@adacore.com> MIME-Version: 1.0 This changes current_source_symtab and current_source_line to be per-program-space. This ensures that switching inferiors will preserve the current "list" location for that inferior, and also ensures that the default expression evaluation context always comes with the current inferior. No test case, because the latter problem crops up with an existing gdb.multi test case once this entire series has been applied. gdb/ChangeLog 2019-08-01 Tom Tromey * source.c (struct current_source_location): New. (current_source_key): New global. (current_source_symtab, current_source_line) (current_source_pspace): Remove. (get_source_location): New function. (get_current_source_symtab_and_line) (set_default_source_symtab_and_line) (set_current_source_symtab_and_line) (clear_current_source_symtab_and_line, select_source_symtab) (info_source_command, print_source_lines_base) (info_line_command, search_command_helper, _initialize_source): Update. --- gdb/ChangeLog | 15 ++++++ gdb/source.c | 128 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 93 insertions(+), 50 deletions(-) diff --git a/gdb/source.c b/gdb/source.c index 1aef019da44..d20cdc37c91 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -66,15 +66,20 @@ struct substitute_path_rule static struct substitute_path_rule *substitute_path_rules = NULL; -/* Symtab of default file for listing lines of. */ +/* An instance of this is attached to each program space. */ -static struct symtab *current_source_symtab; +struct current_source_location +{ + /* Symtab of default file for listing lines of. */ + + struct symtab *symtab = nullptr; -/* Default next line to list. */ + /* Default next line to list. */ -static int current_source_line; + int line = 0; +}; -static struct program_space *current_source_pspace; +static program_space_key current_source_key; /* Default number of lines to print with commands like "list". This is based on guessing how many long (i.e. more than chars_per_line @@ -162,6 +167,19 @@ get_lines_to_list (void) return lines_to_list; } +/* A helper to return the current source location object for PSPACE, + creating it if it does not exist. */ + +static current_source_location * +get_source_location (program_space *pspace) +{ + current_source_location *loc + = current_source_key.get (pspace); + if (loc == nullptr) + loc = current_source_key.emplace (pspace); + return loc; +} + /* Return the current source file for listing and next line to list. NOTE: The returned sal pc and end fields are not valid. */ @@ -169,10 +187,11 @@ struct symtab_and_line get_current_source_symtab_and_line (void) { symtab_and_line cursal; + current_source_location *loc = get_source_location (current_program_space); - cursal.pspace = current_source_pspace; - cursal.symtab = current_source_symtab; - cursal.line = current_source_line; + cursal.pspace = current_program_space; + cursal.symtab = loc->symtab; + cursal.line = loc->line; cursal.pc = 0; cursal.end = 0; @@ -194,7 +213,8 @@ set_default_source_symtab_and_line (void) error (_("No symbol table is loaded. Use the \"file\" command.")); /* Pull in a current source symtab if necessary. */ - if (current_source_symtab == 0) + current_source_location *loc = get_source_location (current_program_space); + if (loc->symtab == 0) select_source_symtab (0); } @@ -208,15 +228,16 @@ set_current_source_symtab_and_line (const symtab_and_line &sal) { symtab_and_line cursal; - cursal.pspace = current_source_pspace; - cursal.symtab = current_source_symtab; - cursal.line = current_source_line; + current_source_location *loc = get_source_location (sal.pspace); + + cursal.pspace = sal.pspace; + cursal.symtab = loc->symtab; + cursal.line = loc->line; cursal.pc = 0; cursal.end = 0; - current_source_pspace = sal.pspace; - current_source_symtab = sal.symtab; - current_source_line = sal.line; + loc->symtab = sal.symtab; + loc->line = sal.line; /* Force the next "list" to center around the current line. */ clear_lines_listed_range (); @@ -229,8 +250,9 @@ set_current_source_symtab_and_line (const symtab_and_line &sal) void clear_current_source_symtab_and_line (void) { - current_source_symtab = 0; - current_source_line = 0; + current_source_location *loc = get_source_location (current_program_space); + loc->symtab = 0; + loc->line = 0; } /* See source.h. */ @@ -240,13 +262,15 @@ select_source_symtab (struct symtab *s) { if (s) { - current_source_symtab = s; - current_source_line = 1; - current_source_pspace = SYMTAB_PSPACE (s); + current_source_location *loc + = get_source_location (SYMTAB_PSPACE (s)); + loc->symtab = s; + loc->line = 1; return; } - if (current_source_symtab) + current_source_location *loc = get_source_location (current_program_space); + if (loc->symtab) return; /* Make the default place to list be the function `main' @@ -255,16 +279,15 @@ select_source_symtab (struct symtab *s) if (bsym.symbol != nullptr && SYMBOL_CLASS (bsym.symbol) == LOC_BLOCK) { symtab_and_line sal = find_function_start_sal (bsym.symbol, true); - current_source_pspace = sal.pspace; - current_source_symtab = sal.symtab; - current_source_line = std::max (sal.line - (lines_to_list - 1), 1); + loc->symtab = sal.symtab; + loc->line = std::max (sal.line - (lines_to_list - 1), 1); return; } /* Alright; find the last file in the symtab list (ignoring .h's and namespace symtabs). */ - current_source_line = 1; + loc->line = 1; for (objfile *ofp : current_program_space->objfiles ()) { @@ -277,15 +300,12 @@ select_source_symtab (struct symtab *s) if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0 || strcmp (name, "<>") == 0))) - { - current_source_pspace = current_program_space; - current_source_symtab = symtab; - } + loc->symtab = symtab; } } } - if (current_source_symtab) + if (loc->symtab) return; for (objfile *objfile : current_program_space->objfiles ()) @@ -293,9 +313,9 @@ select_source_symtab (struct symtab *s) if (objfile->sf) s = objfile->sf->qf->find_last_source_symtab (objfile); if (s) - current_source_symtab = s; + loc->symtab = s; } - if (current_source_symtab) + if (loc->symtab) return; error (_("Can't find a default source file")); @@ -624,7 +644,9 @@ add_path (const char *dirname, char **which_path, int parse_separators) static void info_source_command (const char *ignore, int from_tty) { - struct symtab *s = current_source_symtab; + current_source_location *loc + = get_source_location (current_program_space); + struct symtab *s = loc->symtab; struct compunit_symtab *cust; if (!s) @@ -1222,8 +1244,11 @@ print_source_lines_base (struct symtab *s, int line, int stopline, struct ui_out *uiout = current_uiout; /* Regardless of whether we can open the file, set current_source_symtab. */ - current_source_symtab = s; - current_source_line = line; + current_source_location *loc + = get_source_location (current_program_space); + + loc->symtab = s; + loc->line = line; first_line_listed = line; /* If printing of source lines is disabled, just print file and line @@ -1313,13 +1338,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline, { char buf[20]; - last_line_listed = current_source_line; + last_line_listed = loc->line; if (flags & PRINT_SOURCE_LINES_FILENAME) { uiout->text (symtab_to_filename_for_display (s)); uiout->text (":"); } - xsnprintf (buf, sizeof (buf), "%d\t", current_source_line++); + xsnprintf (buf, sizeof (buf), "%d\t", loc->line++); uiout->text (buf); while (*iter != '\0') @@ -1411,12 +1436,14 @@ info_line_command (const char *arg, int from_tty) if (arg == 0) { - curr_sal.symtab = current_source_symtab; + current_source_location *loc + = get_source_location (current_program_space); + curr_sal.symtab = loc->symtab; curr_sal.pspace = current_program_space; if (last_line_listed != 0) curr_sal.line = last_line_listed; else - curr_sal.line = current_source_line; + curr_sal.line = loc->line; sals = curr_sal; } @@ -1518,23 +1545,25 @@ search_command_helper (const char *regex, int from_tty, bool forward) if (msg) error (("%s"), msg); - if (current_source_symtab == 0) + current_source_location *loc + = get_source_location (current_program_space); + if (loc->symtab == 0) select_source_symtab (0); - scoped_fd desc (open_source_file_with_line_charpos (current_source_symtab)); + scoped_fd desc (open_source_file_with_line_charpos (loc->symtab)); if (desc.get () < 0) - perror_with_name (symtab_to_filename_for_display (current_source_symtab)); + perror_with_name (symtab_to_filename_for_display (loc->symtab)); int line = (forward ? last_line_listed + 1 : last_line_listed - 1); - if (line < 1 || line > current_source_symtab->nlines) + if (line < 1 || line > loc->symtab->nlines) error (_("Expression not found")); - if (lseek (desc.get (), current_source_symtab->line_charpos[line - 1], 0) + if (lseek (desc.get (), loc->symtab->line_charpos[line - 1], 0) < 0) - perror_with_name (symtab_to_filename_for_display (current_source_symtab)); + perror_with_name (symtab_to_filename_for_display (loc->symtab)); gdb_file_up stream = desc.to_file (FDOPEN_MODE); clearerr (stream.get ()); @@ -1569,9 +1598,9 @@ search_command_helper (const char *regex, int from_tty, bool forward) if (re_exec (buf.data ()) > 0) { /* Match! */ - print_source_lines (current_source_symtab, line, line + 1, 0); + print_source_lines (loc->symtab, line, line + 1, 0); set_internalvar_integer (lookup_internalvar ("_"), line); - current_source_line = std::max (line - lines_to_list / 2, 1); + loc->line = std::max (line - lines_to_list / 2, 1); return; } @@ -1583,10 +1612,10 @@ search_command_helper (const char *regex, int from_tty, bool forward) if (line < 1) break; if (fseek (stream.get (), - current_source_symtab->line_charpos[line - 1], 0) < 0) + loc->symtab->line_charpos[line - 1], 0) < 0) { const char *filename - = symtab_to_filename_for_display (current_source_symtab); + = symtab_to_filename_for_display (loc->symtab); perror_with_name (filename); } } @@ -1850,7 +1879,6 @@ _initialize_source (void) { struct cmd_list_element *c; - current_source_symtab = 0; init_source_path (); /* The intention is to use POSIX Basic Regular Expressions.