From patchwork Fri Sep 8 18:23:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 75580 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8267D3853D12 for ; Fri, 8 Sep 2023 19:07:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8267D3853D12 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694200047; bh=y0SX7Hb6+g+LrEfL6M4Hw06nVQ7fgOLyBRDqJ5AelFI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=S7aDucL2gBgZZRP6LHFP6DeYpPARicrMHdkaza9THNUBGD0ZzOytLsAd71Xei+A8m KET2e9IGi9NIVR2l/8awuNnHC/xs41f7sCQIx2tvac3g6SRKoRGxzf0GLTXFqu9U2/ nh3Q6r3AOkUrPNsnQ8Ycol1/dXr/iKO+EqBDksJk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id E22E03857020 for ; Fri, 8 Sep 2023 19:06:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E22E03857020 Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 51E421E0C3; Fri, 8 Sep 2023 15:06:32 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 18/21] gdb: make interp_set a method of struct ui Date: Fri, 8 Sep 2023 14:23:12 -0400 Message-ID: <20230908190227.96319-19-simon.marchi@efficios.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230908190227.96319-1-simon.marchi@efficios.com> References: <20230908190227.96319-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3497.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Move interp_set to ui::set_current_interpreter. Change-Id: I7e83ca7732bb6229a1e61dc0e3832f54c20c3f52 --- gdb/interps.c | 66 +++------------------------------------------------ gdb/ui.c | 51 +++++++++++++++++++++++++++++++++++++++ gdb/ui.h | 12 ++++++++++ 3 files changed, 66 insertions(+), 63 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 18758f1f7af6..465c174ea794 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -80,66 +80,6 @@ find_interp_factory (const char *name) return nullptr; } -/* This sets the current interpreter to be INTERP. If INTERP has not - been initialized, then this will also run the init method. - - The TOP_LEVEL parameter tells if this new interpreter is - the top-level one. The top-level is what is requested - on the command line, and is responsible for reporting general - notification about target state changes. For example, if - MI is the top-level interpreter, then it will always report - events such as target stops and new thread creation, even if they - are caused by CLI commands. */ - -static void -interp_set (ui *ui, struct interp *interp, bool top_level) -{ - struct interp *old_interp = ui->current_interpreter; - - /* If we already have an interpreter, then trying to - set top level interpreter is kinda pointless. */ - gdb_assert (!top_level || !ui->current_interpreter); - gdb_assert (!top_level || !ui->top_level_interpreter); - - if (old_interp != NULL) - { - ui->m_current_uiout->flush (); - old_interp->suspend (); - } - - ui->current_interpreter = interp; - if (top_level) - ui->top_level_interpreter = interp; - - if (interpreter_p != interp->name ()) - interpreter_p = interp->name (); - - bool warn_about_mi1 = false; - - /* Run the init proc. */ - if (!interp->inited) - { - interp->init (top_level); - interp->inited = true; - - if (streq (interp->name (), "mi1")) - warn_about_mi1 = true; - } - - /* Do this only after the interpreter is initialized. */ - ui->m_current_uiout = interp->interp_ui_out (); - - /* Clear out any installed interpreter hooks/event handlers. */ - clear_interpreter_hooks (); - - interp->resume (); - - if (warn_about_mi1) - warning (_("MI version 1 is deprecated in GDB 13 and " - "will be removed in GDB 14. Please upgrade " - "to a newer version of MI.")); -} - /* See interps.h. */ void @@ -151,7 +91,7 @@ set_top_level_interpreter (const char *name) if (interp == NULL) error (_("Interpreter `%s' unrecognized"), name); /* Install it. */ - interp_set (current_ui, interp, true); + current_ui->set_current_interpreter (interp, true); } void @@ -267,10 +207,10 @@ interpreter_exec_cmd (const char *args, int from_tty) if (interp_to_use == NULL) error (_("Could not find interpreter \"%s\"."), prules[0]); - interp_set (current_ui, interp_to_use, false); + current_ui->set_current_interpreter (interp_to_use, false); SCOPE_EXIT { - interp_set (current_ui, old_interp, false); + current_ui->set_current_interpreter (old_interp, false); }; for (i = 1; i < nrules; i++) diff --git a/gdb/ui.c b/gdb/ui.c index 8c04dc92b89e..2db899eb9c31 100644 --- a/gdb/ui.c +++ b/gdb/ui.c @@ -172,6 +172,57 @@ ui::lookup_interp (const char *name) /* See ui.h. */ +void +ui::set_current_interpreter (interp *interp, bool top_level) +{ + struct interp *old_interp = this->current_interpreter; + + /* If we already have an interpreter, then trying to + set top level interpreter is kinda pointless. */ + gdb_assert (!top_level || !this->current_interpreter); + gdb_assert (!top_level || !this->top_level_interpreter); + + if (old_interp != NULL) + { + m_current_uiout->flush (); + old_interp->suspend (); + } + + this->current_interpreter = interp; + if (top_level) + this->top_level_interpreter = interp; + + if (interpreter_p != interp->name ()) + interpreter_p = interp->name (); + + bool warn_about_mi1 = false; + + /* Run the init proc. */ + if (!interp->inited) + { + interp->init (top_level); + interp->inited = true; + + if (streq (interp->name (), "mi1")) + warn_about_mi1 = true; + } + + /* Do this only after the interpreter is initialized. */ + m_current_uiout = interp->interp_ui_out (); + + /* Clear out any installed interpreter hooks/event handlers. */ + clear_interpreter_hooks (); + + interp->resume (); + + if (warn_about_mi1) + warning (_("MI version 1 is deprecated in GDB 13 and " + "will be removed in GDB 14. Please upgrade " + "to a newer version of MI.")); +} + +/* See ui.h. */ + void ui::unregister_file_handler () { diff --git a/gdb/ui.h b/gdb/ui.h index be89ab3d6848..4f6a32991d6d 100644 --- a/gdb/ui.h +++ b/gdb/ui.h @@ -167,6 +167,18 @@ struct ui : public intrusive_list_node interp_factory_register, return nullptr; otherwise return a pointer to the interpreter. */ interp *lookup_interp (const char *name); + + /* This sets the current interpreter of this UI to be INTERP. If INTERP has + not been initialized, then this will also run the init method. + + The TOP_LEVEL parameter tells if this new interpreter is + the top-level one. The top-level is what is requested + on the command line, and is responsible for reporting general + notification about target state changes. For example, if + MI is the top-level interpreter, then it will always report + events such as target stops and new thread creation, even if they + are caused by CLI commands. */ + void set_current_interpreter (interp *interp, bool top_level); }; /* The main UI. This is the UI that is bound to stdin/stdout/stderr.