From: Matti Puputti <matti.puputti@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 1/1] gdb, infcmd: Support jump command with same line in multiple object files.
Date: Wed, 8 Mar 2023 14:26:07 +0100 [thread overview]
Message-ID: <20230308132607.1674441-2-matti.puputti@intel.com> (raw)
In-Reply-To: <20230308132607.1674441-1-matti.puputti@intel.com>
If the jump target is found in multiple object files, select the one in
the current object file.
---
gdb/infcmd.c | 14 ++++++-
gdb/testsuite/gdb.base/jump2.c | 29 +++++++++++++++
gdb/testsuite/gdb.base/jump2.exp | 59 ++++++++++++++++++++++++++++++
gdb/testsuite/gdb.base/jump2.h | 30 +++++++++++++++
gdb/testsuite/gdb.base/jump2_foo.c | 24 ++++++++++++
5 files changed, 155 insertions(+), 1 deletion(-)
create mode 100755 gdb/testsuite/gdb.base/jump2.c
create mode 100755 gdb/testsuite/gdb.base/jump2.exp
create mode 100755 gdb/testsuite/gdb.base/jump2.h
create mode 100755 gdb/testsuite/gdb.base/jump2_foo.c
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index c369b795757..1b91562f137 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1080,7 +1080,19 @@ jump_command (const char *arg, int from_tty)
std::vector<symtab_and_line> sals
= decode_line_with_last_displayed (arg, DECODE_LINE_FUNFIRSTLINE);
if (sals.size () != 1)
- error (_("Unreasonable jump request"));
+ {
+ /* If multiple sal-objects were found, try dropping those that aren't
+ from the current objectfile. */
+ sals.erase (std::remove_if (sals.begin (), sals.end (),
+ [] (symtab_and_line &sal)
+ {
+ struct symtab_and_line cursal
+ = get_current_source_symtab_and_line ();
+ return sal.symtab != cursal.symtab;
+ }), sals.end ());
+ if (sals.size () != 1)
+ error (_("Unreasonable jump request"));
+ }
symtab_and_line &sal = sals[0];
diff --git a/gdb/testsuite/gdb.base/jump2.c b/gdb/testsuite/gdb.base/jump2.c
new file mode 100755
index 00000000000..468838a9d1a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jump2.c
@@ -0,0 +1,29 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2021-2023 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "jump2.h"
+
+extern int foo (int n);
+
+
+int main ()
+{
+ int n = foo (1);
+ bar (n);
+
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.base/jump2.exp b/gdb/testsuite/gdb.base/jump2.exp
new file mode 100755
index 00000000000..f6bc29dfe1c
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jump2.exp
@@ -0,0 +1,59 @@
+# Copyright 2021-2023 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#
+# Tests GDBs support for jump, when the source line is in multiple
+# object files.
+
+
+standard_testfile .c
+set srcfile2 jump2_foo.c
+set srcfile3 jump2.h
+
+
+if { [prepare_for_testing "failed to prepare" $testfile \
+ [list ${srcfile} ${srcfile2}]] } {
+ return -1
+}
+
+if { ![runto_main] } {
+ perror "couldn't run to breakpoint"
+ return -1
+}
+
+
+set bar_first_line [gdb_get_line_number "bar-first-line" ${srcfile3}]
+set bar_middle_line [gdb_get_line_number "bar-middle-line" ${srcfile3}]
+set bar_last_line [gdb_get_line_number "bar-last-line" ${srcfile3}]
+
+
+# Set breakpoints in the function bar. Executable has two object files,
+# and both have a copy of the same source lines. Therefore breakpoints
+# will have two locations.
+gdb_test "break ${srcfile3}:${bar_first_line}" \
+ "Breakpoint.* at .*${srcfile3}:${bar_first_line}\\\. \\\(2 locations\\\)"
+gdb_test "break ${srcfile3}:${bar_last_line}" \
+ "Breakpoint.* at .*${srcfile3}:${bar_last_line}\\\. \\\(2 locations\\\)"
+
+# Run to the breakpoint in bar.
+gdb_continue_to_breakpoint "bar_first_line" \
+ ".*${srcfile3}:${bar_first_line}.*"
+
+# Jump within the function. Debugger shall be able to jump, even if the
+# target line is in two different object files. After jump, we will hit
+# the breakpoint at the last line of bar.
+gdb_test "jump ${bar_middle_line}" [multi_line \
+ "Continuing at ($hex).*" \
+ "Breakpoint ${decimal}.* at .*${srcfile3}:${bar_last_line}.*"] \
+ "Jump within the objectfile"
diff --git a/gdb/testsuite/gdb.base/jump2.h b/gdb/testsuite/gdb.base/jump2.h
new file mode 100755
index 00000000000..5e3849cb3cb
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jump2.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2021-2023 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef JUMP2_H
+#define JUMP2_H
+
+static int
+bar (int n)
+{
+ int retval = n;
+ retval += 1; /* bar-first-line */
+ retval *= -1; /* bar-middle-line */
+ return retval; /* bar-last-line */
+}
+
+#endif /* JUMP2_H */
diff --git a/gdb/testsuite/gdb.base/jump2_foo.c b/gdb/testsuite/gdb.base/jump2_foo.c
new file mode 100755
index 00000000000..667f2398551
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jump2_foo.c
@@ -0,0 +1,24 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2021-2023 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "jump2.h"
+
+int
+foo (int n)
+{
+ return bar (n);
+}
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
next prev parent reply other threads:[~2023-03-08 13:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 13:26 [PATCH 0/1] " Matti Puputti
2023-03-08 13:26 ` Matti Puputti [this message]
2023-03-24 7:19 ` [PATCH 1/1] " Puputti, Matti
2023-03-31 5:04 ` Puputti, Matti
2023-04-06 12:59 ` [PING] " Puputti, Matti
2023-04-13 14:32 ` Bruno Larsen
2023-04-14 12:28 ` Puputti, Matti
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=20230308132607.1674441-2-matti.puputti@intel.com \
--to=matti.puputti@intel.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).