From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id 3BA233856DC8 for ; Wed, 24 May 2023 16:37:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BA233856DC8 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-7606d460da7so30689939f.1 for ; Wed, 24 May 2023 09:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1684946257; x=1687538257; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=86+GWqQaN8wrCoDjAHnDeJAuwNAn+BA2Xv0tzVrEIoQ=; b=cgDpNpJCQlxk3xOY5RZq3Dbo+820JwSVO8zQkF2EmUFq6QoaZlYP+pAL+XTqbyGa1h kFEUNqQuMaKskiP8GJfos5txgcHT4c2Sb4TDwooZ9hpk2NXvwb2MnT1D47B5vI4dwEif IqXqxD/2KQ6B69GzSfCHkc0VoZsXTbqWFmrdnjkTmFTNHJuCxN0sG5YR6nCxhrBQDp/j yj4sAJ/Kze+9JZquNqcdd1vK6BY9U1d5EDY2EoQz0+8KWz8cGyT/AoXwcXDpur8LzzsY 50EGsr95UN6kwKe/xHMzOme/wiQSprPruNK2RDdZd0ne5pahpklxzVMclvK+Dnz3Gxov tbaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684946257; x=1687538257; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=86+GWqQaN8wrCoDjAHnDeJAuwNAn+BA2Xv0tzVrEIoQ=; b=AjCPqyYlKfZpv3L3DDtMmx6IrznRJmozdHkhoitKgg2+VMwsXoN+hyMFKOQEPQGvDN ERAWtQt4zUXb8DSBpG/4j1WrZdMlQq6oS58rf6ePZbm46FOu59n0F8M4+Qe1c5bfVQPP Z3jcTJPpmSt8KZsp4SzXgwxd+CAUzIl1Mo+dBrTIV7v8Fre+P1IpVyNBYpAU5wJN85nD frbvpy8CfdVvaHTlHTUOphl3DgL1jXSQxadXm81gzvao5Uw+ROjsc9jNtCvsGKUAdI0X W16feRTlPeV/jPbMPtUNkhtRw5SW5ewIYHNIUwjSXc7jpeanYOtfLoevXqx9fuoDsYZF 2k1g== X-Gm-Message-State: AC+VfDxxpPXKnRuCu1UjaaXKFfMdeBr3DFgNZS7fc2kiJnmAedheR+2F TeCAqBsFyNxInG88xHz2eAitSftDZSb8NCVnVZ/YWQ== X-Google-Smtp-Source: ACHHUZ5jgCf5qB3UVYWqhonCxOUUkSoL00xTzoSGHCnRReFGcyQsn2ce7obapOya4VGP1wzli9vWYw== X-Received: by 2002:a6b:ef04:0:b0:774:9af9:f45e with SMTP id k4-20020a6bef04000000b007749af9f45emr615239ioh.11.1684946257531; Wed, 24 May 2023 09:37:37 -0700 (PDT) Received: from localhost.localdomain (71-211-130-244.hlrn.qwest.net. [71.211.130.244]) by smtp.gmail.com with ESMTPSA id o22-20020a6bcf16000000b0076c81bf2731sm3397266ioa.20.2023.05.24.09.37.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 09:37:37 -0700 (PDT) From: Tom Tromey Date: Wed, 24 May 2023 10:37:13 -0600 Subject: [PATCH 22/25] Add "stop at main" extension to DAP launch request MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230427-ada-catch-exception-v1-22-947caa9905e3@adacore.com> References: <20230427-ada-catch-exception-v1-0-947caa9905e3@adacore.com> In-Reply-To: <20230427-ada-catch-exception-v1-0-947caa9905e3@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Co-workers who work on a program that uses DAP asked for the ability to have gdb stop at the main subprogram when launching. This patch implements this extension. --- gdb/doc/gdb.texinfo | 5 +++++ gdb/python/lib/gdb/dap/launch.py | 13 +++++++++++- gdb/testsuite/gdb.dap/stop-at-main.exp | 37 ++++++++++++++++++++++++++++++++++ gdb/testsuite/lib/dap-support.exp | 9 +++++++-- 4 files changed, 61 insertions(+), 3 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index f66dd4df3cf..eb95273d93d 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -39018,6 +39018,11 @@ inferior will be set to exactly as passed in. @xref{Environment}. @item program If provided, this is a string that specifies the program to use. This corresponds to the @code{file} command. @xref{Files}. + +@item stopAtBeginningOfMainSubprogram +If provided, this must be a boolean. When @samp{True}, @value{GDBN} +will set a temporary breakpoint at the program's main procedure, using +the same approach as the @code{start} command. @xref{Starting}. @end table @value{GDBN} defines some parameters that can be passed to the diff --git a/gdb/python/lib/gdb/dap/launch.py b/gdb/python/lib/gdb/dap/launch.py index 2fec3267cbb..aee8c2f9ae6 100644 --- a/gdb/python/lib/gdb/dap/launch.py +++ b/gdb/python/lib/gdb/dap/launch.py @@ -20,7 +20,7 @@ from typing import Mapping, Optional, Sequence from .events import ExecutionInvoker from .server import request, capability -from .startup import send_gdb, send_gdb_with_response, in_gdb_thread +from .startup import send_gdb, send_gdb_with_response, in_gdb_thread, exec_and_log _program = None @@ -36,6 +36,14 @@ def _set_args_env(args, env): inf.set_env(name, value) +@in_gdb_thread +def _break_at_main(): + inf = gdb.selected_inferior() + main = inf.main_name + if main is not None: + exec_and_log("tbreak " + main) + + # Any parameters here are necessarily extensions -- DAP requires this # from implementations. Any additions or changes here should be # documented in the gdb manual. @@ -45,12 +53,15 @@ def launch( program: Optional[str] = None, args: Sequence[str] = (), env: Optional[Mapping[str, str]] = None, + stopAtBeginningOfMainSubprogram: bool = False, **extra, ): if program is not None: global _program _program = program send_gdb(f"file {_program}") + if stopAtBeginningOfMainSubprogram: + send_gdb(_break_at_main) if len(args) > 0 or env is not None: send_gdb(lambda: _set_args_env(args, env)) diff --git a/gdb/testsuite/gdb.dap/stop-at-main.exp b/gdb/testsuite/gdb.dap/stop-at-main.exp new file mode 100644 index 00000000000..80a9b81e152 --- /dev/null +++ b/gdb/testsuite/gdb.dap/stop-at-main.exp @@ -0,0 +1,37 @@ +# Copyright 2022-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 . + +# Test the stop-at-main extension. + +require allow_dap_tests + +load_lib dap-support.exp + +standard_testfile attach.c + +if {[build_executable ${testfile}.exp $testfile $srcfile] == -1} { + return +} + +if {[dap_launch $testfile {} {} 1] == ""} { + return +} + +dap_check_request_and_response "start inferior" configurationDone +# We didn't explicitly set a breakpoint, so if we hit one, it worked. +dap_wait_for_event_and_check "stopped at function breakpoint" stopped \ + "body reason" breakpoint + +dap_shutdown diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index e1fada8b703..92484bfdb8d 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -241,8 +241,9 @@ proc _dap_initialize {name} { # request. If specified, ARGS is a list of command-line arguments, # and ENV is a list of pairs of the form {VAR VALUE} that is used to # populate the inferior's environment. After this is called, gdb will -# be ready to accept breakpoint requests. -proc dap_launch {file {args {}} {env {}}} { +# be ready to accept breakpoint requests. If STOP_AT_MAIN is nonzero, +# pass "stopAtBeginningOfMainSubprogram" to the launch request. +proc dap_launch {file {args {}} {env {}} {stop_at_main 0}} { if {[_dap_initialize "startup - initialize"] == ""} { return "" } @@ -269,6 +270,10 @@ proc dap_launch {file {args {}} {env {}}} { append params " \[o $envlist\]" } + if {$stop_at_main} { + append params { stopAtBeginningOfMainSubprogram [l true]} + } + return [dap_check_request_and_response "startup - launch" launch $params] } -- 2.40.0