From patchwork Thu Nov 21 12:47:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Vrany X-Patchwork-Id: 101657 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 7ECB03857022 for ; Thu, 21 Nov 2024 12:52:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7ECB03857022 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.133.114]) by sourceware.org (Postfix) with ESMTP id B201D385771E for ; Thu, 21 Nov 2024 12:48:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B201D385771E 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 B201D385771E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732193316; cv=none; b=DOc7j8MCgZiEcqJsKyxwHamhOl/f4WfBUSMcJsWX6prkCjxfGcC/F7VVyT+oXO//8KB3gvxHhXE3xL34G2Aq8TD0S06jQCgNI1X7msbpQZ/ojjWn4jak5wXbcDdP41/Mn0f40SqAqriPADUjqPxRItEir1y9ug9EQdf0ettJIfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732193316; c=relaxed/simple; bh=FPMOtWUZWIdSino13XK+VzFpgQGy3/dFCvqGMlm/Fz8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=U5+ZAxuJNMlgp0X7h69R8UVE6MrlFQdRPhb/bF4WfxzKNGjYY02tMcJ+42cqdL7LsalhLHgAsPLEqilcTYEYdPZ5bxS0tfpkp7JkFwKly0EwcMTYuG6YcPBptDoDDxyTcBk/0tQ6dINNAP0Y6kyc5Gml5Ux8WEBY3xa2JK+FWu4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B201D385771E Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-zHz6bgSpMdKBkyUTKUPOug-1; Thu, 21 Nov 2024 07:48:35 -0500 X-MC-Unique: zHz6bgSpMdKBkyUTKUPOug-1 X-Mimecast-MFC-AGG-ID: zHz6bgSpMdKBkyUTKUPOug Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by SJ2PR17MB6443.namprd17.prod.outlook.com (2603:10b6:a03:4fc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.27; Thu, 21 Nov 2024 12:48:33 +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:48:33 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany , Eli Zaretskii Subject: [RFC v2 17/21] gdb/python: add add_symbol () method to gdb.Block Date: Thu, 21 Nov 2024 12:47:10 +0000 Message-ID: <20241121124714.419946-18-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: LO4P265CA0223.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:315::9) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|SJ2PR17MB6443:EE_ X-MS-Office365-Filtering-Correlation-Id: ab33c108-9729-46a0-0dc0-08dd0a2acec9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016 X-Microsoft-Antispam-Message-Info: CqNolRtLwH9u26eA0lVf+hhNTq+0C6MyXccm/u4ytF6aLhWGLx4xmq73vy7VIE+E56sTVrv7qZb7w6n/UGOyJOZ08tzXTH6YsCcLAS9B2obK/EZSy2NPx2nTCK+58tzcbl9d8ijLHN5w9Z8LNmWATPG0/pMKLMqPObpnvfygVg2UFapFvBwpr7p3X1mPzFUJWVaSDDnQOMhalvI7Xhw+UbUqoY9oQ7Sb0//zPbaICroRxkO0OMCFjAhGSVGWmsm/sW7Axn16zf2c8N3L+TMLaUnKNG+pN3WvaSpN0bTu6mJaScGubsMjtl1jRxXEJQIH6Lk08XPAsdLGd9YG43Sgo70yM6zKVUgOrkCFXXQAINULBpDTaOlJ/miphCdNGiOCIixUzBOx4DpnZdNy/zlRkagE6aMwv4tAeQ5wwCSv6LAjCOZVoLv9hSTziQbbp4wHWYv3qvMRgLzbUL2TsK/Ld1WDL/zmc8STHupDKklwL6P9rZXRvg4o0sVPuPCg3zUiBcbekd4KPStpeTcwx85gWYH0UuM6L0/aohLGbNOWBwwh4lpLxTo579oYSoqAf6PCZGUW5VAnNPWOIZOKJRrHSW+omjKCzmFNRV/XkdHlTzL7OpiFXGY4Vnogka7H5/fFByTesuWEy6TBZFFFeDdGJ4PzjAmVxpHsW/gSkaRwdn+Z1L0VyYfk9vJ//7x01nBIYlbbq5uZA2O5Km2mAlGX/qzy4BCmy6Ghrgw6dJKAmsuhWYLXtsfuj/HdiViYvjiyKNmYIgcE4wuqwDScBshN8tfopO/PDRkB34oPEgZ0Wny2OxwTr+k2X8si1cbIbgCE++qmUrPDNqCzgKOdBkfQvCtHIUV1NyXUHQ/MyLRUhGKSjsmdAYiYVOR8c/lhcOzn8YBp5Iq8lEMH0o2vtSqfufALZpcFz2f0lfq0YRDxQQsdXLwl775qXZyowcEcGe9TG76dV6i7uwpWku2igNn8s83SSHWOsP69VRX4hcqpM0mBx4ctHee+TLDTKiRJrsv2AlfsOdVHZiHIlfZJ1vx7iKTaVLqlhIq2LSaSVjvOzkVO5xKOeTEkbxEbnc5Y4+p6FWIWSkAczWQm6re52Vgc29NUL3NeGYh90aqdLcis1DItJ0yP/Fi4UGCA2I7XVjwkn8lv8RGx3z+L+iz8/lsgSwe5wWMBDiEoLaTda0fJtehoRSsJwyu2LPvSNDRUrWhbQO9CiC3EiLrybb7gv93R/QmUQTpESTezyFQYDw0uz1K9CC0+YZGLrJbEW3pOLBSSIpeNkBmLD2WGXipPQaeYFQhzgbbTQAHbb0OTEms59Y0= 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)(376014)(1800799024)(366016); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ARsl4c9JlMUSC3JV+uq1X53ToFFFQ/IfrgVkm3oLrOsvpEeTtXnPrGcReKamK+Po9lJ0Tq9eNuYdV5POy9Pq7ZI18TQIXOCzA89i/xjz9JHTLrblqpHU+zas09xXMepEfX9gzncCN13x1Om7e0zNKHe6IP0dxpD1y3iLOAfWQrq3FAOYFxTYdIA7A3WjbEQRLCYTgex7bG0Gav/FnBz3+wHagZUGxzN8KMcYG/r4di7RwZJbotyedUjoyKcFfsW6pIiMDKq33yK6E20hhyiwsgnJoMqAKOywDIUZGR7K/XEPriJGw4X+Gul5VxxCQld7pN1rt2ERNKcwcTgAXMUz7Vrei0bvc87+Xt5cuSN97d86zbkOhF4VQF0H9+j+z7tmYWB8mM9nGC8DcxKG31xpv1TygEGJp5ad/+GNJNzzlmYn9UFbzPzjVQVZWxpzMBXRCypbiVIgaBS65SiV6G9ubBdL0pNUXT6mcUgsfKzH748tic7Tkur08iTti/ir6YUUagKSCSvHBOsuNwYtLuwVl8YNSkVzCy+xisFiLXzxf89tUukWKM08RViditynuQgqOD3XGQUiYc7zC2n55sjbiyG95m5v3BVmdJAeWDWxuHiNzM9RFdqgxQ7DjLkzG+epevi/oU1bSd5+pcv7Kri+q2k81stotAD1pNRyryUzR1lnZjWONO6iNVEFU/kcnpokgR1CgM57ivoF2lEO+zaUmtxBQQzLXDoJA4JrTM7ohyXjDeApELT5voYikzw0ievANtcPnvf2tiamXUGD48Ai6c3TASP2IQ1p5Lhi/UrenkJRl8Q2VRLUFmWt0Q8G+ulAseVCG219eGbhHy7uzYNTbZwjIJ+YZ4o9C0BFkBLMAC9Dwn2Ib+mFaAto2dU9783JS8+U+mw2MezmH15F8wT5ITeTeVP7/J1JPZKH9+F/uNh6fTVU6mzMAbDquIIioieC1qllHNGilYPu1PXtN5YhI6p1azQSitM/5z0UQ6SS4MuGWwQQenajci8BT/oYwmv7rOYj+7DsuOw9rhPGUHrKYxl2SMsLeqzV3A5UZV+2VzzjW/5opkL7jGHIvZeFgfeYCP7qBt74tSNL+RArZ+xJvVV/u4hwanTcyuPLbSKnRP0ESZepk0rH5S2SUdQDAXk11a6rGXtDqZ1gXdzbK1iFxLBp/x3jfcakeVUkYZbtdPbFv0LJ/yhRV8slmgrK8jBl/mc5JG6VEBhCBZM/lhMEuuCaDOixZoP5dydzlizftZmShXpS0ADM1qIOUTdd+VxHWW7NeLo8TB4MuRlUnlLlOBe5WbfGuhoPgh7o5zWyewLEqaTp+YO40H7P17UnF+iRooloep6qZTOej3fnbsbA19pAz8Bykk6FMj2SbsQiS8/aBNtCl/HoXH8lGP/khclTXPrGqBu/73Vsy3AIh+GajZN97+5AfD1vLxeyZ4F73DhRaZjANWcoVCPWAT8+MskwNnFoL0apk33VF0kToyIb6aWlaudO0+JGUn9rMbm1MxTq0f1muww1NuMuyzCgAB3e1SelqAhNdf1vjbMzAhnKm2qRcsutQHIGH1bHW5VgG5vN+nhfekEDXYhhKZlKktA5 X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab33c108-9729-46a0-0dc0-08dd0a2acec9 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:48:33.1494 (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: /Cu2FFWnCH3G0Its7mCA9vWiJVAmda83PH+1iDpsXnl2Efnagl+m45iuz7JdC88RiwWOusN+pVvXwTrLCmwZYw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR17MB6443 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2UtLyb9l0S_lyZgq_dVAee0I-vcDHP7sA76VcGEBsw8_1732193314 X-Mimecast-Originator: labware.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_STOCKGEN, 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 method add_symbol () to gdb.Block objects. A typical use of it is to add previously instantiated gdb.Symbol object to block when interfacing with JIT compiler. Reviewed-By: Eli Zaretskii Reviewed-By: Eli Zaretskii --- gdb/doc/python.texi | 5 +++ gdb/python/py-block.c | 52 +++++++++++++++++++++++---- gdb/testsuite/gdb.python/py-block.exp | 20 +++++++++++ 3 files changed, 71 insertions(+), 6 deletions(-) diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi index 55ca91920cb..43109dc6554 100644 --- a/gdb/doc/python.texi +++ b/gdb/doc/python.texi @@ -6043,6 +6043,11 @@ The new block's @var{start}--@var{end} range must be within superblock's range and must not overlap with any block already contained in superblock. @end defun +@defun Block.add_symbol (symbol) +Add @var{symbol} to this block. Both the block and the @var{symbol} must +belong to the same compunit (@pxref{Compunits In Python}). +@end defun + @defun Block.is_valid () Returns @code{True} if the @code{gdb.Block} object is valid, @code{False} if not. A block object can become invalid if the block it diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c index 626ed10deb6..f3b635f64b8 100644 --- a/gdb/python/py-block.c +++ b/gdb/python/py-block.c @@ -261,6 +261,43 @@ blpy_is_static (PyObject *self, void *closure) Py_RETURN_FALSE; } +/* Implementation of gdb.Block.add_symbol (self, symbol). + Adds SYMBOL to this block. */ + +static PyObject * +blpy_add_symbol (PyObject *self, PyObject *symbol_obj) +{ + const struct block *block; + + BLPY_REQUIRE_VALID (self, block); + + struct symbol *symbol = symbol_object_to_symbol (symbol_obj); + if (symbol == nullptr) + { + return PyErr_Format (PyExc_TypeError, + _("The symbol argument is not valid gdb.Symbol")); + } + + if (symbol->symtab ()->compunit() != block->global_block ()->compunit ()) + { + return PyErr_Format (PyExc_TypeError, + _("The symbol argument belongs to different " + "compunit than block")); + } + + multidictionary *dict = block->multidict (); + if (dict == nullptr) + { + auto_obstack *obstack = + &(block->global_block ()->compunit ()->objfile ()->objfile_obstack); + dict = mdict_create_linear (obstack, nullptr); + const_cast(block)->set_multidict (dict); + } + + mdict_add_symbol (dict, symbol); + Py_RETURN_NONE; +} + /* Given a string, returns the gdb.Symbol representing that symbol in this block. If such a symbol does not exist, returns NULL with a Python exception. */ @@ -358,7 +395,7 @@ blpy_init (PyObject *zelf, PyObject *args, PyObject *kw) return -1; } - static const char *keywords[] = { "superblock", "start", "end", NULL }; + static const char *keywords[] = { "superblock", "start", "end", nullptr }; PyObject *superblock_obj; uint64_t start; uint64_t end; @@ -398,9 +435,9 @@ blpy_init (PyObject *zelf, PyObject *args, PyObject *kw) /* Check that start-end range does not overlap with any "sibling" blocks' range. */ - auto cu = superblock->global_block ()->compunit (); + compunit_symtab *cu = superblock->global_block ()->compunit (); - for (auto each : cu->blockvector ()->blocks ()) + for (const struct block *each : cu->blockvector ()->blocks ()) { if (each->superblock () == superblock) { @@ -415,11 +452,11 @@ blpy_init (PyObject *zelf, PyObject *args, PyObject *kw) } } - auto obstack = &(cu->objfile ()->objfile_obstack); - auto blk = new (obstack) block (); + auto_obstack *obstack = &(cu->objfile ()->objfile_obstack); + struct block *blk = new (obstack) block (); blk->set_superblock (superblock); - blk->set_multidict (mdict_create_linear (obstack, NULL)); + blk->set_multidict (mdict_create_linear (obstack, nullptr)); blk->set_start ((CORE_ADDR) start); blk->set_end ((CORE_ADDR) end); @@ -651,6 +688,9 @@ static PyMethodDef block_object_methods[] = { { "is_valid", blpy_is_valid, METH_NOARGS, "is_valid () -> Boolean.\n\ Return true if this block is valid, false if not." }, + { "add_symbol", blpy_add_symbol, METH_O, + "add_symbol (symbol) -> None.\n\ +Add given symbol to the block." }, {NULL} /* Sentinel */ }; diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp index 3c5d291edb0..6bc98e9563f 100644 --- a/gdb/testsuite/gdb.python/py-block.exp +++ b/gdb/testsuite/gdb.python/py-block.exp @@ -138,6 +138,26 @@ gdb_test "python print ( gdb.Block(cu.static_block(), 160, 170))" \ " \{.*\}>" \ "Create sibling block" +# Test adding symbols to a block. +gdb_py_test_silent_cmd "python symtab = gdb.Symtab(\"some_file.txt\", cu)" \ + "Create new symtab" 1 +gdb_py_test_silent_cmd "python typ = gdb.selected_inferior().architecture().integer_type(0).function()" \ + "Create type of new symbol" 1 +gdb_py_test_silent_cmd "python sym = gdb.Symbol(\"static_block\", symtab, typ, gdb.SYMBOL_FUNCTION_DOMAIN, gdb.SYMBOL_LOC_BLOCK, cu.static_block() )" \ + "Create new symbol" 1 +gdb_test "python print ( sym in list(cu.global_block()) )" \ + "False" \ + "Symbol is not in global block" +gdb_py_test_silent_cmd "python cu.global_block().add_symbol(sym)" \ + "Add new symbol to block" 1 +gdb_test "python print ( sym in list(cu.global_block()) )" \ + "True" \ + "Symbol is in global block" +gdb_test "python print ( cu.global_block().add_symbol(cu))" \ + "TypeError.*:.*" \ + "Add non-symbol to block" + + # Test Block is_valid. This must always be the last test in this # testcase as it unloads the object file. delete_breakpoints