From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2060.outbound.protection.outlook.com [40.107.237.60]) by sourceware.org (Postfix) with ESMTPS id 2B7AF393BC2F for ; Mon, 1 Mar 2021 14:47:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2B7AF393BC2F ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YrUAUfjmywJMe/CoEvJDORfYWAuGpLsskc5uZMe/UfRBS1z2Ti9tAuAWSntvasjukUkYm11Tgr8pem2/Dca6qB7Vu8PHgV9V1yNxwvzxPRhSm0yoHBz3+uPdrhkNiy5wGmsBQ6xsQ6NfQwVL2ERR584xRGYfYBYhG50feEfs57qyckWP5fBtRjo3d0KI+9jwYIzBo7W3au5fS/5r8GoA50nLctw55n98HNslKEeDrph+5Ah3OYhlSdZZKJsuFhkONm/Eb4f2l8VQpyYzSbUWLw7WmjGNzZIsBI2Z4a2dexvw/hQr9Gn12/wB42AfjX5ryQWN8bEf4KSdAbb289W5yw== 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=+yqPDE67cXSxvjaGF5zFfB8VbwdRcYtrjZV9Y1Bfo00=; b=Op/rNxwNQKLwc+59FtTo9RpS2Yda8KdmAmBaf3WzCNrQSXlaoolZSCoJgL+/3j1WWmvJ8xO/mtyZ2AMlfzKuf3/nT1iNMQqrfTvyu/LFyKsgeYjIbVQPyg0/qezhlMBBLsiUzo4q3jrev4+s47OE7ohLNXixxTUAAXAoTlPJYyF87gHmVqx6mimljYEcpm1m6U5cSokp56N61lnjnWIY2bB87tUfaOvlqD8dTnNSueS1EK1LIkAD4RLujsNb+kPryvKVfZFZTrVslCcFpU1Vn03MEmyI0nQt0tllwqvkrhcraxLW3AgOUvtfrX553FEI2zxu3vPYsx99jaXuHOZeqQ== 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 DM5PR12MB2342.namprd12.prod.outlook.com (2603:10b6:4:ba::22) 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:47:48 +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:47:48 +0000 From: Zoran Zaric To: gdb-patches@sourceware.org Subject: [PATCH 36/43] Move read_addr_from_reg function to frame.c Date: Mon, 1 Mar 2021 14:46:13 +0000 Message-Id: <20210301144620.103016-37-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:47:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4b923ed4-dbca-4ce3-6df5-08d8dcc0eaf0 X-MS-TrafficTypeDiagnostic: DM5PR12MB2342: 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: s4nRrOfvTnvnkUfJyjC0RdqOPO5m4Z14u/vjZmwNe11HIADG3MW6Ot0L1DmsLHHIaBsM1amMdAkcD69dXDjvQgtEczaTUhaaexzA/JBCYSnVWre2rGs0O6hM+W3QSNsKuis7WO0Is1Gs1RnalHlidz+jiXleX2yLfENQ8UiIpoif0DUciAnCN1/ooex6Q4pTpzpPddHY7/yvvHKsuEgsfybJ5k62dkUM21esUQv0/MtN8Mq5oVkYOl/JeHmscc57CZPMoxQuIoxgMJLG21sBc5qfFOepmL2NMyzg05CkZDMvXhdWbusu0OqWkoTCZYI8CM2YFfPyi605v8cXzDilpt7ik7QH5+4ApPWydNHSVXLR1E9xExAFAMguTkjMNXpf5xQA2lU2uP2iKMMHi1rxuUrMBy/VjPbddRtc6ob8PaRgFlPNtoEt5M1dz0zcEUET/QYLJvTpCJpIR+l3yB/q91l5JxX5EKANnW8spIiPqhNSUqoahIp0ShnWQdrdfeAMVGAkOGMdZLLx2JQbE77++qfeHOlQeE8gEpQmXqZgbuTJaqGcavBR26gkJkihNMG+hFb1rcGx4cjfc0iyF3vRJw== 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)(366004)(346002)(396003)(376002)(39860400002)(136003)(6486002)(66476007)(4326008)(478600001)(66556008)(2906002)(66946007)(69590400012)(316002)(52116002)(6666004)(6916009)(2616005)(86362001)(16526019)(6512007)(36756003)(8676002)(8936002)(6506007)(5660300002)(186003)(1076003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?qj2Zo0nHVAHq4bP5hRZ/RMBAabkoz83RUEM8CMW1zxyZAlHeAzyrAKdSYQng?= =?us-ascii?Q?Zg9UFC1LS06FHI0tjuIRt8KuzCyCcE5XMwyRfmtbwxTcgXrWv1Beaq5bXEW9?= =?us-ascii?Q?ez8ATX6fc2i9S5sfeZnWKcEYkSUi7Y8Ua/rHMT5+GRiyVUfdOUukhPbAC8CF?= =?us-ascii?Q?qmm2zUtZ7D0MHJJTvqCNO7tiafIWXv90J+c8XlK+y9ENg7iirra+isnNDD0j?= =?us-ascii?Q?FWkk42JJM18oP9RBhQHRwdjDGNRgGV9MbDQsMtjfYRbce7BgA7asbnTgDVKB?= =?us-ascii?Q?pclCzfMGJ0WgrAUoA0nYB0nDs8vycSJRbOCv1so3sgnliAgI2xn3djdoOFrM?= =?us-ascii?Q?9r3LwBpk1nMNe35RrfPz9glCaWnenVkuhR25Qbjupe6G2eAjZw6P1ujZ/BhX?= =?us-ascii?Q?LB/LZUJGaQIyw+bHJ2866BuhZPBKkzMh3+XgvcH8cy25KVZJCYCK4ipREhVM?= =?us-ascii?Q?R2/s6FGIuneMk4tzIwDZvL7EubsJLwVEdB7U94HtinqxuDRfXvZz6qLlQ3kV?= =?us-ascii?Q?ssZb4Ss23U2p6ROHNKoh+lHQjhgPy3Rf1g2GbJN0l/gSNU/KRoukx8kLJfp0?= =?us-ascii?Q?U8gT8szKXnphFmRElvyuWmTMISmLFpigFBXlqz3vpqHA5e4FGSqo9w4VNKkk?= =?us-ascii?Q?gv0pXWRZg7M5GGSYCj9pAB6ngZbzGlBHKfvzkKMqYyd5uF8VqHZGuO4NPA+k?= =?us-ascii?Q?Z95+YTMVBErD/guSj0LfH6u1gHUI2UxIhhshx1cKUHaixxM9pJoI3bOoTJrw?= =?us-ascii?Q?fxi6yQ1abyoPvGnc4h99L3dWIQDwGBmY0LZbHOQ3fUatYvjcjsAs9lomB+Vt?= =?us-ascii?Q?n520s1cUjFDUZGTzuj/KOeW/BwLVn3VFlTuNoXjGQMTKwNFOvLR/RRpjkP1X?= =?us-ascii?Q?eOWP6cajhmkSaXAuhXLPWYL+1V/Q9+GcFxx/gHFyH7BV+rlmz92ccjcGiAtL?= =?us-ascii?Q?FyS/RYs+WilGb+TaItTxEUAd9wtliTwpSz9XHHBBCtKHn+eH9fiNj2SxoMAn?= =?us-ascii?Q?bsgELenrssVYDfV0j6/XdGD9+t6sNWjLxdi9n68cli3k4S5CZnCGBICJ1NNo?= =?us-ascii?Q?ZUd19aBHF26za/6HkZWB4QIRqhCcIGZT2gIII0wwIFpSvaP7dl70G2Zm4h11?= =?us-ascii?Q?WX2wRLhUwY3r+5/7nSIoG7aR58300JVyu8iLwQddQq6dHJZfJYkhKbNqgDSe?= =?us-ascii?Q?a0Qa8sbykfxwDBUxC9JCyU6Mk5tK/bstKQ/kdiqwhtzOcSE6WlsMSgiyNSRS?= =?us-ascii?Q?N+clFzdnX0rE4I4GIcM4Te1qg7S/u2zTAb7U35n45HdK4mS9RyfCBAvgliKB?= =?us-ascii?Q?vXlNi8ZS+cUXagZ7nPI9oONvCqNJTod27teYBTFXQUagh/6votMxX4ApjL7Z?= =?us-ascii?Q?0dF0q9EcGBZgrHVrZc//MLUjmNOk?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b923ed4-dbca-4ce3-6df5-08d8dcc0eaf0 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:47:21.0849 (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: OooOBh93jCsuhKvUs5Frx/9fMR8aLS8oLPUQheCczOjZ2r0eKqDgTRkrJrjOlFT1+d3bDRnuzaZL7e8dTP+PYg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2342 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 01 Mar 2021 14:47:54 -0000 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 7a091e74ce5..b5f408fead1 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -105,17 +105,6 @@ ill_formed_expression () error (_("Ill-formed DWARF expression")); } -/* See expr.h. */ - -CORE_ADDR -read_addr_from_reg (struct 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 132f924014f..b64bffc58c1 100644 --- a/gdb/dwarf2/expr.h +++ b/gdb/dwarf2/expr.h @@ -51,10 +51,6 @@ struct value *dwarf2_evaluate (const gdb_byte *addr, size_t len, bool as_lval, ADDR_SIZE is expected size of the type. */ struct type *address_type (struct gdbarch *gdbarch, 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 (struct frame_info *, int); - /* 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 97bd0d35319..46cbf7016c2 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -192,6 +192,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 (struct 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); +} + /* Execute the required actions for both the DW_CFA_restore and DW_CFA_restore_extended instructions. */ static void -- 2.17.1