diff mbox series

[03/21] gdb: make interp_add a method of struct ui

Message ID	20230908190227.96319-4-simon.marchi@efficios.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D6A43858C2D 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 Message-ID: <20230908190227.96319-4-simon.marchi@efficios.com> In-Reply-To: <20230908190227.96319-1-simon.marchi@efficios.com> References: <20230908190227.96319-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> Reply-To: Simon Marchi <simon.marchi@efficios.com> Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	ui / interp cleansup \| [00/21] ui / interp cleansup [01/21] gdb: use intrusive_list for struct ui linked list [02/21] gdb: make interp_lookup_existing a method of struct ui [03/21] gdb: make interp_add a method of struct ui [04/21] gdb: make interp_lookup a method of struct ui [05/21] gdb: remove ui:::add_interp and ui::lookup_existing_interp [06/21] gdb: uncover some current_ui uses in interp_set [07/21] gdb: add backlink to ui in interp [08/21] gdb: pass ui down to gdb_setup_readline and gdb_disable_readline [09/21] gdb/python: use m_ui instead of current_ui in dap_interp::init [10/21] gdb/mi: use m_ui instead of current_ui in mi_interp::init [11/21] gdb/cli: use m_ui instead of current_ui in cli_interp::resume [12/21] gdb/tui: use m_ui instead of current_ui in tui_interp::resume [13/21] gdb/mi: use m_ui instead of current_ui in mi_interp::resume [14/21] gdb/cli: use m_ui instead of current_ui in cli_interp::suspend [15/21] gdb/tui: use m_ui instead of current_ui in tui_interp::suspend [16/21] gdb/mi: use m_ui instead of current_ui in mi_interp::suspend [17/21] gdb: pass current_ui down to interp_set [18/21] gdb: make interp_set a method of struct ui [19/21] gdb: pass down current_ui to set_top_level_interpreter [20/21] gdb: make set_top_level_interpreter a method of struct ui [21/21] gdb: make top_level_interpreter a method of struct ui

Commit Message

Simon Marchi Sept. 8, 2023, 6:22 p.m. UTC

  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 mbox series

Patch

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.