From patchwork Thu Jul 11 13:46:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 33673 Received: (qmail 19488 invoked by alias); 11 Jul 2019 13:46:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 19240 invoked by uid 89); 11 Jul 2019 13:46:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Spam-Relays-External:208, H*RU:208, tdesc X-HELO: EUR03-VE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr50081.outbound.protection.outlook.com (HELO EUR03-VE1-obe.outbound.protection.outlook.com) (40.107.5.81) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 11 Jul 2019 13:46:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xl2CmhJtmF0VzhFiod7sCwrW3xlqbvJYQx3G1Osmibw=; b=tljncDqa8NWjHfTiZQSTEzqWN0epVQbtvEtP1MBqLAb9Nb2WQm74GXenBYLoxbvocQ2ALlsFY6GsHCnd+rIdtboImzI7CqdXXDhe+A/4o+9tV29gP1LJlBaeRADdLvaA1UAd33+0AOBieTphhfPvmIi5ePK00iEs7641zrG2I5g= Received: from DB6PR0802CA0038.eurprd08.prod.outlook.com (2603:10a6:4:a3::24) by DB6PR0801MB1847.eurprd08.prod.outlook.com (2603:10a6:4:3c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.18; Thu, 11 Jul 2019 13:46:33 +0000 Received: from VE1EUR03FT033.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::208) by DB6PR0802CA0038.outlook.office365.com (2603:10a6:4:a3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2073.10 via Frontend Transport; Thu, 11 Jul 2019 13:46:33 +0000 Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; sourceware.org; dmarc=temperror action=none header.from=arm.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT033.mail.protection.outlook.com (10.152.18.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2052.18 via Frontend Transport; Thu, 11 Jul 2019 13:46:32 +0000 Received: ("Tessian outbound c2673421c4c6:v24"); Thu, 11 Jul 2019 13:46:32 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 11d13de09093be07 X-CR-MTA-TID: 64aa7808 Received: from 9375eeb321ac.2 (cr-mta-lb-1.cr-mta-net [104.47.9.53]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id C4C8E0E5-518B-43F0-BB52-41E783F3BC5C.1; Thu, 11 Jul 2019 13:46:27 +0000 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2053.outbound.protection.outlook.com [104.47.9.53]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9375eeb321ac.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 11 Jul 2019 13:46:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xl2CmhJtmF0VzhFiod7sCwrW3xlqbvJYQx3G1Osmibw=; b=tljncDqa8NWjHfTiZQSTEzqWN0epVQbtvEtP1MBqLAb9Nb2WQm74GXenBYLoxbvocQ2ALlsFY6GsHCnd+rIdtboImzI7CqdXXDhe+A/4o+9tV29gP1LJlBaeRADdLvaA1UAd33+0AOBieTphhfPvmIi5ePK00iEs7641zrG2I5g= Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com (10.172.227.22) by DB6PR0802MB2232.eurprd08.prod.outlook.com (10.172.226.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.19; Thu, 11 Jul 2019 13:46:25 +0000 Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::259b:8edf:fb65:2760]) by DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::259b:8edf:fb65:2760%8]) with mapi id 15.20.2052.020; Thu, 11 Jul 2019 13:46:25 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd , Alan Hayward Subject: [PATCH v2 2/5] Arm: Use feature target descriptions Date: Thu, 11 Jul 2019 13:46:25 +0000 Message-ID: <20190711134436.47896-3-alan.hayward@arm.com> References: <20190711134436.47896-1-alan.hayward@arm.com> In-Reply-To: <20190711134436.47896-1-alan.hayward@arm.com> Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; X-Microsoft-Antispam-Untrusted: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB6PR0802MB2232; x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:6108;OLM:6108; X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(396003)(136003)(366004)(39860400002)(199004)(189003)(54534003)(53936002)(99286004)(66476007)(66556008)(64756008)(2906002)(66946007)(446003)(71200400001)(5640700003)(478600001)(2501003)(66446008)(44832011)(186003)(71190400001)(316002)(1076003)(6436002)(6512007)(486006)(6916009)(2351001)(66066001)(6486002)(76176011)(476003)(102836004)(386003)(52116002)(6506007)(8676002)(11346002)(68736007)(50226002)(26005)(86362001)(7736002)(81166006)(81156014)(2616005)(14454004)(6116002)(4326008)(305945005)(3846002)(36756003)(5660300002)(256004)(14444005)(54906003)(8936002)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0802MB2232; H:DB6PR0802MB2133.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info-Original: yp3pDKBOBWjGQWaLmljbK6tTxdioEgiGgYemCmctNSJwom58unws/cuqbmjKRGNYHsZDI/66twjQB60WP4F8mbBVOFhdPXNt0+AAU5eUxzv0GiFO6xbhcFrM+ChZ40OJYBTgTWSBrEbI/DgJE4Gase40EKU64ZhPxfwWVsYJj/eHn+EKlLi9BXcrJ1qGOfDSOrzJpFvV/OhdcB0QH39eWuDm4c9T3h1rSVlPFmzGet8WYvuNNYqieV9YlvM0rsxmGvAKPjPlCjRYCBPr4PZRuJ+5wzkSEiIQyV3M0mNtrz6qum8SYXXEZNxVoBCpLhOmsmjoXJ9NQFx5KIrf6t976UBn400L+gSWUeWVMfpD5jMLb36fKZVfQIxh+fLUBAeVOc6OwXwKqzL0cq69dO2q4L6MTk7jEwyMJMkx26jsNF0= MIME-Version: 1.0 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; Return-Path: Alan.Hayward@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT033.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: e5721ff1-8a42-4c44-03ee-08d706062a73 X-IsSubscribed: yes In arm arm_create_target_description and aarch32_create_target_description create feature based target descriptions instead of returning the old style descriptions. Ensure the descriptions are created in exactly the same way as the old xml files. Remove the old initialize calls. Note this fixes the gdbserver build for AArch64. gdb/ChangeLog: 2019-07-11 Alan Hayward * arch/aarch32.c (aarch32_create_target_description): Create target descriptions using features. * arch/arm.c (arm_create_target_description) (arm_create_mprofile_target_description): Likewise. * arm-tdep.c (_initialize_arm_tdep): Remove tdesc init calls. --- gdb/arch/aarch32.c | 18 +++++++++++-- gdb/arch/arm.c | 67 +++++++++++++++++++++++++++++++--------------- gdb/arm-tdep.c | 17 ------------ 3 files changed, 62 insertions(+), 40 deletions(-) diff --git a/gdb/arch/aarch32.c b/gdb/arch/aarch32.c index f3cb8c7855..f15096e592 100644 --- a/gdb/arch/aarch32.c +++ b/gdb/arch/aarch32.c @@ -18,12 +18,26 @@ #include "common/common-defs.h" #include "aarch32.h" -extern struct target_desc *tdesc_arm_with_neon; +#include "../features/arm/arm-core.c" +#include "../features/arm/arm-vfpv3.c" /* See aarch32.h. */ target_desc * aarch32_create_target_description () { - return tdesc_arm_with_neon; + target_desc *tdesc = allocate_target_description (); + +#ifndef IN_PROCESS_AGENT + set_tdesc_architecture (tdesc, "arm"); +#endif + + long regnum = 0; + + regnum = create_feature_arm_arm_core (tdesc, regnum); + /* Create a vfpv3 feature, then a blank NEON feature. */ + regnum = create_feature_arm_arm_vfpv3 (tdesc, regnum); + tdesc_create_feature (tdesc, "org.gnu.gdb.arm.neon"); + + return tdesc; } diff --git a/gdb/arch/arm.c b/gdb/arch/arm.c index 769d280a52..ea03dd1685 100644 --- a/gdb/arch/arm.c +++ b/gdb/arch/arm.c @@ -21,16 +21,12 @@ #include "gdbsupport/common-regcache.h" #include "arm.h" -extern struct target_desc *tdesc_arm_with_vfpv2; -extern struct target_desc *tdesc_arm_with_vfpv3; -extern struct target_desc *tdesc_arm_with_iwmmxt; - -/* Temporary ifdef. Will be removed when target descriptions are switched. */ -#ifndef GDBSERVER -extern struct target_desc *tdesc_arm_with_m; -extern struct target_desc *tdesc_arm_with_m_vfp_d16; -extern struct target_desc *tdesc_arm_with_m_fpa_layout; -#endif +#include "../features/arm/arm-core.c" +#include "../features/arm/arm-vfpv2.c" +#include "../features/arm/arm-vfpv3.c" +#include "../features/arm/xscale-iwmmxt.c" +#include "../features/arm/arm-m-profile.c" +#include "../features/arm/arm-m-profile-with-fpa.c" /* See arm.h. */ @@ -389,23 +385,41 @@ shifted_reg_val (struct regcache *regcache, unsigned long inst, target_desc * arm_create_target_description (arm_fp_type fp_type) { + target_desc *tdesc = allocate_target_description (); + +#ifndef IN_PROCESS_AGENT + if (fp_type == ARM_FP_TYPE_IWMMXT) + set_tdesc_architecture (tdesc, "iwmmxt"); + else + set_tdesc_architecture (tdesc, "arm"); +#endif + + long regnum = 0; + + regnum = create_feature_arm_arm_core (tdesc, regnum); + switch (fp_type) { case ARM_FP_TYPE_NONE: - return nullptr; + break; case ARM_FP_TYPE_VFPV2: - return tdesc_arm_with_vfpv2; + regnum = create_feature_arm_arm_vfpv2 (tdesc, regnum); + break; case ARM_FP_TYPE_VFPV3: - return tdesc_arm_with_vfpv3; + regnum = create_feature_arm_arm_vfpv3 (tdesc, regnum); + break; case ARM_FP_TYPE_IWMMXT: - return tdesc_arm_with_iwmmxt; + regnum = create_feature_arm_xscale_iwmmxt (tdesc, regnum); + break; default: error (_("Invalid Arm FP type: %d"), fp_type); } + + return tdesc; } /* See arch/arm.h. */ @@ -413,21 +427,32 @@ arm_create_target_description (arm_fp_type fp_type) target_desc * arm_create_mprofile_target_description (arm_m_profile_type m_type) { + target_desc *tdesc = allocate_target_description (); + +#ifndef IN_PROCESS_AGENT + set_tdesc_architecture (tdesc, "arm"); +#endif + + long regnum = 0; + switch (m_type) { -/* Temporary ifdef. Will be removed when target descriptions are switched. */ -#ifndef GDBSERVER case ARM_M_TYPE_M_PROFILE: - return tdesc_arm_with_m; + regnum = create_feature_arm_arm_m_profile (tdesc, regnum); + break; case ARM_M_TYPE_VFP_D16: - return tdesc_arm_with_m_fpa_layout; + regnum = create_feature_arm_arm_m_profile (tdesc, regnum); + regnum = create_feature_arm_arm_vfpv2 (tdesc, regnum); + break; case ARM_M_TYPE_WITH_FPA: - return tdesc_arm_with_m_vfp_d16; -#endif + regnum = create_feature_arm_arm_m_profile_with_fpa (tdesc, regnum); + break; + default: error (_("Invalid Arm M type: %d"), m_type); } -} + return tdesc; +} diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 1b19b72ca1..1d655eab5c 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -61,14 +61,6 @@ #include "record-full.h" #include -#include "features/arm/arm-with-m.c" -#include "features/arm/arm-with-m-fpa-layout.c" -#include "features/arm/arm-with-m-vfp-d16.c" -#include "features/arm/arm-with-iwmmxt.c" -#include "features/arm/arm-with-vfpv2.c" -#include "features/arm/arm-with-vfpv3.c" -#include "features/arm/arm-with-neon.c" - #if GDB_SELF_TEST #include "gdbsupport/selftest.h" #endif @@ -9451,15 +9443,6 @@ _initialize_arm_tdep (void) bfd_target_elf_flavour, arm_elf_osabi_sniffer); - /* Initialize the standard target descriptions. */ - initialize_tdesc_arm_with_m (); - initialize_tdesc_arm_with_m_fpa_layout (); - initialize_tdesc_arm_with_m_vfp_d16 (); - initialize_tdesc_arm_with_iwmmxt (); - initialize_tdesc_arm_with_vfpv2 (); - initialize_tdesc_arm_with_vfpv3 (); - initialize_tdesc_arm_with_neon (); - /* Add root prefix command for all "set arm"/"show arm" commands. */ add_prefix_cmd ("arm", no_class, set_arm_command, _("Various ARM-specific commands."),