From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by sourceware.org (Postfix) with ESMTPS id C8C653858D1E for ; Tue, 18 Apr 2023 15:19:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C8C653858D1E 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-xd31.google.com with SMTP id ca18e2360f4ac-7606df33c42so59267739f.2 for ; Tue, 18 Apr 2023 08:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1681831181; x=1684423181; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sX2J6zvIhBzUa37CPtgWVYeTfTf/fGHN2bWCtStkrac=; b=f2EaZMi+rZj5yb1c7QiLjjgtAlsh5iksxb5OmBityevTNa0zOQO6A4CyHqcYQYVgy6 N1/FbanMo1fC18qknuU+sVHqBsDqmB/pX9FUlv2AyEt7hsjC9gYTM21npjAMr5jiSfrt Q1KgyCmeGJCS7cz5sl7B5vg8KeAqCWdt5BDyhWLun1IiVF7aop/pCxwfjSa/trZ8Izvv H60tOy956kX0IW7bqCd8/pAwvsYV39eogOfp0z70v5yWhY4iY9F8K1JS/B9BDafNMiMg J4GThuDkMAAT4dLcvIByjyfkDUG70Hq/UTL1KDiiPaGmQXVBEe+Po5p3+ipRl5y3iurt 2ZcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681831181; x=1684423181; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sX2J6zvIhBzUa37CPtgWVYeTfTf/fGHN2bWCtStkrac=; b=ZNblP+/c7Ye31gPUtAbKG2DfwmsrJMxd/X8NGDkXd/rZwzsZ7Kj2kkrQREmp/Uc4BQ 97spe5Kn8cKNKvJ1PHM+DjCDEbRpZOSX+Pep0gV0qcHi3jZ8MSJcepXIWw9djxxE0zqN L7mcrfVMEl/bWlNRIIQVWneCW3Ui5JRbVTfKgzgr9SdjSi3MiYP3Zr4H03cUZsTooFQO QqYQ0j9N6Q+FPmDMimBpsPFxNaHMLIvRMaSJQh9mdkIU6lVTZt0uVASlP2m1ka8cZV2p JBXi66OLGFkfni7+Q/ZNCfyQu+8U500yIaOLLTKpvVbpZrnR/ih+JG45V9pY/jVsP0z4 L8xQ== X-Gm-Message-State: AAQBX9ekiUA1c0g4Qzp21JDNMG/bS2XiEPuoNgzaLaszwzSkYzaPYGQ6 +iSLoXhRoHRL+pknZedgg/6ar6t1qFxAUpB+mCBg+A== X-Google-Smtp-Source: AKy350afSCzLuzIP9970q6yvhc91/bsGDlpXjsWUiKNOf0agSAyEjtWKcu53QOUUlHl00NfWpVwaDA== X-Received: by 2002:a05:6602:148:b0:763:5a3c:58bd with SMTP id v8-20020a056602014800b007635a3c58bdmr1721067iot.19.1681831180933; Tue, 18 Apr 2023 08:19:40 -0700 (PDT) Received: from localhost.localdomain (71-211-191-82.hlrn.qwest.net. [71.211.191.82]) by smtp.gmail.com with ESMTPSA id m21-20020a6bf315000000b00760f8bae7aasm1488930ioh.51.2023.04.18.08.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 08:19:40 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Implement DAP register scope Date: Tue, 18 Apr 2023 09:19:33 -0600 Message-Id: <20230418151933.1869517-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: I noticed that gdb's DAP code did not provide a way to see register values. DAP defines a "register" scope, which this patch implements. This patch also adds the missing (and optional) "presentationHint" to scopes. --- gdb/python/lib/gdb/dap/scopes.py | 20 +++++++++++++++++--- gdb/testsuite/gdb.dap/scopes.exp | 18 ++++++++++++++++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/gdb/python/lib/gdb/dap/scopes.py b/gdb/python/lib/gdb/dap/scopes.py index 9ab454aa57b..5982934d9fb 100644 --- a/gdb/python/lib/gdb/dap/scopes.py +++ b/gdb/python/lib/gdb/dap/scopes.py @@ -50,14 +50,16 @@ def _block_vars(block): class ScopeReference(BaseReference): - def __init__(self, name, frame, var_list): + def __init__(self, name, hint, frame, var_list): super().__init__(name) + self.hint = hint self.frame = frame self.func = frame.function() self.var_list = var_list def to_object(self): result = super().to_object() + result["presentationHint"] = self.hint # How would we know? result["expensive"] = False result["namedVariables"] = len(self.var_list) @@ -79,6 +81,17 @@ class ScopeReference(BaseReference): return (sym.print_name, val) +class RegisterReference(ScopeReference): + def __init__(self, name, frame): + super().__init__( + name, "registers", frame, list(frame.architecture().registers()) + ) + + @in_gdb_thread + def fetch_one_child(self, idx): + return (self.var_list[idx].name, self.frame.read_register(self.var_list[idx])) + + # Helper function to create a DAP scopes for a given frame ID. @in_gdb_thread def _get_scope(id): @@ -88,9 +101,10 @@ def _get_scope(id): if block is not None: (args, locs) = _block_vars(block) if args: - scopes.append(ScopeReference("Arguments", frame, args)) + scopes.append(ScopeReference("Arguments", "arguments", frame, args)) if locs: - scopes.append(ScopeReference("Locals", frame, locs)) + scopes.append(ScopeReference("Locals", "locals", frame, locs)) + scopes.append(RegisterReference("Registers", frame)) return [x.to_object() for x in scopes] diff --git a/gdb/testsuite/gdb.dap/scopes.exp b/gdb/testsuite/gdb.dap/scopes.exp index 2c4b9ed81a5..cf9174f06a2 100644 --- a/gdb/testsuite/gdb.dap/scopes.exp +++ b/gdb/testsuite/gdb.dap/scopes.exp @@ -52,12 +52,20 @@ set scopes [dap_check_request_and_response "get scopes" scopes \ [format {o frameId [i %d]} $frame_id]] set scopes [dict get [lindex $scopes 0] body scopes] -gdb_assert {[llength $scopes] == 1} "single scope" +gdb_assert {[llength $scopes] == 2} "two scopes" -set scope [lindex $scopes 0] +lassign $scopes scope reg_scope gdb_assert {[dict get $scope name] == "Locals"} "scope is locals" +gdb_assert {[dict get $scope presentationHint] == "locals"} \ + "locals presentation hint" gdb_assert {[dict get $scope namedVariables] == 3} "three vars in scope" +gdb_assert {[dict get $reg_scope name] == "Registers"} \ + "second scope is registers" +gdb_assert {[dict get $reg_scope presentationHint] == "registers"} \ + "registers presentation hint" +gdb_assert {[dict get $reg_scope namedVariables] > 0} "at least one register" + set num [dict get $scope variablesReference] set refs [lindex [dap_check_request_and_response "fetch variables" \ "variables" \ @@ -98,4 +106,10 @@ set refs [lindex [dap_check_request_and_response "fetch contents of dei" \ set deivals [dict get $refs body variables] gdb_assert {[llength $deivals] == 2} "dei has two members" +set num [dict get $reg_scope variablesReference] +# The request succeeding is sufficient. +dap_check_request_and_response "fetch first register" \ + "variables" \ + [format {o variablesReference [i %d] count [i 1]} $num] + dap_shutdown -- 2.39.1