From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uBiTN2P+PGAGJAAAWB0awg (envelope-from ) for ; Mon, 01 Mar 2021 09:46:59 -0500 Received: by simark.ca (Postfix, from userid 112) id DE1911EF88; Mon, 1 Mar 2021 09:46:59 -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 856581EF7E for ; Mon, 1 Mar 2021 09:46:58 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 88D293938C00; Mon, 1 Mar 2021 14:46:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88D293938C00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614610016; bh=XwIAPkAdMZiXBDzKUd15rdBsS7x4Xs7XwW9QuLfV30A=; 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=x+CEW3Ryeaq+HN8UCh+7vRsew8a6vxm0WNtB3eEhS85ctgPj484jfMiaS92LM03D4 LU245bdzCpYeYfY4VCs9JkbQqIkL7sp0KJ2bTE3hnNUVmFuu467UAgWkbn49qD2dKI axedhlxwn2F7bFXqDLSIZpoPLq4UyalaTBCfh2UI= Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2062.outbound.protection.outlook.com [40.107.236.62]) by sourceware.org (Postfix) with ESMTPS id 4CBDC3939C31 for ; Mon, 1 Mar 2021 14:46:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4CBDC3939C31 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m3xn6o4lr82ArWi0SvNDuWLSvXWg7q5/QtPIWUWoucJcb45Gkz/X16EoT1469EaN1z8ps74RGe0bnowF8uI4Z8d52mjfqjNrnJbaoj463anAEuyjwKlyq90Yx7nyL2GlQouIWsihE53SCwu6unYTYNxC9OrvU52bUYp1QZ0bgPm5I9Dp0lHKOQvPOmb8cd6JiE8tAI7VWG34mVumnKbQzoB++ANRpsfQ4V+VQ89p3RtKr5lzYZ/vu/pX2ou7++62Dqc4kSi/pw/IopGripxuNys4kfeXW3JzJjLTK+aunUN6KwuYYJucrs2/ToMOC48pdA4kf6smyJ9S374dE/n/SA== 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=XwIAPkAdMZiXBDzKUd15rdBsS7x4Xs7XwW9QuLfV30A=; b=S1iICokQxi8QhPXxYAPSn7w7DemkfgN2bpmc4lNkhHxOQ1L+rVGrcfxqZwTTOVy/sYsDJuZ7nVAVw4JD7y+zt8XV6Qh51TPOayYSBhSXk7fVONzqkF7WaXJBvMFds44oii+XEYqtEom3rHKAg7qvq99EckQYIk71hhPK6iWUsDDQoQRuHwJVfbx0lG25jis2TU0e8Ij4C64WkCs/i1kSPEl9I9It6G68HxFqmVnjLjMeMnqggdMvClKNS0YznU1TzrhIbBJMndV46YM9VmYBnLz2+WCERgp/8Ly2D9TuntXX49jDVMtyXchhStwVwe+kfe7s56+MysPSO2WD3wMfwA== 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: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:46:48 +0000 To: gdb-patches@sourceware.org Subject: [PATCH 08/43] Move read_mem to dwarf_expr_context Date: Mon, 1 Mar 2021 14:45:45 +0000 Message-Id: <20210301144620.103016-9-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:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a7b368c7-233b-4aad-bd34-08d8dcc0d786 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0236: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kiAgSK5mcSUqmgpkDHW8vaZBnr2/6HAnjBKoypxidqUt9f5RcmIhdi3Bze66ChQXV2MZ1hOhm94s9stQsnF0mguQ4G0DR88HvcMogaTONb2cneFYCfgWb1RS2zB0BwMrSxk5zC8HwNQUmAU6VOhq/+lE0IobCIFQt7nfxBYaDvSoke65lpl0WBJbTfitmB3KSv288g8dAyFZOBwVaFpTssdEHP5EOZLK1BfZUNt28Zt/+Ismv9Mb/AElSayDRDVWUx47SVqhp2u+e6P9MZtwcA1u+Oc/beYFZaPIkxquEcVJbNZyhv5Fjo+krHUj2L+u2dTvIJy46Jsq3D/vaOVCzJYmYj1obOcNbBD+unnKb0XJmaphFbgjVqADuZg7rtukvnO+zranHko6JsA2JZ9AqjwpSapWBjBZw7ELfHQLP5o4X9WWOaUxNdac7SB5FRPKrIfAdNG4nq37BvbsuiEalJnYqEWPJ8K7/KbgYhhgSPwS+UPHHMT8jrXdGHc/3wwAEuIUHo/6in94+sj0iVnjh3BAKuPJZ+K8+FubEb+eHDwiiP6txQsIsXHfTrXQlLZ2TDzF8aVdoywgJz7VrQj9XA== 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?HZo91VWxaAPCjQPwWnt2NnIM6oSqqc2NallTU4RClZsfT6hq3D5j+VMyzoec?= =?us-ascii?Q?xSM7XQE+LfGuSK/cznkG6cgw7g+DV9bmNlnD2vBBRDT5apQOZMCkVtdu4hEg?= =?us-ascii?Q?EQIXn7TwElieDM4JSultp9cNC+sm1sAQZ354qBTbTOm0R3mwSmQRQ83+dalb?= =?us-ascii?Q?bFwB75j8A7F8q1ub7Khe4IBpIGhgqVtccsGpmhUASGB/r7SrE0dkocU6Or7Y?= =?us-ascii?Q?UMmbrLTSm1GIXxfcIU4grlFHZmI8aYTGK68hwSJKAPwuTYF694/IQYxj5GuT?= =?us-ascii?Q?AmbF3fbDQVggLPBRoRSxvl6dUlKERo0d87mqm/fal3A8aiBUSr6GLfeuWYJS?= =?us-ascii?Q?Gmvuju2DqtUebQk6Vm3EH0ltXS3byvsduu10At/L27iR5um6ynBu/hToQ5oB?= =?us-ascii?Q?eaXJjEgLhoDpGpVsP1lINpl69HOk0QHNBsgcWYN6h3WqditQS1jxgd2lblF7?= =?us-ascii?Q?kjrgzXKUc6dq9UlcwT0I9Idd6t73K7LwbUrgbhBm5/V/1ZuVJDOlNP7Ao6k1?= =?us-ascii?Q?k3tHS5M3ue1XsnmD1D/u2oBr1iT15B3GEKYB25huQWqCF1lZEKK18eKOskpS?= =?us-ascii?Q?XOji28Dti3mco0ow//MMtWlcR+lSrAWuCBK3uHSb/UgD6esQ+22yjiitiR+f?= =?us-ascii?Q?UE+2KKDqrUwOOQv38RsSZMh4BL4cIZV6SroXfayA8TxleCM5VPwXpZX9oR8Z?= =?us-ascii?Q?hHMCENUeEgCLAP671YS7/2Ax6oNOOn1wOy1ek4yg2Y4WAJv8S5SLgONX5TG5?= =?us-ascii?Q?rTGZUTUJF+YJTzW0Wp+u15Ay75ge4muwi3oFQyHvu9czYHFEHFT068KdB/P2?= =?us-ascii?Q?X7/6lUKhw+XW90FHWt4l7qyIyGsvqLOgjeqfc2qkeqlfIJRC4p8u+m76ArSy?= =?us-ascii?Q?9mFTR9LkEG0xpM0Sh/y1vMuQiYX54XX0lkiwlt8AQuWlE2c/6fsNrvfmYZHN?= =?us-ascii?Q?T1372nG9CZf0iIM3gdC0+LYEXU/Xa4mn3TPaCEgTb9Pl4/bgEQCNzwVazeZ9?= =?us-ascii?Q?ikTuLsCD+Rd1+Qre/ZNNU6ReRmVFnSjr0X4soUdP0JBOwuOFNCsnRthH/Eiy?= =?us-ascii?Q?ttN56d56jYrcz7GtgOs3S7STzjkIEVtAj9z5/jyX9oP17MIIL2rpExpbKfxk?= =?us-ascii?Q?lHWUJTrAskgl8VjS2eMr1w5k7lvuekBdgzYgYsCLAm0Hk9dxBPBwbj9anEk9?= =?us-ascii?Q?jvalyQ/RXtg6lwxDwfq7hpSKxrHCkMkM+iPHIy0kIuJ9o7AUOqIPYVcxcizV?= =?us-ascii?Q?FQ9rSQS4bNkpnRtSgDOXR8J4yE7hhEpu8XbV5CwYjNQFzZbBUJgavF0R9cEK?= =?us-ascii?Q?S/CBgA1DSdNafR4UZLyAae9KNoJEoz2dfhEa0jUdmGV01iQXSYwrezhzISZf?= =?us-ascii?Q?NURDoSp2qtTfehSlshD6nnQnklDx?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7b368c7-233b-4aad-bd34-08d8dcc0d786 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:48.3706 (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: qXwLAh2qei/RwuW3Q2h/EUA7/XKhL9Yt7taLbhjA/xHlCi3t+YpLSM9nMUn9YJ0/NRe/UTGbK7c9hmRGXdgN2Q== 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" From: Zoran Zaric Following the idea of merging the evaluators, the read_mem method can be moved from dwarf_expr_executor and dwarf_evaluate_loc_desc classes to their base class dwarf_expr_context. gdb/ChangeLog: * dwarf2/expr.c (dwarf_expr_context::read_mem): Move from dwarf_evaluate_loc_desc. * dwarf2/frame.c (dwarf_expr_executor::read_mem): Remove method. * dwarf2/loc.c (dwarf_evaluate_loc_desc::read_mem): Move to dwarf_expr_context. --- gdb/dwarf2/expr.c | 9 +++++++++ gdb/dwarf2/expr.h | 2 +- gdb/dwarf2/frame.c | 5 ----- gdb/dwarf2/loc.c | 7 ------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 9b2c7485720..872de16cd70 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -259,6 +259,15 @@ dwarf_expr_context::dwarf_call (cu_offset die_cu_off) this->eval (block.data, block.size); } +/* See expr.h. */ + +void +dwarf_expr_context::read_mem (gdb_byte *buf, CORE_ADDR addr, + size_t length) +{ + read_memory (addr, buf, length); +} + /* Require that TYPE be an integral type; throw an exception if not. */ static void diff --git a/gdb/dwarf2/expr.h b/gdb/dwarf2/expr.h index b25b2315dd9..713bdd94f27 100644 --- a/gdb/dwarf2/expr.h +++ b/gdb/dwarf2/expr.h @@ -196,7 +196,7 @@ struct dwarf_expr_context CORE_ADDR obj_address = 0; /* Read LENGTH bytes at ADDR into BUF. */ - virtual void read_mem (gdb_byte *buf, CORE_ADDR addr, size_t length) = 0; + virtual void read_mem (gdb_byte *buf, CORE_ADDR addr, size_t length); /* Push on DWARF stack an entry evaluated for DW_TAG_call_site's parameter matching KIND and KIND_U at the caller of specified BATON. diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index b3f0888e239..ce95a811abd 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -231,11 +231,6 @@ class dwarf_expr_executor : public dwarf_expr_context : dwarf_expr_context (per_objfile) {} - void read_mem (gdb_byte *buf, CORE_ADDR addr, size_t len) override - { - read_memory (addr, buf, len); - } - void push_dwarf_reg_entry_value (enum call_site_parameter_kind kind, union call_site_parameter_u kind_u, int deref_size) override diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index c716c3a7858..9c4872436d7 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -686,13 +686,6 @@ class dwarf_evaluate_loc_desc : public dwarf_expr_context this->eval (data_src, size); } - - /* Read memory at ADDR (length LEN) into BUF. */ - - void read_mem (gdb_byte *buf, CORE_ADDR addr, size_t len) override - { - read_memory (addr, buf, len); - } }; /* See dwarf2loc.h. */ -- 2.17.1