From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 03/21] gdb: make interp_add a method of struct ui
Date: Fri, 8 Sep 2023 14:22:57 -0400 [thread overview]
Message-ID: <20230908190227.96319-4-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230908190227.96319-1-simon.marchi@efficios.com>
No behavior changes expected.
Change-Id: Ice8958068fd4025e23bff87bcdee45a5f64a41c4
---
gdb/interps.c | 12 +-----------
gdb/ui.c | 10 ++++++++++
gdb/ui.h | 4 ++++
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/gdb/interps.c b/gdb/interps.c
index 3ddcfe9566fe..b05a6c4eb875 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -83,16 +83,6 @@ interp_factory_register (const char *name, interp_factory_func func)
interpreter_factories.emplace_back (name, func);
}
-/* Add interpreter INTERP to the gdb interpreter list. The
- interpreter must not have previously been added. */
-static void
-interp_add (struct ui *ui, struct interp *interp)
-{
- gdb_assert (ui->lookup_existing_interp (interp->name ()) == nullptr);
-
- ui->interp_list.push_back (*interp);
-}
-
/* This sets the current interpreter to be INTERP. If INTERP has not
been initialized, then this will also run the init method.
@@ -170,7 +160,7 @@ interp_lookup (struct ui *ui, const char *name)
if (strcmp (factory.name, name) == 0)
{
interp = factory.func (factory.name);
- interp_add (ui, interp);
+ ui->add_interp (interp);
return interp;
}
diff --git a/gdb/ui.c b/gdb/ui.c
index ae87dcda2453..624187ac73c3 100644
--- a/gdb/ui.c
+++ b/gdb/ui.c
@@ -159,6 +159,16 @@ ui::lookup_existing_interp (const char *name) const
return nullptr;
}
+/* See ui.h. */
+
+void
+ui::add_interp (interp *interp)
+{
+ gdb_assert (this->lookup_existing_interp (interp->name ()) == nullptr);
+
+ this->interp_list.push_back (*interp);
+}
+
/* See top.h. */
void
diff --git a/gdb/ui.h b/gdb/ui.h
index 23c6b2e1a3d9..48cad96b3fb8 100644
--- a/gdb/ui.h
+++ b/gdb/ui.h
@@ -162,6 +162,10 @@ struct ui : public intrusive_list_node<ui>
/* Look up the interpreter for NAME. If no such interpreter exists,
return nullptr, otherwise return a pointer to the interpreter. */
interp *lookup_existing_interp (const char *name) const;
+
+ /* Add interpreter INTERP to this UI's interpreter list. The
+ interpreter must not have previously been added. */
+ void add_interp (interp *interp);
};
/* The main UI. This is the UI that is bound to stdin/stdout/stderr.
--
2.42.0
next prev parent reply other threads:[~2023-09-08 19:02 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 18:22 [PATCH 00/21] ui / interp cleansup Simon Marchi
2023-09-08 18:22 ` [PATCH 01/21] gdb: use intrusive_list for struct ui linked list Simon Marchi
2023-09-08 18:22 ` [PATCH 02/21] gdb: make interp_lookup_existing a method of struct ui Simon Marchi
2023-09-08 18:22 ` Simon Marchi [this message]
2023-09-08 18:22 ` [PATCH 04/21] gdb: make interp_lookup " Simon Marchi
2023-09-12 9:15 ` Andrew Burgess
2023-09-12 14:38 ` Simon Marchi
2023-09-08 18:22 ` [PATCH 05/21] gdb: remove ui:::add_interp and ui::lookup_existing_interp Simon Marchi
2023-09-08 18:23 ` [PATCH 06/21] gdb: uncover some current_ui uses in interp_set Simon Marchi
2023-09-08 18:23 ` [PATCH 07/21] gdb: add backlink to ui in interp Simon Marchi
2023-09-08 18:23 ` [PATCH 08/21] gdb: pass ui down to gdb_setup_readline and gdb_disable_readline Simon Marchi
2023-09-08 18:23 ` [PATCH 09/21] gdb/python: use m_ui instead of current_ui in dap_interp::init Simon Marchi
2023-09-08 18:23 ` [PATCH 10/21] gdb/mi: use m_ui instead of current_ui in mi_interp::init Simon Marchi
2023-09-08 18:23 ` [PATCH 11/21] gdb/cli: use m_ui instead of current_ui in cli_interp::resume Simon Marchi
2023-09-12 10:40 ` Andrew Burgess
2023-09-12 15:42 ` Simon Marchi
2023-09-08 18:23 ` [PATCH 12/21] gdb/tui: use m_ui instead of current_ui in tui_interp::resume Simon Marchi
2023-09-12 10:41 ` Andrew Burgess
2023-09-08 18:23 ` [PATCH 13/21] gdb/mi: use m_ui instead of current_ui in mi_interp::resume Simon Marchi
2023-09-12 10:44 ` Andrew Burgess
2023-09-12 16:36 ` Simon Marchi
2023-09-08 18:23 ` [PATCH 14/21] gdb/cli: use m_ui instead of current_ui in cli_interp::suspend Simon Marchi
2023-09-08 18:23 ` [PATCH 15/21] gdb/tui: use m_ui instead of current_ui in tui_interp::suspend Simon Marchi
2023-09-08 18:23 ` [PATCH 16/21] gdb/mi: use m_ui instead of current_ui in mi_interp::suspend Simon Marchi
2023-09-08 18:23 ` [PATCH 17/21] gdb: pass current_ui down to interp_set Simon Marchi
2023-09-12 10:54 ` Andrew Burgess
2023-09-12 17:17 ` Simon Marchi
2023-09-08 18:23 ` [PATCH 18/21] gdb: make interp_set a method of struct ui Simon Marchi
2023-09-12 10:58 ` Andrew Burgess
2023-09-12 17:23 ` Simon Marchi
2023-09-12 13:41 ` Tom Tromey
2023-09-12 17:32 ` Simon Marchi
2023-09-08 18:23 ` [PATCH 19/21] gdb: pass down current_ui to set_top_level_interpreter Simon Marchi
2023-09-11 15:15 ` Simon Marchi
2023-09-08 18:23 ` [PATCH 20/21] gdb: make set_top_level_interpreter a method of struct ui Simon Marchi
2023-09-12 11:20 ` Andrew Burgess
2023-09-12 17:41 ` Simon Marchi
2023-09-08 18:23 ` [PATCH 21/21] gdb: make top_level_interpreter " Simon Marchi
2023-09-12 11:35 ` Andrew Burgess
2023-09-12 17:54 ` Simon Marchi
2023-09-12 11:38 ` [PATCH 00/21] ui / interp cleansup Andrew Burgess
2023-09-12 17:51 ` Simon Marchi
2023-09-12 18:06 ` Tom Tromey
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=20230908190227.96319-4-simon.marchi@efficios.com \
--to=simon.marchi@efficios.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).