From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kGzjFV/+PGA3JAAAWB0awg (envelope-from ) for ; Mon, 01 Mar 2021 09:46:55 -0500 Received: by simark.ca (Postfix, from userid 112) id 260F51F0B9; Mon, 1 Mar 2021 09:46:55 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,RDNS_NONE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8658B1EF78 for ; Mon, 1 Mar 2021 09:46:51 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 228B9385800C; Mon, 1 Mar 2021 14:46:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 228B9385800C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614610011; bh=bLLOkGT+5m8qJtlQgW1cV2jpCvWrMoAZDk1WB5j9nMI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=VO6tX+cApefxhmjsm3bFPPaJ9CzRh6Qs20uFNWRD3u4ltpLXsX37AyrFOf+cF+zqK ttkh86TGUvXmfEVPoJVKVRcQid9cY0xsFqeyOBxYJfci93oauvTTtlKUIEq9JPCe7j tVGCdUTLiq1sBHMRtAJtWF1s0SlBMwrhRptD9XtE= Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by sourceware.org (Postfix) with ESMTPS id 0675E385800C for ; Mon, 1 Mar 2021 14:46:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0675E385800C ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FNRVJmtML6CTBMEG5mujwgFu/abyHzePC19GmTaaZ5GqfC4cGjWmI4+Kq/6lMhwS2ea3YC0IYkilQtzY0sq9jugNF6kMQhsUmaSMq2ZKEyizlMCNs4L1i3Yptp/bum9WawLGSq5/+kG9x14O0Qh3CUFQ8JBv/Cp5KhcuBs3G+QYP1Mrm3O2D25MacsdlKK2xgfuPxt/7cB3H9iST6EH1NyL1D2mp60qTL5yq7X7bkFxfVYwUg241BJ+g/NrGGiCdhR3vosp77SoLzdIN4b9JiHOL2Apo9dpMQohQH0G/BDtTOAWxYmgGy9jzaqo09VbXDsiYBJvGertooZZhS48I7w== 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-SenderADCheck; bh=bLLOkGT+5m8qJtlQgW1cV2jpCvWrMoAZDk1WB5j9nMI=; b=foTORo/QZ4/2JndJUC9764inmXE5pY33Kdxt37N+Pywt7P4YfH8SCjpl9/BYdhescaJykzRnqEFi/EXt1qA2acYwhStftcCKUdmvKSL9/L4mmk1UpzW+DSlRDkKdGWSXgH/C8LYOb9EPG6T1kvexe+0BkawmPfrGARp4Kwp9/zAPm5zUNvzxZJLi4BjWwymYX6L1Dbd7w1Wp5qvjMfMSjmc4DQEMG7suyp49hADyNh89/wYThZq1+uP25Nb3Jf3r0LQawIrGNcE08mTz8tYUfpfM38mmi1BiRWpS3z0o6yYHgIboHCWxvs+INunLWs2cUWmtA6pyYie7fOwmVF7Ovg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none Received: from DM6PR12MB2762.namprd12.prod.outlook.com (2603:10b6:5:45::15) by DM5PR1201MB0236.namprd12.prod.outlook.com (2603:10b6:4:57::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.28; Mon, 1 Mar 2021 14:46:43 +0000 Received: from DM6PR12MB2762.namprd12.prod.outlook.com ([fe80::31d8:f503:f7b2:f44]) by DM6PR12MB2762.namprd12.prod.outlook.com ([fe80::31d8:f503:f7b2:f44%3]) with mapi id 15.20.3868.033; Mon, 1 Mar 2021 14:46:43 +0000 To: gdb-patches@sourceware.org Subject: [PATCH 04/43] Remove get_frame_cfa from dwarf_expr_context Date: Mon, 1 Mar 2021 14:45:41 +0000 Message-Id: <20210301144620.103016-5-Zoran.Zaric@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210301144620.103016-1-Zoran.Zaric@amd.com> References: <20210301144620.103016-1-Zoran.Zaric@amd.com> Content-Type: text/plain X-Originating-IP: [2a00:23c7:5a85:6801:b4ed:fe7b:8064:d4d] X-ClientProxiedBy: AM0PR04CA0073.eurprd04.prod.outlook.com (2603:10a6:208:be::14) To DM6PR12MB2762.namprd12.prod.outlook.com (2603:10b6:5:45::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a00:23c7:5a85:6801:b4ed:fe7b:8064:d4d) by AM0PR04CA0073.eurprd04.prod.outlook.com (2603:10a6:208:be::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19 via Frontend Transport; Mon, 1 Mar 2021 14:46:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c621432e-b72d-49e6-7a70-08d8dcc0d479 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0236: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GXKtL7FORybLMKPczyemZCXyO95p+SBwiImKE5hazaKSw73KXvz8/Z3M04cBhAlLTLZezpRVOI681l0DYjz6hyuuybtx9MPBGZjdo4lZl3QNbS84KR8C8wseXS80pCk0kq790v/4HqDsWd5XlI/oAJmqg05DHIIwXw1DKTNI2u3nPyi65xlaDx3G9rwIKW6kAC/+B9q+luuLkHz/qff4F5LI5yb310GO8CuKrwJWPHeKZVjWXR6Exq6pLZ3TVQmBag6w8YJWvXPuAmkNRIYuBDNA5GlSVx+D+/rgnnk2WG9oNljjYFoDKg0dW+qGrAd2VKhaSrjApsH1di0XKMQ4HFzbol+yyEY8u8eoevwhH5qEZ5a6Yw5wbwdJXRLMIybyDFy1lyjEp+DJyZ83hi2kz5MaRDNvkborcs203g3aeQ9gR851usR6kYq7ewLM2l9p5W2p55RUzINrLh0RfRN2IDP1jBnz792k/Il7x4gBEV+vWcthcc8hmyARuZV7XNz+NtYXjsg0Mekrmha5HhbHPi94iEC+OxlbISjQ1GuDBCEMV/G2+MsjhQAyTbClXSGB82ulNGFIDNqIKtE4DIdBLw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB2762.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(366004)(136003)(39860400002)(396003)(346002)(5660300002)(16526019)(1076003)(8936002)(52116002)(478600001)(83380400001)(2906002)(6486002)(66476007)(6916009)(86362001)(4326008)(2616005)(316002)(66946007)(8676002)(6506007)(36756003)(66556008)(6512007)(69590400012)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?LgaimxseWw55rZ5dojWR5RItiAXdQgLfjuV59YV8a5Emupo0gxNrsEn5p+L0?= =?us-ascii?Q?c8B+caYL7mBb9e+ZFEgAnDLkTE5kLy+rxQ6dKBzVzD9qx9JIovDaAM6EZyOr?= =?us-ascii?Q?0xOpL1CdRtWR6NRWcT27oxSvi4bKR/b+85QuIy3oM8vVG0JBBGhx2+TxqSFR?= =?us-ascii?Q?5FqObhqA4EeEEF6Dby9ZG/BnwVx3vpXewBhhL5AIC63ackuePmh2M9dtWr1h?= =?us-ascii?Q?Y9ahLoEBxlSsrm9yy02hxe37sOGgkjVIsjtLfo6ahy/a+UwTrEsj3rPhX2qh?= =?us-ascii?Q?mBEl+4c/SetySaEdUzrt2GXJYzYt4EUcEQrFXSGxTIA+KJeHars4801YUPl6?= =?us-ascii?Q?mrhs/eKYgZjsEjXi+fM/iN8sCifwZ4KIHHVkHhwCtOy2FMxPLr47rxHnebCp?= =?us-ascii?Q?uRWTWCmoWTt25JMqlferhY8rVqn07w0VklQzGthmmgUzKMGyFz5NM6CumhTq?= =?us-ascii?Q?jaArmXoGN5In/ZARNQUFMeuEQ1f+m/vOouG8WcDvI56yUcUljqFnkoVnezPE?= =?us-ascii?Q?8strPYqWZXSXF+MxG7BBWzUECbQPQMyNrMksJsoMU2Xmul+/VfsjN0zxbvPs?= =?us-ascii?Q?BWt72CCRDmT2sebJ4vPjq4dIUv65mZFumGDC7dpPmH8cqA7h57Qd4iqQEazu?= =?us-ascii?Q?4lhAsR2UUhYa83xw82CGT+ZLqQUGSUK6Y3rm1XclG9RKpe3bdys2pL2xC3JD?= =?us-ascii?Q?5vxyO2ecJ22c83JrOsrIJoLtQTMl7JDPJ8NpaUmP0puCEhhdmcMDdZkgRKmD?= =?us-ascii?Q?HWbtsXpbC7u38m32/ocwSEu2WPKpPtgyNv56RdpLm5fzHFCp7nqwns50wnap?= =?us-ascii?Q?6464Xral4Zs1qF28sj98WT9V6TfsTyotPElu4nxM9WLWp9h5n1SxrEMMK/St?= =?us-ascii?Q?hfZcc3sulvJyr4K2rYaiknm8Wk+Uk0TMlKG265l9J3ao3RVtSPvzE7yvZJz5?= =?us-ascii?Q?D2leVqwIh6LwsgK7KzKmuTiMU7xN8k9A5zzb3g0//V/PUYZARy2UKDk5ihpS?= =?us-ascii?Q?RLuxMzDZ3hEGszLjY7rWdJUauhTXf+L+7sxawS36+CQpEp2OetXzEjlkyRMZ?= =?us-ascii?Q?cXtDww/ojZ488SZUR2sELGFsYElq8sq8pMtJgqvaJOwqczXKFVRZA/po3P6l?= =?us-ascii?Q?b+3hSF95yvMgFHicz/GpRGNifuRnXCEMS6oJI4jLYUK5LUIBlIrcnrdi5npI?= =?us-ascii?Q?zUpM1R5HT/41HOOiY5OsNS6NoH0YV6I9kU98FT5InDeUWxjhHI1QCWRw079m?= =?us-ascii?Q?Ees3LxLOPL3CQWzHBIU/rZxM1ob9EuIVkrY5LjjS456XY+tgeSAjFUQtI1h5?= =?us-ascii?Q?mu3pQWCMm7W0cl5FjJ4xwKLjYIwNPn0pfy9D2G8PAUDa6NGCWOFV7G3swipq?= =?us-ascii?Q?OwCunU/uOC2Yp0pI5aPwUq3ePev8?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c621432e-b72d-49e6-7a70-08d8dcc0d479 X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2762.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2021 14:46:43.1786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wXYDxToG0C35dsvP0ofmj74gz5CaxwU5rf4xer8RW6ozwvXScMlezhp0v0Coy8zixPwWreD7GVLcC2LGFRD1MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0236 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: , From: Zoran Zaric via Gdb-patches Reply-To: Zoran Zaric Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Following the idea of merging the evaluators, the get_frame_cfa method can be moved from dwarf_expr_executor and dwarf_evaluate_loc_desc classes to their base class dwarf_expr_context. Once this is done, it becomes apparent that the method is only called once and it can be inlined. It is also necessary to check if the frame context information was provided before the DW_OP_call_frame_cfa operation is executed. gdb/ChangeLog: * dwarf2/expr.c (dwarf_expr_context::get_frame_cfa): Remove method. (dwarf_expr_context::execute_stack_op): Call frame context info check for DW_OP_call_frame_cfa. Remove use of get_frame_cfa. * dwarf2/expr.h (dwarf_expr_context::get_frame_cfa): Remove method. * dwarf2/frame.c (dwarf_expr_context::get_frame_cfa): Remove method. * dwarf2/loc.c (dwarf_expr_context::get_frame_cfa): Remove method. --- gdb/dwarf2/expr.c | 5 ++++- gdb/dwarf2/expr.h | 3 --- gdb/dwarf2/frame.c | 5 ----- gdb/dwarf2/loc.c | 8 -------- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 845080a73a3..6b5cba6b7b4 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -29,6 +29,7 @@ #include "dwarf2/expr.h" #include "dwarf2/loc.h" #include "dwarf2/read.h" +#include "frame.h" #include "gdbsupport/underlying.h" #include "gdbarch.h" @@ -1220,7 +1221,9 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr, break; case DW_OP_call_frame_cfa: - result = this->get_frame_cfa (); + ensure_have_frame (this->frame, "DW_OP_call_frame_cfa"); + + result = dwarf2_frame_cfa (this->frame); result_val = value_from_ulongest (address_type, result); in_stack_memory = true; break; diff --git a/gdb/dwarf2/expr.h b/gdb/dwarf2/expr.h index cc2463336e7..6ba8efb3cc6 100644 --- a/gdb/dwarf2/expr.h +++ b/gdb/dwarf2/expr.h @@ -192,9 +192,6 @@ struct dwarf_expr_context /* Read LENGTH bytes at ADDR into BUF. */ virtual void read_mem (gdb_byte *buf, CORE_ADDR addr, size_t length) = 0; - /* Return the CFA for the frame. */ - virtual CORE_ADDR get_frame_cfa () = 0; - /* Return the PC for the frame. */ virtual CORE_ADDR get_frame_pc () { diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index c4200fc2311..682f2881556 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -248,11 +248,6 @@ class dwarf_expr_executor : public dwarf_expr_context invalid ("DW_OP_push_object_address"); } - CORE_ADDR get_frame_cfa () override - { - invalid ("DW_OP_call_frame_cfa"); - } - CORE_ADDR get_tls_address (CORE_ADDR offset) override { invalid ("DW_OP_form_tls_address"); diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index f1caf3469b2..2ad262dc802 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -657,14 +657,6 @@ class dwarf_evaluate_loc_desc : public dwarf_expr_context struct dwarf2_per_cu_data *per_cu; CORE_ADDR obj_address; - /* Helper function for dwarf2_evaluate_loc_desc. Computes the CFA for - the frame in BATON. */ - - CORE_ADDR get_frame_cfa () override - { - return dwarf2_frame_cfa (frame); - } - /* Helper function for dwarf2_evaluate_loc_desc. Computes the PC for the frame in BATON. */ -- 2.17.1