From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2043.outbound.protection.outlook.com [40.107.94.43]) by sourceware.org (Postfix) with ESMTPS id C90F7385803B for ; Fri, 5 Nov 2021 11:39:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C90F7385803B ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E7bGoPG8eamTBS9zT664MC9xon/x+jKh3xic5SCb4zDWlHhhajjZvVHmfmQGPwRmpM1X1pw/JKpAa5SgKTbmBSq5ByusD7h2Sl8XvE6tI9skzOxPYIStW6B0WuafTfJtHMznR2JbGQWrmjZVFH+XQOBJNwFEti/7ysMWllGlWbxVLyaSIWQEXk46QOEkVCZQKW7cxhzs9nK/lJCiMZh1+g03GontLztX3+nPAiHw2CD5BOWIaPh096dcOFExdaGPCriuiU5b8CxL9yUDW2cCsaXRSUKTBrgeR2i72a5k5e3/ykk/L+5lNhNXpIF0QBBcX/b+36x15v5XHLzMmt/6NA== 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=NenWthnaSnXngktbssyzUGR+jx73vn1NvUz9Pn1+MHo=; b=ifGZmcXMCUzwm1U3NC+m6rkvAevCBua9AaEM1vJC8aWLti+g2FdfUf/UhaTmw8+qK8njmf7Pm+7M48pMZMFXUi2r9I/2d/vAg1sWCbng1Z9FdpWNg6O63CfW2T46M15iZH1HMBDcgBCKjINYiTnMqNchS8pZ+zNEqo63uwpYmZ77W18iCjhvnToLJsnctX7kpyCrE+2hhMZlaZK0dQ0INnjB1O6Oc+Mkd9XOcI3ajmaJD69KTGhs749ONNit+tFwmEujGMfFyeKyGIm8eBCWbofu665Zuke3NTMjRYQPPOtCwC2jLXqtVvBkhhjvX3gul+7EuFA2cHI0Rvj+GnzeSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=sourceware.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MW2PR16CA0008.namprd16.prod.outlook.com (2603:10b6:907::21) by CY4PR12MB1381.namprd12.prod.outlook.com (2603:10b6:903:42::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Fri, 5 Nov 2021 11:39:26 +0000 Received: from CO1NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:907:0:cafe::f2) by MW2PR16CA0008.outlook.office365.com (2603:10b6:907::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Fri, 5 Nov 2021 11:39:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT042.mail.protection.outlook.com (10.13.174.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 11:39:26 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Fri, 5 Nov 2021 06:39:24 -0500 From: Zoran Zaric To: Subject: [PATCH v4 20/28] Move read_addr_from_reg function to frame.c Date: Fri, 5 Nov 2021 11:38:41 +0000 Message-ID: <20211105113849.118800-21-zoran.zaric@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211105113849.118800-1-zoran.zaric@amd.com> References: <20211105113849.118800-1-zoran.zaric@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36c9ead7-7c5e-46e2-1e42-08d9a050ebf8 X-MS-TrafficTypeDiagnostic: CY4PR12MB1381: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sveao88kfQLdNYywv9NXs4KADrUpcPeXgmB+mNobsU3hHQ2vlihj/bEXE1fFA9DTHTGmgIhu61cKHvpXzAHsOuqApYWmBOVOjDJx6AXDncOgnmXG/PEv/ox6fviZMo15CFJlJfTVrAbTbWpzjf7RAxp8N72LKSSWO8Vr02YcjTpDiaWRWW4HU2rlI7OGcBXU91IXDhSCJV+8U3e9vuDEXzmi6MqIfdISYhDk3JjlXHJGM1fMxvjQHjopgFJP+40CFiWqVR6HANgbvRMXTrHbo5oiwW/wfgpFkNTdiDwF1B/zmOsMwMEsqGmcYrCdteVtdEtDHERgLlx8L2AydnGgGSAnzpRn+mLsqfln+3HPCa4nWH+3LoR7WPsx/oZ56rXEwjMOn6GhPNFIA+OPurfam+ahuLfeYcJk692wjhq46tBjEv25Jqu5uW1suUF+Bvsbn31yhoUpQ57Demt8TEs5T7zpqbNmyhbo1Wjr46qYHOH3MaaD4qM9b/DuRhrVK1Xwa+O/YLKFflzDk0IIoAOhC8NqQ5r32AjPJzHytGW97unuHP1VqjIRL/+LWDJrYoBOEMVDtBgzZ1FcyAfGmqZ/U2fWd9cOwMUGhpAYW0xac7+n8LDwlX+eOrcMco1PQTcJ+im6vwu5fkIHmsAkNZkLEAyveFYaDty/aqJkcUHC3YkgR1Pse5buU7Oh79hvDRQVz4yXnG2aKeQf4CPzRCrOukrVSvR+fJYaAp0Ui5Y1FtQ= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(70206006)(2906002)(6666004)(47076005)(316002)(81166007)(70586007)(26005)(86362001)(356005)(8936002)(8676002)(4326008)(83380400001)(2616005)(426003)(508600001)(36860700001)(82310400003)(36756003)(1076003)(336012)(6916009)(44832011)(5660300002)(186003)(16526019)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 11:39:26.4731 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 36c9ead7-7c5e-46e2-1e42-08d9a050ebf8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1381 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP 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, 05 Nov 2021 11:39:31 -0000 From: Zoran Zaric read_addr_from_reg function is now only called from frame.c file, this means that the function can safely be moved there. gdb/ChangeLog: * dwarf2/expr.c (read_addr_from_reg): Move function to frame.c. * dwarf2/expr.h (read_addr_from_reg): Remove function. * dwarf2/frame.c (read_addr_from_reg): Add function from expr.c. --- gdb/dwarf2/expr.c | 11 ----------- gdb/dwarf2/expr.h | 4 ---- gdb/dwarf2/frame.c | 12 ++++++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 8ebc1dfdfe4..15164babdd6 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -104,17 +104,6 @@ ill_formed_expression () error (_("Ill-formed DWARF expression")); } -/* See expr.h. */ - -CORE_ADDR -read_addr_from_reg (frame_info *frame, int reg) -{ - struct gdbarch *gdbarch = get_frame_arch (frame); - int regnum = dwarf_reg_to_regnum_or_error (gdbarch, reg); - - return address_from_register (regnum, frame); -} - /* Read register REGNUM's contents in a given FRAME context. The data read is offsetted by OFFSET, and the number of bytes read diff --git a/gdb/dwarf2/expr.h b/gdb/dwarf2/expr.h index df097f8867d..955fc84f441 100644 --- a/gdb/dwarf2/expr.h +++ b/gdb/dwarf2/expr.h @@ -51,10 +51,6 @@ value *dwarf2_evaluate (const gdb_byte *addr, size_t len, bool as_lval, ADDR_SIZE is expected size of the type. */ type *address_type (gdbarch *arch, int addr_size); -/* Return the value of register number REG (a DWARF register number), - read as an address in a given FRAME. */ -CORE_ADDR read_addr_from_reg (frame_info *frame, int reg); - /* Check that the current operator is either at the end of an expression, or that it is followed by a composition operator or by DW_OP_GNU_uninit (which should terminate the expression). */ diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index f97387a9d71..e17b36e243b 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -193,6 +193,18 @@ dwarf2_frame_state::dwarf2_frame_state (CORE_ADDR pc_, struct dwarf2_cie *cie) { } +/* Return the value of register number REG (a DWARF register number), + read as an address in a given FRAME. */ + +static CORE_ADDR +read_addr_from_reg (frame_info *frame, int reg) +{ + gdbarch *arch = get_frame_arch (frame); + int regnum = dwarf_reg_to_regnum_or_error (arch, reg); + + return address_from_register (regnum, frame); +} + /* Execute the required actions for both the DW_CFA_restore and DW_CFA_restore_extended instructions. */ static void -- 2.17.1