From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2066.outbound.protection.outlook.com [40.107.21.66]) by sourceware.org (Postfix) with ESMTPS id 602B43856259 for ; Fri, 6 May 2022 08:55:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 602B43856259 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=mHUz2dIamT5D/YDM/O84IsMGpmjNyXitHWqpiSM8RWZ9Zr/2CJtyb5A46gR1CmHVQtxIekXJYtfhXRjAgOT7Kr5/c6Oe+AuUYrU/GbIfgNw44HTJ58KKsyp6N+CxZasOCtQ6IAU21Kz7hzRvfWV5fgXq7mU96DdfodD1L9azfi1sbFy8e2Fpbfp/O7bAspBTjrWKyqaAG7mjl38NimPRZXL5IA/z7XBaFP+PIgz3D5jy1Ro1PgrLyLgTKZCjPeHqltHGgcr/o/4Ph/X0TerBUS2I6ffbI6HgI1ALr7vLCyGkUR52PQsNk+Yn9gycwTHHl5yTGVPOmw5HHtSoB/ioxA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vBSq6k8bGACXZz8ax5jnVYHonY8egtGJrQigBYQBt9k=; b=bfHIDfuNgv6w/i2S+hbWRsXO2cE3pRGzr4kl1S8OvkAtcq6A5T4RpI/rrw4yneaHUFiJr/rQBowUAhCgS+2X5gpCTGZv1W0l3gMT6oeCfQkAGam9d7z/xBGrvERX7SBoo0RPLtskuR+DoZq6+144Eme8vRVaYJMOiDdhjQ8JBAGM54rIiIXOx1/ITqg6jT38cA6LI6Xh2ZyyV+hzyO5irMx6lLCeQIdPdNObMmGSk8inLB508uv+vIkJnUURX1ZJgJ6QJ4wtd07tXr/tanI34FwCbwL1zsfTludts595nkxgZJrezFBFfAzYeDgeE6VYvrC87C/xXZ6gw8zAbk9OPQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1, 1, smtp.mailfrom=arm.com] dmarc=[1, 1, header.from=arm.com]) Received: from AS9PR07CA0006.eurprd07.prod.outlook.com (2603:10a6:20b:46c::7) by DB9PR08MB6974.eurprd08.prod.outlook.com (2603:10a6:10:2c1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Fri, 6 May 2022 08:55:27 +0000 Received: from VE1EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:46c:cafe::6d) by AS9PR07CA0006.outlook.office365.com (2603:10a6:20b:46c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.20 via Frontend Transport; Fri, 6 May 2022 08:55:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT019.mail.protection.outlook.com (10.152.18.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Fri, 6 May 2022 08:55:26 +0000 Received: ("Tessian outbound facaf1373bbd:v118"); Fri, 06 May 2022 08:55:26 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 645d8225fd20d95e X-CR-MTA-TID: 64aa7808 Received: from 95186c7bb88a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A27976F5-EFEC-4CF1-9E8E-E86B04B3AA86.1; Fri, 06 May 2022 08:55:17 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 95186c7bb88a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 06 May 2022 08:55:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZMkgGUREU6GfoD7FIb88yinfGOrpLzlE+G6FdzHZYw8k7KlfZQWduZZ6aU7niLKS+nBbrcpaN0hHHKpTMQoMKfJ0D66H/uVh1RvTovbAfwijQ5hsrD/jAC9CwXoklbaYY1o0mqBlQMB2b2oE5hctgRzwWKl4LWUIMbntoYENm+ywSGkqQu9E6ZGOxGjSdFCKVGUvJvc9z8pMRPBJ73HJDMThs7xnjv15jMvN80wZDzkRlJh5ySBfTYVBbbYTxOqPXmzqKWxrKGztDmwEJvLMFS9y8Ct4Hj4RmbREorp5SxXsfDG25z6JScyf0MoLEVFbSDE31w5RQ/bmSUNKbioWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vBSq6k8bGACXZz8ax5jnVYHonY8egtGJrQigBYQBt9k=; b=L3nwkZz7s6veVRNGtHL21mFQaf9mXK9Edmy6TSesbX4JJ0OSS2J6KwnKnkd+UV1TqQSK6NTHX5Sz4yM6/12uisRUg5t1wP3xN/5xD3fb7SxXUQT4iChOJHeV2xGxzKAH071dEnDSGn2n9qdiVsbul+T0sHdDg25eqJu69sVynNy5B8ovkXdvPDKqYm9eB7HXmsdA8e+v7uJtWPjHQoxNserGKtjwKI7fWS4P1vSY36gZVZ+28ngeeNrDnVtHdyVvr6DcsaB43S/Pq4O1lZ006fWP1vFteoEXB9TdlNpXZg5deygBuIN+IVX0/nqwI/aqs6REsmCHR83XDXeCxWxeHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none Received: from AM6PR02CA0021.eurprd02.prod.outlook.com (2603:10a6:20b:6e::34) by DB6PR0801MB1800.eurprd08.prod.outlook.com (2603:10a6:4:38::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25; Fri, 6 May 2022 08:55:14 +0000 Received: from VE1EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:6e:cafe::ee) by AM6PR02CA0021.outlook.office365.com (2603:10a6:20b:6e::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.20 via Frontend Transport; Fri, 6 May 2022 08:55:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT049.mail.protection.outlook.com (10.152.19.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Fri, 6 May 2022 08:55:13 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Fri, 6 May 2022 08:55:13 +0000 Received: from e129171.cambridge.arm.com (10.2.80.41) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.27 via Frontend Transport; Fri, 6 May 2022 08:55:13 +0000 From: Luis Machado To: CC: , , , Subject: [PATCH, v4] Fix reverse stepping multiple contiguous PC ranges over the line table Date: Fri, 6 May 2022 09:55:06 +0100 Message-ID: <20220506085506.9184-1-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: c6f669bf-5f0e-425a-d5a1-08da2f3e2a16 X-MS-TrafficTypeDiagnostic: DB6PR0801MB1800:EE_|VE1EUR03FT019:EE_|DB9PR08MB6974:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 8X3vv3WB3DE+MriZhuzNwTweXIwXJTXzquggIQ0MVJwF9PPGXpN1De8gvb0tBdFiWOlQewoxVu28KX8QGQ+jgEWbCJxotphpe0uRTXA+EfLgSvK5G0Lf4sJwwi5XpaMY7odpoiMWfQV60c17ohbG0XifxRq4af0bgbt49KvoYtsjLvMQ9nx9qHH//WjX+cXkWzCwyHbTIutYX3K3f/d7pf5lzIhuhhik+KWNX+38vkqCp8+K5+4gIl212dSl3xLZ27oCRXcOX8YK68dFEfUk1BTTzFuaj6AxcUAC88ehsrXf6oD40nBRK1M5giLTr9ftfv2y6fe7SIzq+gXa/G+/8NACC/jA6GNy8WlK+nkU5u9jPV4+1QkBcfAoKJu/N3nxw4UNs7pOsgKNmOz4b9Ech6ru+uqqvo0+7cM9lE1uqVmifhGEiBkODo2ngRfThOme/JE5D/yHRzRNHbvg5OdO9BLUoOEqj736B8tvwIOKHx7EfU0EFEFNupi8KHBxMRSJJRAe/PP7Zsjpk0L8kYu/4wnpQpRM4QfYjK+9ki5sXUKUQRJ6K43YIn6YuvcQiTnLAZ8WF+DFu8c6f3sYUdSrVsq0ZqE5frBlKNFIz5uP17w2U9iKvXZU7pzba+MYfnGIxI9AJ6ySDDQg2O8Bxfl3Vw7TNhqb+eDm3I/Ju1/QK6IIq9pSzhoFboq3vbtBoApmCeO+C2Sa+tlkquBvCELrsVW7Wn2/7HjEAvCRjRQU82YyNx2aI72BfupDtK3/DBFYndIDXNohLvRWQKXCuLayAlcIsWkUOny3HixMy4hVJjFcbVrxxdgki6XwM+yCfhQM X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(2616005)(84970400001)(1076003)(8936002)(336012)(30864003)(186003)(426003)(47076005)(81166007)(82310400005)(5660300002)(44832011)(70206006)(70586007)(6916009)(40460700003)(316002)(4326008)(2906002)(8676002)(86362001)(26005)(356005)(7696005)(508600001)(6666004)(83380400001)(36756003)(54906003)(36860700001)(2004002)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1800 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 2459a62d-46ee-4846-2d10-08da2f3e2268 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b/dUj3NQ8s0QzKqogNkQ+rANh85jLeDPIudP8B/MOzRZrSRE1k6tbl0aGZ+Ut4Wi5EkBU/8AMs//+j9iGDt9+ZXljytjWuvH6D5jIe4WKRkuMuZe/J298AFnMFWxeh50jn9nsEdJFgrYoudzIzDYF0QOE3LkgObcjDKgDGpQhotl1rfuX4gcqKHsYX6GzD1xbS2QmquQ3emOgr5z+pk6ylnkm++u5zwj2FoGKRlYHfRuXP8tiZroc4eZILrctQmf4Kj8KPTQrWxIq/4xsKtdiSJXmULEDJFIu6ZKICeob4FAdnL6lMVR7Gkglj2vA0+DufCfuNj622mmK+QXIfu1wSk5RnVqq8bMS+QuOYk7EDKLFhyEiaILtaozKbawrEpnUta26lBG7PYbbIWWaqtT2znoLtj4kAowhNPlrVnCvYQnWa3G6KLrZpbpkRicqgLPPfA7N0KqHsRB/0dnH49Uh3hf2QntkxxLj9iqlEJgJkR0nC5pZNuBNDkQZ3PGSpaDp880nBN3aZvO+bCnGey2vvL41ZJBopX8xLCUk2mO/KfrWV26yAy8f6ZMNpGLXBUSx/gW3ImlXgUdHnthEePZCf+ta7jUe2Gl215/deEaPx5TxnNPP/E4N+Ub3Qu2etr7DWS6fNihdt28t8mQPZ+Z6kQrVEjkVY2CQc6/RgsDeZWa29clhbNGUJExTEV3rZuO7bi6T+OS4gPnmLTyqc67CjrsI7HWdxY2vlsH5TGwl2mqOhD+1i9mo2MY1ScqLKkK+QF/H4VYrNX+7VtxKvS999G+z/xWVo7xhn2KFPjPRB4= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(70586007)(84970400001)(70206006)(4326008)(6666004)(8676002)(5660300002)(508600001)(54906003)(40460700003)(316002)(6916009)(82310400005)(8936002)(81166007)(86362001)(26005)(186003)(2906002)(2616005)(1076003)(107886003)(36756003)(83380400001)(47076005)(426003)(336012)(36860700001)(30864003)(44832011)(7696005)(2004002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2022 08:55:26.5566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6f669bf-5f0e-425a-d5a1-08da2f3e2a16 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6974 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Fri, 06 May 2022 08:55:35 -0000 v4: - Updated testcase to make it a bit longer so it can exercise reverse-stepping multiple times. - Cleaned up debugging prints. v3: - Updated testcase. The format for writing the DWARF program body in the testcase expect file changed. See commit gdb/testsuite/dwarf: simplify line number program syntax (commit d4c4a2298cad06ca71cfef725f5248f68205f0be) v2: - Check if both the line and symtab match for a particular line table entry. -- When running GDB's testsuite on aarch64-linux/Ubuntu 20.04 (also spotted on the ppc backend), I noticed some failures in gdb.reverse/solib-precsave.exp and gdb.reverse/solib-reverse.exp. The failure happens around the following code: 38 b[1] = shr2(17); /* middle part two */ 40 b[0] = 6; b[1] = 9; /* generic statement, end part two */ 42 shr1 ("message 1\n"); /* shr1 one */ Normal execution: - step from line 38 will land on line 40. - step from line 40 will land on line 42. Reverse execution: - step from line 42 will land on line 40. - step from line 40 will land on line 40. - step from line 40 will land on line 38. The problem here is that line 40 contains two contiguous but distinct PC ranges in the line table, like so: Line 40 - [0x7ec ~ 0x7f4] Line 40 - [0x7f4 ~ 0x7fc] The two distinct ranges are generated because GCC started outputting source column information, which GDB doesn't take into account at the moment. When stepping forward from line 40, we skip both of these ranges and land on line 42. When stepping backward from line 42, we stop at the start PC of the second (or first, going backwards) range of line 40. This happens because we have this check in infrun.c:process_event_stop_test: /* When stepping backward, stop at beginning of line range (unless it's the function entry point, in which case keep going back to the call point). */ CORE_ADDR stop_pc = ecs->event_thread->stop_pc (); if (stop_pc == ecs->event_thread->control.step_range_start && stop_pc != ecs->stop_func_start && execution_direction == EXEC_REVERSE) end_stepping_range (ecs); else keep_going (ecs); Since we've reached ecs->event_thread->control.step_range_start, we stop stepping backwards. The right thing to do is to look for adjacent PC ranges for the same line, until we notice a line change. Then we take that as the start PC of the range. Another solution I thought about is to merge the contiguous ranges when we are reading the line tables. Though I'm not sure if we really want to process that data as opposed to keeping it as the compiler created, and then working around that. In any case, the following patch addresses this problem. Validated on aarch64-linux and x86_64/Ubuntu 20.04/18.04. Carl Love has verified that it does fix a similar issue on ppc. Ubuntu 18.04 doesn't actually run into these failures because the compiler doesn't generate distinct PC ranges for the same line. I see similar failures on x86_64 in the gdb.reverse tests (gdb.reverse/step-reverse.exp and gdb.reverse/step-reverse.exp). Those are also fixed by this patch. The included testcase (based on a test Carl wrote) exercises this problem for Arm, ppc and x86. It shows full passes with the patch applied. Co-authored-by: Carl Love --- gdb/infrun.c | 22 ++- gdb/symtab.c | 49 +++++++ gdb/symtab.h | 16 +++ gdb/testsuite/gdb.reverse/map-to-same-line.c | 55 +++++++ .../gdb.reverse/map-to-same-line.exp | 136 ++++++++++++++++++ 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.reverse/map-to-same-line.c create mode 100644 gdb/testsuite/gdb.reverse/map-to-same-line.exp diff --git a/gdb/infrun.c b/gdb/infrun.c index 02c98b50c8c..e9e14e58745 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6917,11 +6917,31 @@ process_event_stop_test (struct execution_control_state *ecs) have software watchpoints). */ ecs->event_thread->control.may_range_step = 1; + /* When we are stepping inside a particular line range, in reverse, + and we are sitting at the first address of that range, we need to + check if this address also shows up in another line range as the + end address. + + If so, we need to check what line such a step range points to. + If it points to the same line as the current step range, that + means we need to keep going in order to reach the first address + of the line range. We repeat this until we eventually get to the + first address of a particular line we're stepping through. */ + CORE_ADDR range_start = ecs->event_thread->control.step_range_start; + if (execution_direction == EXEC_REVERSE) + { + gdb::optional real_range_start + = find_line_range_start (ecs->event_thread->stop_pc ()); + + if (real_range_start.has_value ()) + range_start = *real_range_start; + } + /* When stepping backward, stop at beginning of line range (unless it's the function entry point, in which case keep going back to the call point). */ CORE_ADDR stop_pc = ecs->event_thread->stop_pc (); - if (stop_pc == ecs->event_thread->control.step_range_start + if (stop_pc == range_start && stop_pc != ecs->stop_func_start && execution_direction == EXEC_REVERSE) end_stepping_range (ecs); diff --git a/gdb/symtab.c b/gdb/symtab.c index 4b33d6c91af..de4cb5dd0eb 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3433,6 +3433,55 @@ find_pc_line (CORE_ADDR pc, int notcurrent) return sal; } +/* Compare two symtab_and_line entries. Return true if both have + the same line number and the same symtab pointer. That means we + are dealing with two entries from the same line and from the same + source file. + + Return false otherwise. */ + +static bool +sal_line_symtab_matches_p (const symtab_and_line &sal1, + const symtab_and_line &sal2) +{ + return (sal1.line == sal2.line && sal1.symtab == sal2.symtab); +} + +/* See symtah.h. */ + +gdb::optional +find_line_range_start (CORE_ADDR pc) +{ + struct symtab_and_line current_sal = find_pc_line (pc, 0); + + if (current_sal.line == 0) + return {}; + + struct symtab_and_line prev_sal = find_pc_line (current_sal.pc - 1, 0); + + /* If the previous entry is for a different line, that means we are already + at the entry with the start PC for this line. */ + if (!sal_line_symtab_matches_p (prev_sal, current_sal)) + return current_sal.pc; + + /* Otherwise, keep looking for entries for the same line but with + smaller PC's. */ + bool done = false; + CORE_ADDR prev_pc; + while (!done) + { + prev_pc = prev_sal.pc; + + prev_sal = find_pc_line (prev_pc - 1, 0); + + /* Did we notice a line change? If so, we are done with the search. */ + if (!sal_line_symtab_matches_p (prev_sal, current_sal)) + done = true; + } + + return prev_pc; +} + /* See symtab.h. */ struct symtab * diff --git a/gdb/symtab.h b/gdb/symtab.h index b1cf84f756f..226fe8803db 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2285,6 +2285,22 @@ extern struct symtab_and_line find_pc_line (CORE_ADDR, int); extern struct symtab_and_line find_pc_sect_line (CORE_ADDR, struct obj_section *, int); +/* Given PC, and assuming it is part of a range of addresses that is part of a + line, go back through the linetable and find the starting PC of that + line. + + For example, suppose we have 3 PC ranges for line X: + + Line X - [0x0 - 0x8] + Line X - [0x8 - 0x10] + Line X - [0x10 - 0x18] + + If we call the function with PC == 0x14, we want to return 0x0, as that is + the starting PC of line X, and the ranges are contiguous. +*/ + +extern gdb::optional find_line_range_start (CORE_ADDR pc); + /* Wrapper around find_pc_line to just return the symtab. */ extern struct symtab *find_pc_line_symtab (CORE_ADDR); diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.c b/gdb/testsuite/gdb.reverse/map-to-same-line.c new file mode 100644 index 00000000000..fa751ffe842 --- /dev/null +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.c @@ -0,0 +1,55 @@ +/* Copyright 2022 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 . */ + +/* The purpose of this test is to create a DWARF line table that contains two + or more entries for the same line. When stepping (forwards or backwards), + GDB should step over the entire line and not just a particular entry in the + line table. */ + +int +main () +{ /* TAG: main prologue */ + asm ("main_label: .globl main_label"); + int i = 1, j = 2, k; + float f1 = 2.0, f2 = 4.1, f3; + const char *str_1 = "foo", *str_2 = "bar", *str_3; + + asm ("line1: .globl line1"); + k = i; f3 = f1; str_3 = str_1; /* TAG: line 1 */ + + asm ("line2: .globl line2"); + k = j; f3 = f2; str_3 = str_2; /* TAG: line 2 */ + + asm ("line3: .globl line3"); + k = i; f3 = f1; str_3 = str_1; /* TAG: line 3 */ + + asm ("line4: .globl line4"); + k = j; f3 = f2; str_3 = str_2; /* TAG: line 4 */ + + asm ("line5: .globl line5"); + k = i; f3 = f1; str_3 = str_1; /* TAG: line 5 */ + + asm ("line6: .globl line6"); + k = j; f3 = f2; str_3 = str_2; /* TAG: line 6 */ + + asm ("line7: .globl line7"); + k = i; f3 = f1; str_3 = str_1; /* TAG: line 7 */ + + asm ("line8: .globl line8"); + k = j; f3 = f2; str_3 = str_2; /* TAG: line 8 */ + + asm ("main_return: .globl main_return"); + return 0; /* TAG: main return */ +} diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.exp b/gdb/testsuite/gdb.reverse/map-to-same-line.exp new file mode 100644 index 00000000000..efaa60a957f --- /dev/null +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.exp @@ -0,0 +1,136 @@ +# Copyright 2022 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 . + +# The purpose of this test is to create a DWARF line table that contains two +# or more entries for the same line. When stepping (forwards or backwards), +# GDB should step over the entire line and not just a particular entry in the +# line table. + +load_lib dwarf.exp + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + unsupported "dwarf2 support required for this test" + return 0 +} + +if [get_compiler_info] { + return -1 +} + +# The DWARF assembler requires the gcc compiler. +if {!$gcc_compiled} { + unsupported "gcc is required for this test" + return 0 +} + +standard_testfile .c .S + +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { + return -1 +} + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcdir subdir srcfile + declare_labels integer_label L + + # Find start address and length of program + lassign [function_range main [list ${srcdir}/${subdir}/$srcfile]] \ + main_start main_len + set main_end "$main_start + $main_len" + + cu {} { + compile_unit { + {language @DW_LANG_C} + {name map-to-same-line.c} + {stmt_list $L DW_FORM_sec_offset} + {low_pc 0 addr} + } { + subprogram { + {external 1 flag} + {name main} + {low_pc $main_start addr} + {high_pc $main_len DW_FORM_data4} + } + } + } + + lines {version 2 default_is_stmt 1} L { + include_dir "${srcdir}/${subdir}" + file_name "$srcfile" 1 + + # Generate the line table program with distinct source lines being + # mapped to the same line entry. Line 1, 5 and 8 contain 1 statement + # each. Line 2 contains 2 statements. Line 3 contains 3 statements. + program { + DW_LNE_set_address $main_start + line [gdb_get_line_number "TAG: main prologue"] + DW_LNS_copy + DW_LNE_set_address line1 + line [gdb_get_line_number "TAG: line 1" ] + DW_LNS_copy + DW_LNE_set_address line2 + line [gdb_get_line_number "TAG: line 2" ] + DW_LNS_copy + DW_LNE_set_address line3 + line [gdb_get_line_number "TAG: line 2" ] + DW_LNS_copy + DW_LNE_set_address line4 + line [gdb_get_line_number "TAG: line 3" ] + DW_LNS_copy + DW_LNE_set_address line5 + line [gdb_get_line_number "TAG: line 3" ] + DW_LNS_copy + DW_LNE_set_address line6 + line [gdb_get_line_number "TAG: line 3" ] + DW_LNS_copy + DW_LNE_set_address line7 + line [gdb_get_line_number "TAG: line 5" ] + DW_LNS_copy + DW_LNE_set_address line8 + line [gdb_get_line_number "TAG: line 8" ] + DW_LNS_copy + DW_LNE_set_address main_return + line [gdb_get_line_number "TAG: main return"] + DW_LNS_copy + DW_LNE_end_sequence + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug} ] } { + return -1 +} + +if ![runto_main] { + return -1 +} + +if [supports_process_record] { + # Activate process record/replay + gdb_test_no_output "record" "turn on process record" +} + +gdb_test "tbreak main_return" "Temporary breakpoint .*" "breakpoint at return" +gdb_test "continue" "Temporary breakpoint .*" "run to end of main" + +# At this point, GDB has already recorded the execution up until the return +# statement. Reverse-step and test if GDB transitions between lines in the +# expected order. It should reverse-step across lines 8, 5, 3, 2 and 1. +foreach line {8 5 3 2 1} { + gdb_test "reverse-step" ".*TAG: line $line.*" "reverse step to line $line" +} -- 2.25.1