From patchwork Thu Nov 21 12:46:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Vrany X-Patchwork-Id: 101641 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 2B0483857025 for ; Thu, 21 Nov 2024 12:48:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B0483857025 X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.129.114]) by sourceware.org (Postfix) with ESMTP id DA68A3857833 for ; Thu, 21 Nov 2024 12:47:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DA68A3857833 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=labware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=labware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DA68A3857833 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732193258; cv=none; b=j4rfR+z9AIvbx2xBIc7kjLa7bdg6N7r4gZUJVEI9r68hOri8bS2G4HK4g9krf4I5prZrCLwEpCaOwNfRYW7SI10VgsoVAnkfXGTBpAgK2vpnC3FHBS3K0cLVAGdqwc6gelcR6E6vBUTN++5FkhznHn9vqPavXiwZOsRJVnfAEu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732193258; c=relaxed/simple; bh=PISASUI4Gc+dLDW3zhwm0AgfcJ8UwFaLozhoRDyLuzY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=M4onAtsz/QBiMqT5nPkL3RS3+HrVTDtZIOFNoxMro4okFN90z401JyvUIYwMEqOy/tRaH1B2Hg1YgzhiDDzQkwpbIzwHlyXDuLZ9HCSTf8N0pEk8NuA/mYYlcWqISmUn9/5L8NDu0Xy8WKwVImyhN8u2fyCKxAM61V31eNeRFoE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA68A3857833 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2173.outbound.protection.outlook.com [104.47.59.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-437-YSoy7Hq7OKKLRhSXZVaCpQ-2; Thu, 21 Nov 2024 07:47:36 -0500 X-MC-Unique: YSoy7Hq7OKKLRhSXZVaCpQ-2 X-Mimecast-MFC-AGG-ID: YSoy7Hq7OKKLRhSXZVaCpQ Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by SA1PR17MB6504.namprd17.prod.outlook.com (2603:10b6:806:337::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.22; Thu, 21 Nov 2024 12:47:34 +0000 Received: from SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26]) by SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26%5]) with mapi id 15.20.8158.023; Thu, 21 Nov 2024 12:47:34 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany , Eli Zaretskii Subject: [RFC v2 02/21] gdb/python: add subblocks property to gdb.Block Date: Thu, 21 Nov 2024 12:46:55 +0000 Message-ID: <20241121124714.419946-3-jan.vrany@labware.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241121124714.419946-1-jan.vrany@labware.com> References: <20241121124714.419946-1-jan.vrany@labware.com> X-ClientProxiedBy: LNXP265CA0003.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5e::15) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|SA1PR17MB6504:EE_ X-MS-Office365-Filtering-Correlation-Id: b1600a7f-d550-42d2-ef2d-08dd0a2aabbf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014 X-Microsoft-Antispam-Message-Info: mqheakM3iWHamm2Sk7FGc9r6WKn8PumfKci2TXgzL5WbMISPXEK37vuS96a6Opict/YeZAxEDuK7DzlEKv+uMsJGqf1DEuQZEkUwVOEgE2U6HExTOKC5nZ6MbRxJ8ywRCLNObP2nhOX+qjydUEnWRxyXk7tn4I3BvyIxIVNtIYLX5KF84hFBfRxo4K7NYNV/IrSCde3OkEoQwj0fAH9xuOcauJGhCHpV9Ly5enfXZlvCUrO00TRyOeeJA/0zYHewS0Cj61fnW1R4yjSAlw99diVezm7BInBI9qyANicZkg5XweTynhCj31xHSk7cejzZup4h8WFQjE31MIQdAbQagjU7d64u9EXeSvdPDImHsVxDBeHxHg0wvisZAAWz1G3of1AwNYNVjtGtOF+5evt4tytOppTp1/hdTsyJ71tRrjexF3hzktq58dRTAzfTaN0jCRC+xP/wxzu1N9JrCG7x4qECqT+szrfEHNpMwwx+hHYuoyndpX9r4lLaJdMLQwUg1E8SttB8qsjp7G7I2YjxFfswa+Vm5Ep5Sm88kFKOIupJrMRZgooWBeKqwoEDwE0Wrp5fDugOqvfa6tEmAl3FFfQjEZkQKdg+I3A+/vGk+ZQB9NtssgNPiI0n81IrSacftv6KE2jBfeJf9boqPEsNzJ2JqhwPKQX9sGI9pd/viK1aZY+tdMMRfEPcEgm8R9keoaLnMw6xCgkkC/UuYgDN6HFcJmOEEXHtobxx/zfLXftQ1nniMzdQ4k9G08UzEo5gyWXVA239o4l8q90vTodKMno+APLLDi3uwCM5vhylh9xysjFTG8rRCuiksk2UcaoK0nzHEppQ/s5eTMUhLQLHfIWQKQZOhdH4FBiAxnlaRy5+ch7/pd+P3PRIvvw8WbovWeBI+fiwcXsBsQSMTALongk/mVP6d91bIHN1zVrSm5UUCUkCi2TLn2bqPwsp9d2VJTMeArko81xIM4CGbG0M++g87W1ImRb12FklfZcpCFT7U1vp8yRwbKeDTPTnnqLCnUWsCKBeOaB381IPGvgXV0t398REGbjo2XtTrvFMv2Smj/IROrYOjYFXaVAigN1/6m4+HG9ZcNGECF77X3Zv0hg7zdYfrdFQw+LInuJEX+XBxc/8g+ZHZMHPsokVfn1l9DGRPavlP/THsweCstn1Kpjj76Y09iqlB7tEabz85haFYbMH98xtadyKX7lvrxm2oaYFw4IFo/e/bh47bn66CqFSyC3KnvQZMxtNHgJK3vaqHa6neRiFbbghPiTmBoBrrOH9kMfBn745Ajff7o9tUKwnPeoTnc+iiYfp2lHInHK3oKbTOUSK2AAcr/VImyvp X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA0PR17MB4314.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m0T3QiAtRdtIp1Q87Z2hIxkM53+qWBPuS0/CQENbqkITtsc0giUNEbFEOY0CkvTfsd6kc3DFP298E8eajHdepyVpmm3zKRdcsF6JdU1AfYbJRmRymcEYLQutv57y978J77KLT7W14GCnkVQLd9QQkUfm4en3IELtAT5NONQhS6W/0PpAo7effGSvMH5lYprs4nu1VQmN2kr434gNJB3yRQnTQUmUvRUXFZjABNVLIIE2dlBvvp+pvBmovzovlnkaxm/h1cu1QvgXvBIwnz3qvd4OmNucalJb1lyi8xrywSmRhlRubtURx0t1wKhM0g5kszruKZyezeTfyOJD+b6m0G2wMHUO27rQz8GInbevgay+ojJCNhoQXOWhRH/gb4zod99Y99mqeBw8/77/Cr05umIEeUyIgWb8r45IXauCiZtmoxfn4rmA5dFFt7NvBPJpYNxGIIO+Gi8Y52z4SUXyndIufWKFFpoAPgYjGYNSEAU08FMYT+/1RkT5JClHSge2dRo3BBjcoXRMbj5eXb7eFROOjkEFRbFHziKWIEqfYOSUuO7HTcoBGmi4WTCJykO0BU7/oE4tiI4F/7OIrFKV0LDm9G0rHEPls85HrhKgIejkjwZNmxHi3HWcoHj8o0vqcMTyq0M/wZs0B8UFwnIwL5HHPGHYAh9Y6UribeBJeg13Jy972ACalmkUJaU/VBdRsKoe8Qr35bN7Y9mZC98xHyv3mbAF+4vLgExhQ0ocEg9r6NmSnQOenzc4Tz70fdNLaVn6/yol5e8Einnd90aWOkuPUgVNJFZEdihPEzAcQSraRcotSWL+VjUmN5qAicH0j/RJmnxAUfkFreUwJmdlpUwpCQ8OSC4QDZVFdYvvTOKAyCbWiLmOdx9lkIdpDZVxTbraTK12yN3OOU2KTbwOC1ViKe0RnX9qVyWYE/fbLRDWdMsZP/SrwtnYfVkTbVMKq6fOWzyR6TMxIrTfaLEAsJU0mtv4FUnuswdXg4j8vfhrE+EUIbz2Pt/BQJ3l7ubyScSOV4qDi1XHGEe23KlF+YQA+v0wCj6qKRv/oYwXX3Vx92WPPGCm+oVlNOSCixD+wrsNI7di40mgajscu9GGtc5b23v47XAD8OeqWGx5sx1yRDKhGyzU9cOZ5ZU1U82ncSzE0DYJkiXo+y5YDekuDcgu4j4byYfqw86zngZr6TfocjL4BC2ia5TGTYV6+8Cjm9sLXGO25dHjyEgOZvejEY2R6lrL2cRelrzQskIbyhEkvPXKy5Vqyc1uH0cdKLk266/1wyiqo43o63GyrNk9VjPva5+smaZUOz298j88AhpwcRd1flw1iKjVdOKpme9b8Lx+rkgUhGfHYvG8Iytf6336CGlOMTgbAvhEAdwzYpzO5uMbxgfRelMAVMz5C1/cQvMtlUZ0Q81eL6UIBQaULTn6S+pdZn9LwhCX7LaYQd2D9VkZtvmG+SEmtYN1PuVADbT/6ocXOWxvxDrm1nJCQyFZzbC3D01zzHzO41rBRnpEby4+sRuX8+W6DVS7cCcj2C0MirVcry2dppyLqyFNi1LXUvE1xdFa0fGAY81rCJJvMI7i+8wG4pKNCexOA+up X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1600a7f-d550-42d2-ef2d-08dd0a2aabbf X-MS-Exchange-CrossTenant-AuthSource: SA0PR17MB4314.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2024 12:47:34.3664 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5db0322-1aa0-4c0a-859c-ad0f96966f4c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EvVLaBX+vFLrehdCZTnS3p/1uz4aJnggOWJtNOso08jhrDKohP7NWG8poB5lxbbNRqHo3jYjyn03KEzuOHm/WQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR17MB6504 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8LVCGc2iW-JUo7lDQTnM70fJ-BfJ6fr4SVPJ3vouQDg_1732193256 X-Mimecast-Originator: labware.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, 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: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org This commit adds new propery "subblocks" to gdb.Block objects. This allows Python to traverse block tree starting with global block. Reviewed-By: Eli Zaretskii Reviewed-By: Eli Zaretskii --- gdb/NEWS | 3 +++ gdb/doc/python.texi | 5 +++++ gdb/python/py-block.c | 30 +++++++++++++++++++++++++++ gdb/testsuite/gdb.python/py-block.exp | 4 ++++ 4 files changed, 42 insertions(+) diff --git a/gdb/NEWS b/gdb/NEWS index 046daad0eae..c9e0439645f 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -83,6 +83,9 @@ ** The 'qualified' argument to gdb.Breakpoint constructor will no longer accept non-bool types. + ** Added gdb.Block.subblocks. Returns a list of blocks contained in that + block. + * Debugger Adapter Protocol changes ** The "scopes" request will now return a scope holding global diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi index cc455483166..290e9fea62f 100644 --- a/gdb/doc/python.texi +++ b/gdb/doc/python.texi @@ -6040,6 +6040,11 @@ The block containing this block. If this parent block does not exist, this attribute holds @code{None}. This attribute is not writable. @end defvar +@defvar Block.subblocks +A list of blocks nested in this block. If there are no blocks nested, +this attribute holds an empty list. This attribute is not writable. +@end defvar + @defvar Block.global_block The global block associated with this block. This attribute is not writable. diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c index aeb9acb7260..1c5eab44b3a 100644 --- a/gdb/python/py-block.c +++ b/gdb/python/py-block.c @@ -149,6 +149,34 @@ blpy_get_superblock (PyObject *self, void *closure) Py_RETURN_NONE; } +static PyObject * +blpy_get_subblocks (PyObject *self, void *closure) +{ + const struct block *block; + + BLPY_REQUIRE_VALID (self, block); + + gdbpy_ref<> list (PyList_New (0)); + if (list == nullptr) + return nullptr; + + compunit_symtab *cu = block->global_block ()->compunit (); + + for (const struct block *each : cu->blockvector ()->blocks ()) + { + if (each->superblock () == block) + { + gdbpy_ref<> item (block_to_block_object (each, cu->objfile ())); + + if (item.get () == nullptr + || PyList_Append (list.get (), item.get ()) == -1) + return nullptr; + } + } + + return list.release (); +} + /* Return the global block associated to this block. */ static PyObject * @@ -529,6 +557,8 @@ static gdb_PyGetSetDef block_object_getset[] = { "Whether this block is a static block.", NULL }, { "is_global", blpy_is_global, NULL, "Whether this block is a global block.", NULL }, + { "subblocks", blpy_get_subblocks, nullptr, + "List of blocks contained in this block.", nullptr }, { NULL } /* Sentinel */ }; diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp index 0e6851ddf8b..20f21711126 100644 --- a/gdb/testsuite/gdb.python/py-block.exp +++ b/gdb/testsuite/gdb.python/py-block.exp @@ -61,6 +61,10 @@ gdb_py_test_silent_cmd "python sblock = block.static_block" \ "Get block, static_block" 1 gdb_test "python print (gblock.is_global)" "True" "is the global block" gdb_test "python print (sblock.is_static)" "True" "is the static block" +gdb_test "python print (len(gblock.subblocks) > 0)" "True" \ + "global block contains at least one block" +gdb_test "python print (sblock in gblock.subblocks)" "True" \ + "global block contains at static block" # Move up superblock(s) until we reach function block_func. gdb_test_no_output "python block = block.superblock" "get superblock"