From patchwork Mon Nov 6 10:06:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 24105 Received: (qmail 40892 invoked by alias); 6 Nov 2017 10:06:49 -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 40184 invoked by uid 89); 6 Nov 2017 10:06:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LOTSOFHASH, MIME_BASE64_BLANKS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=flexible, minute, vnh, vns X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-ve1eur01on0052.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (104.47.1.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 06 Nov 2017 10:06:39 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0104.eurprd08.prod.outlook.com (10.160.211.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 6 Nov 2017 10:06:28 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::2891:52f2:59:8e54]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::2891:52f2:59:8e54%16]) with mapi id 15.20.0197.019; Mon, 6 Nov 2017 10:06:28 +0000 From: Alan Hayward To: Yao Qi CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH 3/4] Use flexible target descriptors for aarch64 Date: Mon, 6 Nov 2017 10:06:27 +0000 Message-ID: <8EE70574-8937-414B-9903-0E427D388B07@arm.com> References: <86h8ugyenj.fsf@gmail.com> In-Reply-To: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0104; 6:TplOt68e7+I9004cyN/zeygpqaW/3BPA0TL5JsaJEvl11rMnWM2WSOBbSYwzFpqocSuhTVmjMNKaYHIRI+PwhJHxpD4Q0gFGSPwvzNhGNhVtW4FuaGfz25/KE8qzue8A/8D73N70GIWex7cQZjBHg4oTh1kazPlbNhJwjNg3MbvI1kl/on5Jp0N+s2/X0gSsime69AFZkSbdrBtGHcN+qOpdJRdMyLDnIUDyaggKne0Y6thUYHxelQ7aPMN620ahTG0RzPYvGV62fnuuJkYdvgPj3MXC3IizGBzfIOAV7ZXKc6ZP4RLjDvtXL/jZ1TUEE2+ReIuQsBNMUca6mnxCf2XxqrDevt0/eTA2puEWWx8=; 5:LMDBVf1gTZ+ezaTIKnLuk3RqzWBQZN4lcmLOm8vqbuHkgAIwAUpDEFPRKBIErT3TTeofpp7ioX+Hkgb2LxIlJjoP+tAavWmtRGd47tH4q4mk2/TANLq8TMo9E5DmuEv6NriNTNyIyaih+f+6jxPsLODVimzjllbYdiP8gOim60o=; 24:OsU6QkAQfKqc2hjui7RcybXaq2/V2QhrnYWLJbUAwUxfkkOwRprd7JN1Ss0PObSiy5MfdRTOGHoyX0d92ZLmaMuvS2USfR6JL0+ePOmkFWw=; 7:W8UHyc5Z+fk5fjHXeVltTXIZ6uYdE5VFBG+MQJAbgP+OvSXKdS7un4EUhUQphuZ6T/H/umwb5iaOlEf4D/xs9OQVMnKH67OWfKH3WWd6Kq9AsP+2b9wHfhEhrwpN5510tQvudEYR6NRQ04E33jhQmm/yThLO9dk0AaCUJvUkn/+GvMWeIskvn9H7jGEA2Wx9XBTuGjz05ge23m4EtR6wwFe8Le9BBAyKaELAwIr5yLPWiEu9utf8vV2B7D2/HwoC x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: 05467a0f-f256-4e3a-d528-08d524fe0bdb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603199); SRVR:AM3PR08MB0104; x-ms-traffictypediagnostic: AM3PR08MB0104: nodisclaimer: True x-exchange-antispam-report-test: UriScan:(250305191791016)(180628864354917)(22074186197030)(21532816269658); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(100000703101)(100105400095)(3231021)(93006095)(93001095)(6055026)(6041248)(20161123560025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR08MB0104; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR08MB0104; x-forefront-prvs: 048396AFA0 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(199003)(377424004)(189002)(24454002)(4326008)(6512007)(83716003)(25786009)(189998001)(50986999)(76176999)(53946003)(14454004)(6916009)(2950100002)(229853002)(82746002)(39060400002)(54356999)(6246003)(101416001)(2900100001)(53546010)(68736007)(105586002)(99286004)(6306002)(1411001)(106356001)(5250100002)(53936002)(7736002)(33656002)(305945005)(54906003)(3660700001)(2906002)(478600001)(86362001)(575784001)(36756003)(72206003)(6436002)(66066001)(316002)(81166006)(5660300001)(8936002)(81156014)(8676002)(102836003)(6116002)(3846002)(3280700002)(97736004)(6506006)(6486002)(21314002)(579004)(559001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0104; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05467a0f-f256-4e3a-d528-08d524fe0bdb X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Nov 2017 10:06:27.7823 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0104 X-IsSubscribed: yes > On 31 Oct 2017, at 17:16, Alan Hayward wrote: > > >> On 30 Oct 2017, at 13:00, Yao Qi wrote: >> >> Alan Hayward writes: >> >>> Tested on a --enable-targets=all build and aarch64 build with board >>> files unix, native-gdbserver and unittest.exp. >> >> Hi Alan, >> With your patches applied, did you see following assert in gdbserver? >> >> gdb/gdbserver/tdesc.c:96: A problem internal to GDBserver has been detected. >> const char* tdesc_get_features_xml(target_desc*): Assertion `tdesc->xmltarget != NULL || (tdesc->features != NULL && tdesc->arch != NULL && tdesc->osabi != NULL)' failed. >> >> you can reproduce it by starting gdbserver, and "target remote XXX" in >> gdb to connect to gdbserver. >> >> -- >> Yao (齐尧) > > Yes, I do now. Didn’t the last time I tested. Will look into it. > > Thanks for spotting! > > > Alan. Code was asserting because osabi wasn’t set. (A last minute change I had made getting 4/4 to work). In the existing code, osabi is never set for aarch64 - the osabi line is missing from the .xml files. Some other architectures set to “GNU/Linux”. I assumed there was a reason aarch64 didn’t do this. I didn’t want to change this behaviour, so instead in my code osabi is set to “”. Also removed files as suggested. Restested the whole set manually and tested with --enable-targets=all build and aarch64 build with board files unix, native-gdbserver and unittest.exp. (Not reposting 4/4 because there have been no changes to it). Alan. 2017-11-06 Alan Hayward gdb/ * aarch64-tdep.c (_initialize_aarch64_tdep): Remove init. * arch/aarch64.c (aarch64_create_target_description): Create new target description. * features/Makefile: Add/Remove xml files. * features/aarch64.c: Remove file. * features/aarch64-core.c: New autogenerated file. * features/aarch64-fpu.c: New autogenerated file. * target-descriptions.c (maint_print_c_tdesc_cmd): Check for aarch64. gdbserver/ * linux-aarch64-ipa.c (initialize_low_tracepoint): Remove init. * linux-aarch64-low.c (initialize_low_arch): Remove init. * linux-aarch64-tdesc.c (aarch64_linux_read_description): Add init. diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index c91b3435c151019dfe4087e756bd6665e12cd8b1..aed478144b6f0306cdbf4bd9ca69bdc539b49273 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -54,9 +54,6 @@ #include "record.h" #include "record-full.h" - -#include "features/aarch64.c" - #include "arch/aarch64-insn.h" #include "opcode/aarch64.h" @@ -3057,8 +3054,6 @@ _initialize_aarch64_tdep (void) gdbarch_register (bfd_arch_aarch64, aarch64_gdbarch_init, aarch64_dump_tdep); - initialize_tdesc_aarch64 (); - /* Debug this file's internals. */ add_setshow_boolean_cmd ("aarch64", class_maintenance, &aarch64_debug, _("\ Set AArch64 debugging."), _("\ diff --git a/gdb/arch/aarch64.c b/gdb/arch/aarch64.c index 95d9906f10e660fda99d73a0d2a9d184fd3a7b52..31f292e2df8153ad95be67dd064853d6ce9de807 100644 --- a/gdb/arch/aarch64.c +++ b/gdb/arch/aarch64.c @@ -15,16 +15,40 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - +#include +#include #include "aarch64.h" -extern struct target_desc *tdesc_aarch64; +#ifdef GDBSERVER +#include "common/common-defs.h" +#include "common/gdb_vecs.h" +#include "common/vec.h" +#include "tdesc.h" +#else +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" +#endif + +#include "../features/aarch64-core.c" +#include "../features/aarch64-fpu.c" /* Create the aarch64 target description. */ target_desc * aarch64_create_target_description () { - return tdesc_aarch64; -} + target_desc *tdesc = allocate_target_description (); + +#ifndef IN_PROCESS_AGENT + set_tdesc_architecture (tdesc, "aarch64"); + set_tdesc_osabi (tdesc, ""); +#endif + long regnum = 0; + + regnum = create_feature_aarch64_core (tdesc, regnum); + regnum = create_feature_aarch64_fpu (tdesc, regnum); + + return tdesc; +} diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 2d8e3fea3687de1ba5b9a9cffc42728c9e6808e5..0733c9bbb54d36d78595370e47f133d71e09856e 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -119,7 +119,6 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$(WHICH)) # --enable-targets=all GDB. You can override this by passing XMLTOC # to make on the command line. XMLTOC = \ - aarch64.xml \ arc-v2.xml \ arc-arcompact.xml \ arm/arm-with-iwmmxt.xml \ @@ -207,7 +206,9 @@ $(outdir)/%.dat: %.xml number-regs.xsl sort-regs.xsl gdbserver-regs.xsl $(XSLTPROC) gdbserver-regs.xsl - >> $(outdir)/$*.tmp sh ../../move-if-change $(outdir)/$*.tmp $(outdir)/$*.dat -FEATURE_XMLFILES = i386/32bit-core.xml \ +FEATURE_XMLFILES = aarch64-core.xml \ + aarch64-fpu.xml \ + i386/32bit-core.xml \ i386/32bit-sse.xml \ i386/32bit-linux.xml \ i386/32bit-avx.xml \ diff --git a/gdb/features/aarch64-core.c b/gdb/features/aarch64-core.c new file mode 100644 index 0000000000000000000000000000000000000000..a735515ae67211d29634e7c39b375a36edef2bb1 --- /dev/null +++ b/gdb/features/aarch64-core.c @@ -0,0 +1,72 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: aarch64-core.xml.tmp */ + +#ifdef GDBSERVER +#include "tdesc.h" +#else +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" +#endif + +static int +create_feature_aarch64_core (struct target_desc *result, long regnum) +{ + struct tdesc_feature *feature; + + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core", "aarch64-core.xml"); + struct tdesc_type *field_type; + struct tdesc_type *type; + type = tdesc_create_flags (feature, "cpsr_flags", 4); + tdesc_add_flag (type, 0, "SP"); + tdesc_add_flag (type, 1, ""); + tdesc_add_bitfield (type, "EL", 2, 3); + tdesc_add_flag (type, 4, "nRW"); + tdesc_add_flag (type, 5, ""); + tdesc_add_flag (type, 6, "F"); + tdesc_add_flag (type, 7, "I"); + tdesc_add_flag (type, 8, "A"); + tdesc_add_flag (type, 9, "D"); + tdesc_add_flag (type, 20, "IL"); + tdesc_add_flag (type, 21, "SS"); + tdesc_add_flag (type, 28, "V"); + tdesc_add_flag (type, 29, "C"); + tdesc_add_flag (type, 30, "Z"); + tdesc_add_flag (type, 31, "N"); + + tdesc_create_reg (feature, "x0", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x1", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x2", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x3", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x4", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x5", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x6", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x7", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x8", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x9", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x10", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x11", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x12", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x13", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x14", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x15", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x16", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x17", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x18", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x19", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x20", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x21", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x22", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x23", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x24", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x25", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x26", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x27", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x28", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x29", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "x30", regnum++, 1, NULL, 64, "int"); + tdesc_create_reg (feature, "sp", regnum++, 1, NULL, 64, "data_ptr"); + tdesc_create_reg (feature, "pc", regnum++, 1, NULL, 64, "code_ptr"); + tdesc_create_reg (feature, "cpsr", regnum++, 1, NULL, 32, "cpsr_flags"); + return regnum; +} diff --git a/gdb/features/aarch64-fpu.c b/gdb/features/aarch64-fpu.c new file mode 100644 index 0000000000000000000000000000000000000000..db3dfe771531f7a4c6aa09ee51053fa0266e8c2a --- /dev/null +++ b/gdb/features/aarch64-fpu.c @@ -0,0 +1,138 @@ +/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: + Original: aarch64-fpu.xml.tmp */ + +#ifdef GDBSERVER +#include "tdesc.h" +#else +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" +#endif + +static int +create_feature_aarch64_fpu (struct target_desc *result, long regnum) +{ + struct tdesc_feature *feature; + + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.fpu", "aarch64-fpu.xml"); + struct tdesc_type *field_type; + field_type = tdesc_named_type (feature, "ieee_double"); + tdesc_create_vector (feature, "v2d", field_type, 2); + + field_type = tdesc_named_type (feature, "uint64"); + tdesc_create_vector (feature, "v2u", field_type, 2); + + field_type = tdesc_named_type (feature, "int64"); + tdesc_create_vector (feature, "v2i", field_type, 2); + + field_type = tdesc_named_type (feature, "ieee_single"); + tdesc_create_vector (feature, "v4f", field_type, 4); + + field_type = tdesc_named_type (feature, "uint32"); + tdesc_create_vector (feature, "v4u", field_type, 4); + + field_type = tdesc_named_type (feature, "int32"); + tdesc_create_vector (feature, "v4i", field_type, 4); + + field_type = tdesc_named_type (feature, "uint16"); + tdesc_create_vector (feature, "v8u", field_type, 8); + + field_type = tdesc_named_type (feature, "int16"); + tdesc_create_vector (feature, "v8i", field_type, 8); + + field_type = tdesc_named_type (feature, "uint8"); + tdesc_create_vector (feature, "v16u", field_type, 16); + + field_type = tdesc_named_type (feature, "int8"); + tdesc_create_vector (feature, "v16i", field_type, 16); + + field_type = tdesc_named_type (feature, "uint128"); + tdesc_create_vector (feature, "v1u", field_type, 1); + + field_type = tdesc_named_type (feature, "int128"); + tdesc_create_vector (feature, "v1i", field_type, 1); + + struct tdesc_type *type; + type = tdesc_create_union (feature, "vnd"); + field_type = tdesc_named_type (feature, "v2d"); + tdesc_add_field (type, "f", field_type); + field_type = tdesc_named_type (feature, "v2u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v2i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vns"); + field_type = tdesc_named_type (feature, "v4f"); + tdesc_add_field (type, "f", field_type); + field_type = tdesc_named_type (feature, "v4u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v4i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vnh"); + field_type = tdesc_named_type (feature, "v8u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v8i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vnb"); + field_type = tdesc_named_type (feature, "v16u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v16i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "vnq"); + field_type = tdesc_named_type (feature, "v1u"); + tdesc_add_field (type, "u", field_type); + field_type = tdesc_named_type (feature, "v1i"); + tdesc_add_field (type, "s", field_type); + + type = tdesc_create_union (feature, "aarch64v"); + field_type = tdesc_named_type (feature, "vnd"); + tdesc_add_field (type, "d", field_type); + field_type = tdesc_named_type (feature, "vns"); + tdesc_add_field (type, "s", field_type); + field_type = tdesc_named_type (feature, "vnh"); + tdesc_add_field (type, "h", field_type); + field_type = tdesc_named_type (feature, "vnb"); + tdesc_add_field (type, "b", field_type); + field_type = tdesc_named_type (feature, "vnq"); + tdesc_add_field (type, "q", field_type); + + regnum = 34; + tdesc_create_reg (feature, "v0", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v1", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v2", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v3", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v4", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v5", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v6", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v7", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v8", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v9", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v10", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v11", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v12", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v13", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v14", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v15", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v16", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v17", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v18", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v19", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v20", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v21", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v22", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v23", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v24", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v25", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v26", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v27", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v28", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v29", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v30", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "v31", regnum++, 1, NULL, 128, "aarch64v"); + tdesc_create_reg (feature, "fpsr", regnum++, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "fpcr", regnum++, 1, NULL, 32, "int"); + return regnum; +} diff --git a/gdb/features/aarch64.c b/gdb/features/aarch64.c deleted file mode 100644 index 7411cacd4b80bd51a3301a650de588260b0c30ba..0000000000000000000000000000000000000000 --- a/gdb/features/aarch64.c +++ /dev/null @@ -1,191 +0,0 @@ -/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: - Original: aarch64.xml */ - -#include "defs.h" -#include "osabi.h" -#include "target-descriptions.h" - -struct target_desc *tdesc_aarch64; -static void -initialize_tdesc_aarch64 (void) -{ - struct target_desc *result = allocate_target_description (); - set_tdesc_architecture (result, bfd_scan_arch ("aarch64")); - - struct tdesc_feature *feature; - - feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core"); - struct tdesc_type *field_type; - struct tdesc_type *type; - type = tdesc_create_flags (feature, "cpsr_flags", 4); - tdesc_add_flag (type, 0, "SP"); - tdesc_add_flag (type, 1, ""); - tdesc_add_bitfield (type, "EL", 2, 3); - tdesc_add_flag (type, 4, "nRW"); - tdesc_add_flag (type, 5, ""); - tdesc_add_flag (type, 6, "F"); - tdesc_add_flag (type, 7, "I"); - tdesc_add_flag (type, 8, "A"); - tdesc_add_flag (type, 9, "D"); - tdesc_add_flag (type, 20, "IL"); - tdesc_add_flag (type, 21, "SS"); - tdesc_add_flag (type, 28, "V"); - tdesc_add_flag (type, 29, "C"); - tdesc_add_flag (type, 30, "Z"); - tdesc_add_flag (type, 31, "N"); - - tdesc_create_reg (feature, "x0", 0, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x1", 1, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x2", 2, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x3", 3, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x4", 4, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x5", 5, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x6", 6, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x7", 7, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x8", 8, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x9", 9, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x10", 10, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x11", 11, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x12", 12, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x13", 13, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x14", 14, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x15", 15, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x16", 16, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x17", 17, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x18", 18, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x19", 19, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x20", 20, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x21", 21, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x22", 22, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x23", 23, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x24", 24, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x25", 25, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x26", 26, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x27", 27, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x28", 28, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x29", 29, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "x30", 30, 1, NULL, 64, "int"); - tdesc_create_reg (feature, "sp", 31, 1, NULL, 64, "data_ptr"); - tdesc_create_reg (feature, "pc", 32, 1, NULL, 64, "code_ptr"); - tdesc_create_reg (feature, "cpsr", 33, 1, NULL, 32, "cpsr_flags"); - - feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.fpu"); - field_type = tdesc_named_type (feature, "ieee_double"); - tdesc_create_vector (feature, "v2d", field_type, 2); - - field_type = tdesc_named_type (feature, "uint64"); - tdesc_create_vector (feature, "v2u", field_type, 2); - - field_type = tdesc_named_type (feature, "int64"); - tdesc_create_vector (feature, "v2i", field_type, 2); - - field_type = tdesc_named_type (feature, "ieee_single"); - tdesc_create_vector (feature, "v4f", field_type, 4); - - field_type = tdesc_named_type (feature, "uint32"); - tdesc_create_vector (feature, "v4u", field_type, 4); - - field_type = tdesc_named_type (feature, "int32"); - tdesc_create_vector (feature, "v4i", field_type, 4); - - field_type = tdesc_named_type (feature, "uint16"); - tdesc_create_vector (feature, "v8u", field_type, 8); - - field_type = tdesc_named_type (feature, "int16"); - tdesc_create_vector (feature, "v8i", field_type, 8); - - field_type = tdesc_named_type (feature, "uint8"); - tdesc_create_vector (feature, "v16u", field_type, 16); - - field_type = tdesc_named_type (feature, "int8"); - tdesc_create_vector (feature, "v16i", field_type, 16); - - field_type = tdesc_named_type (feature, "uint128"); - tdesc_create_vector (feature, "v1u", field_type, 1); - - field_type = tdesc_named_type (feature, "int128"); - tdesc_create_vector (feature, "v1i", field_type, 1); - - type = tdesc_create_union (feature, "vnd"); - field_type = tdesc_named_type (feature, "v2d"); - tdesc_add_field (type, "f", field_type); - field_type = tdesc_named_type (feature, "v2u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v2i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vns"); - field_type = tdesc_named_type (feature, "v4f"); - tdesc_add_field (type, "f", field_type); - field_type = tdesc_named_type (feature, "v4u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v4i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vnh"); - field_type = tdesc_named_type (feature, "v8u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v8i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vnb"); - field_type = tdesc_named_type (feature, "v16u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v16i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "vnq"); - field_type = tdesc_named_type (feature, "v1u"); - tdesc_add_field (type, "u", field_type); - field_type = tdesc_named_type (feature, "v1i"); - tdesc_add_field (type, "s", field_type); - - type = tdesc_create_union (feature, "aarch64v"); - field_type = tdesc_named_type (feature, "vnd"); - tdesc_add_field (type, "d", field_type); - field_type = tdesc_named_type (feature, "vns"); - tdesc_add_field (type, "s", field_type); - field_type = tdesc_named_type (feature, "vnh"); - tdesc_add_field (type, "h", field_type); - field_type = tdesc_named_type (feature, "vnb"); - tdesc_add_field (type, "b", field_type); - field_type = tdesc_named_type (feature, "vnq"); - tdesc_add_field (type, "q", field_type); - - tdesc_create_reg (feature, "v0", 34, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v1", 35, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v2", 36, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v3", 37, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v4", 38, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v5", 39, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v6", 40, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v7", 41, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v8", 42, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v9", 43, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v10", 44, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v11", 45, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v12", 46, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v13", 47, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v14", 48, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v15", 49, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v16", 50, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v17", 51, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v18", 52, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v19", 53, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v20", 54, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v21", 55, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v22", 56, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v23", 57, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v24", 58, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v25", 59, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v26", 60, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v27", 61, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v28", 62, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v29", 63, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v30", 64, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "v31", 65, 1, NULL, 128, "aarch64v"); - tdesc_create_reg (feature, "fpsr", 66, 1, NULL, 32, "int"); - tdesc_create_reg (feature, "fpcr", 67, 1, NULL, 32, "int"); - - tdesc_aarch64 = result; -} diff --git a/gdb/gdbserver/linux-aarch64-ipa.c b/gdb/gdbserver/linux-aarch64-ipa.c index 28dc9776a1c8d273e8bc749296a57bc62b8619d5..b240100a13eccdfa696937158dbb365dcff12730 100644 --- a/gdb/gdbserver/linux-aarch64-ipa.c +++ b/gdb/gdbserver/linux-aarch64-ipa.c @@ -27,9 +27,6 @@ #endif #include "linux-aarch64-tdesc.h" -/* Defined in auto-generated file aarch64.c. */ -void init_registers_aarch64 (void); - /* Each register saved by the jump pad is in a 16 byte cell. */ #define FT_CR_SIZE 16 @@ -207,5 +204,4 @@ alloc_jump_pad_buffer (size_t size) void initialize_low_tracepoint (void) { - init_registers_aarch64 (); } diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index dcce287974cb6afd2f530ce1257dbbf25ed25ddc..9682537728847850d824c7eac949c68ab09226ac 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -41,9 +41,6 @@ #include "arch/aarch64.h" #include "linux-aarch64-tdesc.h" -/* Defined in auto-generated files. */ -void init_registers_aarch64 (void); - #ifdef HAVE_SYS_REG_H #include #endif @@ -2998,8 +2995,6 @@ struct linux_target_ops the_low_target = void initialize_low_arch (void) { - init_registers_aarch64 (); - initialize_low_arch_aarch32 (); initialize_regsets_info (&aarch64_regsets_info); diff --git a/gdb/gdbserver/linux-aarch64-tdesc.c b/gdb/gdbserver/linux-aarch64-tdesc.c index 138b23c2ae07c67c019b7556efebcded73c6fcb2..08112d2431c51b8b5bde88abd41d42dddff17f0b 100644 --- a/gdb/gdbserver/linux-aarch64-tdesc.c +++ b/gdb/gdbserver/linux-aarch64-tdesc.c @@ -31,7 +31,16 @@ aarch64_linux_read_description () target_desc **tdesc = &aarch64_tdesc; if (*tdesc == NULL) - *tdesc = aarch64_create_target_description (); + { + *tdesc = aarch64_create_target_description (); + + init_target_desc (*tdesc); + +#ifndef IN_PROCESS_AGENT + static const char *expedite_regs_aarch64[] = { "x29", "sp", "pc", NULL }; + (*tdesc)->expedite_regs = expedite_regs_aarch64; +#endif + } return *tdesc; } diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 4f5e9d60a6d98b5855d6ee4ffeaa9fd7149d6395..cb6e4e7c9055795eef9777c7226bd53975610340 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -2327,7 +2327,8 @@ maint_print_c_tdesc_cmd (const char *args, int from_tty) counterparts. */ if (startswith (filename_after_features.c_str (), "i386/32bit-") || startswith (filename_after_features.c_str (), "i386/64bit-") - || startswith (filename_after_features.c_str (), "i386/x32-core.xml")) + || startswith (filename_after_features.c_str (), "i386/x32-core.xml") + || startswith (filename_after_features.c_str (), "aarch64")) { print_c_feature v (filename_after_features);