From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by sourceware.org (Postfix) with ESMTPS id 4904C395180D for ; Mon, 7 Dec 2020 19:01:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4904C395180D ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CvzJk+EStVTZ2yckYZ+/vX96QRR+7gNGKje8wvRggAUUEnzAujZ/iCx/ca1xc5Uk1xcZqJM+trZsdkwrdWeLIj0CJ3qsJm4wPOAlTHfTBL4D5scUQJOLJf56EfYRKX2crPV5eNMUjj2daBCja/i+MLcLtUouUbTOCVx1w86nBx3MIzpiv+RzCSXd09L4Jpur98jOk01oJmuEbottu/IWeN3RaERBKRmpmW0lTNRQTXPIWZnZF9pz7hffoa78Xb7TJ2OgFTmyKaHt9o/C/4g6+IKd86TASHeczYLPA7jrOa9lVMCc2zF7buXvXdKXfrk/NTN9x48DTsPf5qsGSzbqqw== 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=atNs1hgrR4VNap3NGV2LHMyJ8VwBtfCVZmyWkVKU5SQ=; b=Jwot/8Dg0pspkgwoU7CGwA3D+CVJYINxSJTd7we2pHCGFLc1aJTtZOPjv7tXAV/S4FKnHyOZEJPPFH7YRq/c3mZKpWVipxm3LZwtf0NgjprsNloiTFz77bkDa6KHqzA3o1V4EpdX9cYPheEjwDIH3Ju6z8VADag6+oUU4nnUzTbdyNtJNwvjyXzyq5G3vovroOK4IlY+1ko25I9G1AS7OYg63AIAM9MekYgeIIpa7S2ECdxEVmhGe0QQfzEew+vRnVDOOA99HJJYCcc8bA0PTkXy4rTb79H+qPGwQMu7WSxBhEYto8/twXm3ArFxwleoXHCZWH+Nbx4hiKBzGcVN8Q== 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 DM6PR12MB4561.namprd12.prod.outlook.com (2603:10b6:5:2ac::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.18; Mon, 7 Dec 2020 19:01:00 +0000 Received: from DM6PR12MB2762.namprd12.prod.outlook.com ([fe80::6841:61df:984b:b3c]) by DM6PR12MB2762.namprd12.prod.outlook.com ([fe80::6841:61df:984b:b3c%3]) with mapi id 15.20.3632.021; Mon, 7 Dec 2020 19:01:00 +0000 From: Zoran Zaric To: gdb-patches@sourceware.org Cc: Zoran Zaric Subject: [PATCH 07/30] Move read_mem to dwarf_expr_context Date: Mon, 7 Dec 2020 19:00:08 +0000 Message-Id: <20201207190031.13341-8-Zoran.Zaric@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201207190031.13341-1-Zoran.Zaric@amd.com> References: <20201207190031.13341-1-Zoran.Zaric@amd.com> Content-Type: text/plain X-Originating-IP: [2a00:23c7:5a85:6801:5c7:2db6:d2c2:ae4e] X-ClientProxiedBy: AM4PR0101CA0053.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::21) 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:5c7:2db6:d2c2:ae4e) by AM4PR0101CA0053.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Mon, 7 Dec 2020 19:00:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3187f92e-2591-4785-5b3a-08d89ae26fee X-MS-TrafficTypeDiagnostic: DM6PR12MB4561: 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: qc0F/LYtaIUn4HoGEoonMWhhh4ly2/TCw3irK5vQ2+/1GgcxdjUmUAsN4invfE5UNTHLAUhszj+VeTGH4VOSpxs0P16l0OeTdsInUGYvIPfvnHi+U+CBVOSjRNxapnr0HyWymOJa37719kiGyjZmkzOer/tye7jN0ohj3QysyMpxdmzHnt9mleJwZlJ4Y0/Jg4nKVRib2WgeCwBse30eN9zVIvTEN4TK3CvjGta9pwfuq5HiXF/pbFuBHIaTdQ5p9FtFCbb7k+GctNbh53oMfXV60J1/SbP1E/kcpso3U73WQ5Cl4JMyfHaVlu8jBC8RIsUQK3mxILwr3E45sy18Gyv+0IFDkD9dWX7NZDLZWhiAzWzNV6IZ+Dj8BsMCy6eG 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)(346002)(39860400002)(366004)(136003)(396003)(1076003)(83380400001)(86362001)(6506007)(4326008)(69590400008)(52116002)(36756003)(2906002)(6512007)(8676002)(6486002)(16526019)(2616005)(66946007)(66476007)(66556008)(6916009)(5660300002)(186003)(8936002)(478600001)(6666004)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?u5uGjApmq3w39XG1/Yl7nx9I5uQDHxYy7FN+LSDFwLupH8077BQ7lZukCvZi?= =?us-ascii?Q?QXUgYfHNredKc15kYQcibOPUdnYLdBvfxkmToLtH+tZsMjPAJEfCucQOGjzA?= =?us-ascii?Q?XdlOuf/yrxP8pKptr1g+nCyhKu8BCcdxqVf4OfNyTMuE8bQKgEQpMaVZiBDh?= =?us-ascii?Q?yPPq9ufFODsYN3Ms3Sm+wLiC4jUfNnD4U6iAISSjHPzXHRH0hKrHU1C9lAQH?= =?us-ascii?Q?OL7QbnD9LSKGQqx0KtZYHM/y8mL0tehmwg5NSOhzKFFNnufQWjQXo+tKYK5R?= =?us-ascii?Q?0i9apyeEWm+1puKCeenp+zmT6ZAp9QnUmMK8DMLznZclyLQEmfoe4EQV0dQj?= =?us-ascii?Q?jKkn+RRaDMd8cNiFJTiCT4aC3MgP5yIhiM5qH2joP5jpR7RYkYUO7TEYOWwm?= =?us-ascii?Q?uPgQRd2n3f336tlwXzxbu72KIqtNgFBeTx6HB+kBpDrFMrgpFdU80rM+94gT?= =?us-ascii?Q?c+CtGi+XaLyQg701ArXt4hDM60mZTUajo5PUE3buXMdFOBmHoNDkYsehMlU1?= =?us-ascii?Q?4GIVZQx9DqdwLSrIpA6pvsGRqHwEy50YEylwN9yBaWf5iZHlNKsIXIq8kHvI?= =?us-ascii?Q?osnMlDEs36QDwLhfYrIJyYpdjcW0U+JxxdAPHH1m4YjcZ5ATGD8uufGmWWMD?= =?us-ascii?Q?AfNFzkF6dsUe38LOVD/WrYVZY0tGmEf+hmQsugz3XjMVhFcUKpcsjRC5HwZr?= =?us-ascii?Q?SIQtnDTqsyu7TkvCVSziqPsWFk5CQbe2wUYrpdwHHLHUFDYyHifznnWAOozw?= =?us-ascii?Q?pxyzfbT3bI1eXcB3R+JH8MwEVREuRaqSceeyMizgIC4mlwHABI71I2GAO3zI?= =?us-ascii?Q?a+hcHzEWSvGu+i+AsRHZYbrwcIBSvS6VsrDDxHfaZbK2TS5NvPX5usv7/9nH?= =?us-ascii?Q?ckoLaiQB/2Xascq7v6oG0Z374jUG0VnGyUkGmsXYDhJ2y4McYeeJV41mytHH?= =?us-ascii?Q?KpcY1i7qWXtrUbFzR2WYoDcxWONiT4R+W7dfqwoC/+pooPxbynlOqa8VZ72B?= =?us-ascii?Q?I/fTzB47Q5Y6Isu7HONKKsmWEcBBy9iksQYhnnU6w5cGtWDPz+PycEJoN5uW?= =?us-ascii?Q?gRX95ZdK?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2762.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2020 19:01:00.2434 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 3187f92e-2591-4785-5b3a-08d89ae26fee X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rPhYN/fR5/NXPGf8CGDvZYW3JlmjBnGpAdy7YvBZ6/u/4d2lHEwydZnFr7INSePNtBZ1HmJDkYg1WbYuEktORA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4561 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, 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, 07 Dec 2020 19:01:07 -0000 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 e6a9e877e4..a2aa9435a2 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -263,6 +263,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 e3e8bf8ae5..3c40dde13d 100644 --- a/gdb/dwarf2/expr.h +++ b/gdb/dwarf2/expr.h @@ -196,7 +196,7 @@ struct dwarf_expr_context CORE_ADDR obj_address; /* 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 96bfdc1452..46f3f5145d 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 c1f5457e1d..679852c81b 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