From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2078.outbound.protection.outlook.com [40.107.223.78]) by sourceware.org (Postfix) with ESMTPS id 4AB32398B41E for ; Fri, 28 May 2021 15:47:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4AB32398B41E ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rm9C+O31zx2Sd9FaCQ7uc/vcsSpkpMs8r5WWDIqo/iCTeMMfd5g+EhWNQyDOLGUMIH6gCAKCYPH1XFj3LY3y13oXpGfrTYWXCl20gEK3bKXfWmRT8AwvkTUGIdtPHb0lCnB94VBmJqYGAEUN3Iaj/pHzgFQbIdlC3raiuUZq9QehL3kdq36ybzcOqw6voDE+JBaDKgYxE0Z8FwI4mM1VaxDDvtb+70K6aohI0m6vW0z3vfvf89LgRBcLZ2ebAEjqNy8g5kqRq0V7+4pClaGCYESitR8xETHRoynq+afQY5f3PHBMR2ChvJIdaR5VqpzWoOR/9FCRRTk0mBMzIp9VXQ== 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=26NhieNf7CcccPYNAApbMBCMz8mfOmS2SIMSkoNodnM=; b=HwMjqA/XXnuJVNCkT+nz4/GTiZz4TfGMWFQHpRsYOscxP3SZH9rMJ3wcShNkfAtIHwxZRW0c/aCCCzxC5aHEjPrmUcdBuomAfhpulqDGrsAGU0AcfCOFZlMXQZrOLqC0LglJ+/wG7FkZ7t8r68Whr1zHJy0qN8Rs8X2SqyeFSUpNg/lDWF/FE3qDY+Qd4POAWYkIOzbIjm2qAauPw4LBJb3F+/CbaELpnN0+1xQoaJNRMkWbExs9IryJy9bMejXcaOfTXtlta+6ExzNKvI+vwhnNJJ0m9cams+vSe5C27NyjxTZSGO6/uTeL/9ZrnP3TLj+xLvGx0hoGB5aL8NpHkA== 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=none sp=none pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DM5PR13CA0018.namprd13.prod.outlook.com (2603:10b6:3:23::28) by SJ0PR12MB5487.namprd12.prod.outlook.com (2603:10b6:a03:301::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.22; Fri, 28 May 2021 15:47:11 +0000 Received: from DM6NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:3:23:cafe::92) by DM5PR13CA0018.outlook.office365.com (2603:10b6:3:23::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.9 via Frontend Transport; Fri, 28 May 2021 15:47:11 +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 DM6NAM11FT006.mail.protection.outlook.com (10.13.173.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4150.30 via Frontend Transport; Fri, 28 May 2021 15:47:11 +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.2242.4; Fri, 28 May 2021 10:47:10 -0500 From: Zoran Zaric To: Subject: [PATCH v3 08/17] Move read_mem to dwarf_expr_context Date: Fri, 28 May 2021 16:46:39 +0100 Message-ID: <20210528154648.60881-9-zoran.zaric@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210528154648.60881-1-zoran.zaric@amd.com> References: <20210528154648.60881-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: aee852a1-c2d9-4ec6-1950-08d921efdba9 X-MS-TrafficTypeDiagnostic: SJ0PR12MB5487: 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: 1ncTLYyMoFgdYhuTHJWqK/NhMkIZTTahNC113FQmTuXbSGROivEUNFgDWu/psOB3BwI3TFx9h+j/F6DHWHn/fYi5yBDmqfR24EKkqHBM6oC3O0uwCHstD+THNDTSpOkVyLz0sW8KRwCXFz0lfSIMANseQeq3e92HDHQwaM3Q/L88s/UPOHOHrWmBwyPk5+lCzsiXz5YIhKkPpxYvBtEVcQK+P3JBbBizpBl4sClkLD2kN3XCOg0roZu3EQPtpUvNmzHydw2DN0YjImUo+hoOph6R8U3Yk8PJQZvyG9E47wmQV1JAHpSDimpq8Gz7Mu2XB0OixDMxRxCMEjapPttxd2m2L1T4Kvdpe2g8rg0q+zOHRgndk3S+MgkNDRr/8jmBAeDAcihNJfbARscsOF5zaIU2EkFluQRmR0B4+Zcto0KEaLEggDeqAZLb/x/OrKHzL3XACEeFg1I4o4u3V0F/Jtlck+39Sa5bnafqqsXPMV/z0sjjUSfX8rfSO/ZevdtE5mVXAkd569lRnlJDVg/g9Ei2/oXTZYauXqV2FEVXxzfyEYBoo9PbJYmuavE7eeNs8lOajdoPRokAH1kB0zbS2p2UTrFWJgX3iNIj1KajN+zkFr9i6KW4N3xlgFZiVsfdhBriPLOsxtNQ5h/TuBqiAFuxupiI/MGcIqArt/aa/SvLcc3xHraElydEoWaCokLy 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)(346002)(376002)(39860400002)(136003)(396003)(46966006)(36840700001)(426003)(8936002)(356005)(81166007)(8676002)(83380400001)(4326008)(6666004)(1076003)(86362001)(70206006)(186003)(70586007)(16526019)(36756003)(2616005)(44832011)(82310400003)(82740400003)(478600001)(26005)(47076005)(316002)(6916009)(2906002)(336012)(36860700001)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2021 15:47:11.4759 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aee852a1-c2d9-4ec6-1950-08d921efdba9 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: DM6NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5487 X-Spam-Status: No, score=-11.3 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.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: Fri, 28 May 2021 15:47:15 -0000 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 689224b63a3..b2d58ff4afe 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -257,6 +257,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 ad1918eb18c..7e2aed07ed7 100644 --- a/gdb/dwarf2/expr.h +++ b/gdb/dwarf2/expr.h @@ -192,7 +192,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 52b09809ccb..99330092c12 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -232,11 +232,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 07b7ececff5..34dd3a55fdd 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