From patchwork Wed May 24 16:37:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 69974 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 8930B382E69E for ; Wed, 24 May 2023 16:39:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8930B382E69E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684946382; bh=+TZOGGeWjPQMzsK2e9KX29U1ZZ/yOELfbBcgyW/Yd8w=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=tEFSYGPWRgncY+WpDLKzSe/E02YPsm7PJzEipIQGt78HaVeJ3MZ1AeP5fpslfqKzT OxTdNoGASThB2hD6PmVITyAK5fL3Pduy7cKbPb41BRYE6aMiHHbAnqYs2ybWdRjK/7 tNo5XQglwJEuFSHZQUXGSO12oRxl1weOzMVSKAt4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id B93E9385700B for ; Wed, 24 May 2023 16:37:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B93E9385700B Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-77483a5a350so30983239f.0 for ; Wed, 24 May 2023 09:37:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684946259; x=1687538259; 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=+TZOGGeWjPQMzsK2e9KX29U1ZZ/yOELfbBcgyW/Yd8w=; b=RozN0Wyz18hCnMsEA1ZE25hKjrYmqoJML3cLC4cEKTNf5FZTGjOxeej449a0ibqowv gB6C8T0HgvV6lKG7p4uC2os2mlEj16RXADgmGXwhhwprgg9ZV55lBfaNrAGCa+KH9Bsn OXw44KlCMEYl7iXBLhjBuKI7xUfoUYud6GxwwmPd/435q0DsYpp/smxtMnL/jiZJPB5G am/FIPU36pZc5swBhBTS8OLF/x0LQz6mO3q3c8AqPJfE4CC2lokcynVo0Q9lxUGZ7/i3 s3yje2pjas9uRWpQkOVwQ98xXZ7Wi40rcljWa85h2NYj21LpsCxw4vralx9018Ictjc4 YKLg== X-Gm-Message-State: AC+VfDwtYUEiZ6+aVkhxu1v/H2obXY9c9Ano3gnQCO96Cmv5lJbD77xl s/of2q6ZP7I1y9yHJsu6jgrIJAdkw9tNczxh8ANQ0g== X-Google-Smtp-Source: ACHHUZ6OqDLAU5wKTJGT2dpJdtRMweoCCZYw16ccAQ9cTaKC69OBFyQOA0W/HctmET9PD/JT4ZYl4w== X-Received: by 2002:a6b:5b08:0:b0:763:92eb:f81e with SMTP id v8-20020a6b5b08000000b0076392ebf81emr11287322ioh.8.1684946259344; Wed, 24 May 2023 09:37:39 -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.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 09:37:39 -0700 (PDT) Date: Wed, 24 May 2023 10:37:16 -0600 Subject: [PATCH 25/25] Implement DAP conditional breakpoints MIME-Version: 1.0 Message-Id: <20230427-ada-catch-exception-v1-25-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.1 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I realized that I had only implemented DAP breakpoint conditions for exception breakpoints, and not other kinds of breakpoints. This patch corrects the oversight. --- gdb/python/lib/gdb/dap/breakpoint.py | 69 +++++++++++++++++++++++++++--------- gdb/testsuite/gdb.dap/cond-bp.c | 26 ++++++++++++++ gdb/testsuite/gdb.dap/cond-bp.exp | 65 +++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 16 deletions(-) diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py index ad019333fea..20e65aa0e61 100644 --- a/gdb/python/lib/gdb/dap/breakpoint.py +++ b/gdb/python/lib/gdb/dap/breakpoint.py @@ -63,6 +63,14 @@ def breakpoint_descriptor(bp): } +# Extract entries from a hash table and return a list of them. Each +# entry is a string. If a key of that name appears in the hash table, +# it is removed and pushed on the result list; if it does not appear, +# None is pushed on the list. +def _remove_entries(table, *names): + return [table.pop(name, None) for name in names] + + # Helper function to set some breakpoints according to a list of # specifications and a callback function to do the work of creating # the breakpoint. @@ -78,11 +86,20 @@ def _set_breakpoints_callback(kind, specs, creator): result = [] for spec in specs: keyspec = frozenset(spec.items()) + + (condition, hit_condition) = _remove_entries(spec, "condition", "hitCondition") + if keyspec in saved_map: bp = saved_map.pop(keyspec) else: # FIXME handle exceptions here bp = creator(**spec) + + if condition is not None: + bp.condition = condition + if hit_condition is not None: + bp.ignore_count = hit_condition + breakpoint_map[kind][keyspec] = bp result.append(breakpoint_descriptor(bp)) # Delete any breakpoints that were not reused. @@ -98,9 +115,22 @@ def _set_breakpoints(kind, specs): return _set_breakpoints_callback(kind, specs, gdb.Breakpoint) +# Turn a DAP SourceBreakpoint, FunctionBreakpoint, or +# InstructionBreakpoint into a "spec" that is used by +# _set_breakpoints. SPEC is a dictionary of parameters that is used +# as the base of the result; it is modified in place. +def _basic_spec(bp_info, spec): + for name in ("condition", "hitCondition"): + if name in bp_info: + spec[name] = bp_info[name] + return spec + + # FIXME we do not specify a type for 'source'. # FIXME 'breakpoints' is really a list[SourceBreakpoint]. @request("setBreakpoints") +@capability("supportsHitConditionalBreakpoints") +@capability("supportsConditionalBreakpoints") def set_breakpoint(*, source, breakpoints: Sequence = (), **args): if "path" not in source: result = [] @@ -108,10 +138,13 @@ def set_breakpoint(*, source, breakpoints: Sequence = (), **args): specs = [] for obj in breakpoints: specs.append( - { - "source": source["path"], - "line": obj["line"], - } + _basic_spec( + obj, + { + "source": source["path"], + "line": obj["line"], + }, + ) ) # Be sure to include the path in the key, so that we only # clear out breakpoints coming from this same source. @@ -128,9 +161,12 @@ def set_fn_breakpoint(*, breakpoints: Sequence, **args): specs = [] for bp in breakpoints: specs.append( - { - "function": bp["name"], - } + _basic_spec( + bp, + { + "function": bp["name"], + }, + ) ) result = send_gdb_with_response(lambda: _set_breakpoints("function", specs)) return { @@ -151,9 +187,12 @@ def set_insn_breakpoints( if offset is not None: val = val + " + " + str(offset) specs.append( - { - "spec": val, - } + _basic_spec( + bp, + { + "spec": val, + }, + ) ) result = send_gdb_with_response(lambda: _set_breakpoints("instruction", specs)) return { @@ -162,16 +201,14 @@ def set_insn_breakpoints( @in_gdb_thread -def _catch_exception(filterId, condition=None, **args): +def _catch_exception(filterId, **args): if filterId == "assert": - args = ["-catch-assert"] + cmd = "-catch-assert" elif filterId == "exception": - args = ["-catch-exception"] + cmd = "-catch-exception" else: raise Exception(f"Invalid exception filterID: {filterId}") - if condition is not None: - args.extend(["-c", condition]) - result = gdb.execute_mi(*args) + result = gdb.execute_mi(cmd) # A little lame that there's no more direct way. for bp in gdb.breakpoints(): if bp.number == result["bkptno"]: diff --git a/gdb/testsuite/gdb.dap/cond-bp.c b/gdb/testsuite/gdb.dap/cond-bp.c new file mode 100644 index 00000000000..535b15d1420 --- /dev/null +++ b/gdb/testsuite/gdb.dap/cond-bp.c @@ -0,0 +1,26 @@ +/* Copyright 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 . */ + +int +main () +{ + int acc = 0, i, j; + for (i = 0; i < 5; ++i) + for (j = 0; j < 5; ++j) + acc += i + j; /* STOP */ + return acc; +} diff --git a/gdb/testsuite/gdb.dap/cond-bp.exp b/gdb/testsuite/gdb.dap/cond-bp.exp new file mode 100644 index 00000000000..376db4b3548 --- /dev/null +++ b/gdb/testsuite/gdb.dap/cond-bp.exp @@ -0,0 +1,65 @@ +# Copyright 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 DAP breakpoint conditions. + +require allow_dap_tests + +load_lib dap-support.exp + +standard_testfile + +if {[build_executable ${testfile}.exp $testfile] == -1} { + return +} + +if {[dap_launch $testfile] == ""} { + return +} + +set line [gdb_get_line_number "STOP"] +set obj [dap_check_request_and_response "set conditional breakpoint" \ + setBreakpoints \ + [format {o source [o path [%s]] \ + breakpoints [a [o line [i %d] \ + condition [s "i == 3"] \ + hitCondition [i 3]]]} \ + [list s $srcfile] $line]] +set fn_bpno [dap_get_breakpoint_number $obj] + +dap_check_request_and_response "start inferior" configurationDone + +dap_wait_for_event_and_check "stopped at function breakpoint" stopped \ + "body reason" breakpoint \ + "body hitBreakpointIds" $fn_bpno + +set bt [lindex [dap_check_request_and_response "backtrace" stackTrace \ + {o threadId [i 1]}] \ + 0] +set frame_id [dict get [lindex [dict get $bt body stackFrames] 0] id] + +set obj [dap_check_request_and_response "evaluate i" \ + evaluate \ + [format {o expression [s i] frameId [i %s]} $frame_id]] +dap_match_values "value of i" [lindex $obj 0] \ + "body result" 3 + +set obj [dap_check_request_and_response "evaluate j" \ + evaluate \ + [format {o expression [s j] frameId [i %s]} $frame_id]] +dap_match_values "value of j" [lindex $obj 0] \ + "body result" 3 + +dap_shutdown