From patchwork Thu Mar 1 11:41:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 26134 Received: (qmail 52934 invoked by alias); 1 Mar 2018 11:41:35 -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 52784 invoked by uid 89); 1 Mar 2018 11:41:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=1959, (unknown) X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-ve1eur01on0067.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (104.47.1.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 01 Mar 2018 11:41:29 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0705.eurprd08.prod.outlook.com (10.163.189.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.527.15; Thu, 1 Mar 2018 11:41:26 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::fc60:4b4d:7de8:f8b7]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::fc60:4b4d:7de8:f8b7%16]) with mapi id 15.20.0527.022; Thu, 1 Mar 2018 11:41:26 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd Subject: [PATCH v3 7/8]: Remove xml file references from target descriptions. Date: Thu, 1 Mar 2018 11:41:26 +0000 Message-ID: <8ABAD1D5-0125-40C6-B3C9-B7DAA9743EC6@arm.com> References: <757A8B89-2EF0-46BD-BAA6-6E668538B17F@arm.com> In-Reply-To: <757A8B89-2EF0-46BD-BAA6-6E668538B17F@arm.com> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0705; 6:TY3Cqq03azL9C+sa0oogzzku+ZCWkWQotR5V3AEqCqi+7r7MMBVO3m0f74c7SRE4mLPI6iCI5TklnSKksmmLzMdgvvg1ljvM8au0IoQ2J6xu0FKNnSReDxorjnTDphspGf1tY2gJN0IWleM3m3oTet6xj2U5oviRMuU9iKR8jtJsbpF7aE5XNDrZsgNYrSvMI+qbRzO/ti13Us3Yw0Q+/C9GvjV5QKWBLyjL0tqHG2KpdF8yLe1ZS9ri2u78zIK9VZ3LiRR8uLWjKoWivViCTkxDEfWZIdIBNx+u5fYIa53yAK2u7FK97oePVdwoJ44FyVcllL+cqLcZxVK5u7ihBUvv8QxmWn8TWMdjQLaFUmIXkoTCkKHn39U+Yu/o0gV8; 5:/l3UGkvlC+0qrj2mdMyp+XEAHbom3IlWzkE3ezzeL/GE+QWLiWX019akH8itutfrsN2P2W2zLHKMKWCWYFTbBcsvDyebSI4MXTrdQ5RwRyX5/Egi5iwHe2pO/wy6mqhRlWQq90pvMPPIZx0hbjDUPzOijDrYxNAsxf7lN/YS05U=; 24:KrEmQX4eOKb82XPBfoTI7ew0gR/PFcOqhvPhXy+h1JmsnaZYdpuUcoYCKOIdZQZYBBlF8JckfLtOgbtKu0V0txou44rOov0kvUeuvxNgOIg=; 7:f2Na4Wy59dVRaB3oWxa+UdmZt8EfX0vhLP1Xu8UrTLV3FAWtsv6VkRvNwcmQp2Q0SE2DDg5U298lonwtsvahBiP3CfEof6iM0LHLFVbXxrWc+fbGtdIS9HK/ptFXXf8uuis2Aun4BV8ubHKckhfL+7oKA57MMUkee/jEN4ouz/S489kl9yi3W+GE82v6IGEwO36r+BNWKtnBBXtABdIxHFIXXyNtkxP8lxliPLSLK7Yz0Ryi3CgFTed50tA0eB3f x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c3ebb074-24d4-4e2d-d4db-08d57f695dc6 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(2017052603307)(7153060)(7193020); SRVR:AM3PR08MB0705; x-ms-traffictypediagnostic: AM3PR08MB0705: nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(180628864354917); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501227)(52105095)(10201501046)(3002001)(6055026)(6041288)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:AM3PR08MB0705; BCL:0; PCL:0; RULEID:; SRVR:AM3PR08MB0705; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(346002)(376002)(377424004)(199004)(189003)(81156014)(6346003)(6512007)(102836004)(6506007)(8936002)(8676002)(68736007)(99286004)(4743002)(53936002)(186003)(26005)(97736004)(3660700001)(25786009)(14454004)(105586002)(72206003)(2351001)(106356001)(82746002)(316002)(81166006)(5660300001)(478600001)(76176011)(6486002)(4326008)(36756003)(66066001)(305945005)(7736002)(83716003)(2950100002)(6916009)(575784001)(86362001)(33656002)(2501003)(6436002)(53946003)(2906002)(6116002)(5250100002)(3846002)(2900100001)(3280700002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0705; 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) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-microsoft-antispam-message-info: VhA1qzP88chMu/n2A9ysoTMlP1j3FDw8NlsGQs67h6qxRTDeNdFdRaCrbHfPZi4vvCykdEQVjjYXhOKqwZ75nRAXD0fWA+gds2+Fabb9HHcVWfJI2DrBLuGEX5ifA1Hj4/0EuV+FXUIBEPEmQdRDQb6WRd7y213BvtGLUjlzaYg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <69E1CA67C31C8345B77672AAA01633C1@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3ebb074-24d4-4e2d-d4db-08d57f695dc6 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 11:41:26.2992 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0705 X-IsSubscribed: yes We no longer need to know the name of the xml file. This patch removes the references and regenerates the C files. Alan. 2018-03-01 Alan Hayward gdb/ * common/tdesc.h (tdesc_create_feature): Remove xml filename parameter. * features/aarch64-core.c (create_feature_aarch64_core): Regenerate. * features/aarch64-fpu.c (create_feature_aarch64_fpu): Likewise. * features/i386/32bit-avx.c (create_feature_i386_32bit_avx): Likewise. * features/i386/32bit-avx512.c (create_feature_i386_32bit_avx512): Likewise. * features/i386/32bit-core.c (create_feature_i386_32bit_core): Likewise. * features/i386/32bit-linux.c (create_feature_i386_32bit_linux): Likewise. * features/i386/32bit-mpx.c (create_feature_i386_32bit_mpx): Likewise. * features/i386/32bit-pkeys.c (create_feature_i386_32bit_pkeys): Likewise. * features/i386/32bit-sse.c (create_feature_i386_32bit_sse): Likewise. * features/i386/64bit-avx.c (create_feature_i386_64bit_avx): Likewise. * features/i386/64bit-avx512.c (create_feature_i386_64bit_avx512): Likewise. * features/i386/64bit-core.c (create_feature_i386_64bit_core): Likewise. * features/i386/64bit-linux.c (create_feature_i386_64bit_linux): Likewise. * features/i386/64bit-mpx.c (create_feature_i386_64bit_mpx): Likewise. * features/i386/64bit-pkeys.c (create_feature_i386_64bit_pkeys): Likewise. * features/i386/64bit-segments.c (create_feature_i386_64bit_segments): Likewise. * features/i386/64bit-sse.c (create_feature_i386_64bit_sse): Likewise. * features/i386/x32-core.c (create_feature_i386_x32_core): Likewise. * features/tic6x-c6xp.c (create_feature_tic6x_c6xp): Likewise. * features/tic6x-core.c (create_feature_tic6x_core): Likewise. * features/tic6x-gp.c (create_feature_tic6x_gp): Likewise. * target-descriptions.c: In generated code, don't pass xml filename. gdbserver/ * gdbserver/tdesc.c: Remove xml parameter. diff --git a/gdb/common/tdesc.h b/gdb/common/tdesc.h index 1c5ddc572cf76cb24176fd638dde417687d202b0..cf288b096a6b553ce8fc1a155f3488402e63dac3 100644 --- a/gdb/common/tdesc.h +++ b/gdb/common/tdesc.h @@ -323,9 +323,7 @@ struct tdesc_type *tdesc_named_type (const struct tdesc_feature *feature, /* Return the created feature named NAME in target description TDESC. */ struct tdesc_feature *tdesc_create_feature (struct target_desc *tdesc, - const char *name, - const char *xml = nullptr); - + const char *name); /* Return the created vector tdesc_type named NAME in FEATURE. */ struct tdesc_type *tdesc_create_vector (struct tdesc_feature *feature, diff --git a/gdb/features/aarch64-core.c b/gdb/features/aarch64-core.c index db10c4aa068d9fa1fb089f15dfc0fc3827a3a286..cd3de02cbc122d0be4a2b30a806b259222b17519 100644 --- a/gdb/features/aarch64-core.c +++ b/gdb/features/aarch64-core.c @@ -8,7 +8,7 @@ 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"); + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core"); tdesc_type_with_fields *type_with_fields; type_with_fields = tdesc_create_flags (feature, "cpsr_flags", 4); tdesc_add_flag (type_with_fields, 0, "SP"); diff --git a/gdb/features/aarch64-fpu.c b/gdb/features/aarch64-fpu.c index 0c40c4cef22e42be5ee27bf205ee60f5dbbdbf0f..47962d1f242751f68d1a9a41aedba4ad662a2ecd 100644 --- a/gdb/features/aarch64-fpu.c +++ b/gdb/features/aarch64-fpu.c @@ -8,7 +8,7 @@ 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"); + feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.fpu"); tdesc_type *element_type; element_type = tdesc_named_type (feature, "ieee_double"); tdesc_create_vector (feature, "v2d", element_type, 2); diff --git a/gdb/features/i386/32bit-avx.c b/gdb/features/i386/32bit-avx.c index 6e2cfdbdcbcc024fc81db522842e8377cb2d50c5..b9feac377cf696efbabc417895788081ac3bfb32 100644 --- a/gdb/features/i386/32bit-avx.c +++ b/gdb/features/i386/32bit-avx.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_avx (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx", "32bit-avx.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx"); tdesc_create_reg (feature, "ymm0h", regnum++, 1, NULL, 128, "uint128"); tdesc_create_reg (feature, "ymm1h", regnum++, 1, NULL, 128, "uint128"); tdesc_create_reg (feature, "ymm2h", regnum++, 1, NULL, 128, "uint128"); diff --git a/gdb/features/i386/32bit-avx512.c b/gdb/features/i386/32bit-avx512.c index 863c119ac40d25270729ae849b4bbb53977b4e15..51a403259db2dbae7524df606f6c03bd0f03f5cb 100644 --- a/gdb/features/i386/32bit-avx512.c +++ b/gdb/features/i386/32bit-avx512.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_avx512 (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx512", "32bit-avx512.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx512"); tdesc_type *element_type; element_type = tdesc_named_type (feature, "uint128"); tdesc_create_vector (feature, "v2ui128", element_type, 2); diff --git a/gdb/features/i386/32bit-core.c b/gdb/features/i386/32bit-core.c index f6de737074202f37e57861ca3f1609d1e9ecc86a..098c2ca31c6bb63d51c77aa75bc46061966403be 100644 --- a/gdb/features/i386/32bit-core.c +++ b/gdb/features/i386/32bit-core.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_core (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core", "32bit-core.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core"); tdesc_type_with_fields *type_with_fields; type_with_fields = tdesc_create_flags (feature, "i386_eflags", 4); tdesc_add_flag (type_with_fields, 0, "CF"); diff --git a/gdb/features/i386/32bit-linux.c b/gdb/features/i386/32bit-linux.c index af476da194e2cb0c4a88030f6480917130323de0..3bc593739c9bcbda7e7a8b0a9ca830ed2cc51e39 100644 --- a/gdb/features/i386/32bit-linux.c +++ b/gdb/features/i386/32bit-linux.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_linux (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux", "32bit-linux.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux"); regnum = 41; tdesc_create_reg (feature, "orig_eax", regnum++, 1, NULL, 32, "int"); return regnum; diff --git a/gdb/features/i386/32bit-mpx.c b/gdb/features/i386/32bit-mpx.c index 84101746b50e3a55ea6e76a9c1b6549a75de402f..8288e9d758f2718465621ed55b3514145cf1dd3b 100644 --- a/gdb/features/i386/32bit-mpx.c +++ b/gdb/features/i386/32bit-mpx.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_mpx (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx", "32bit-mpx.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx"); tdesc_type_with_fields *type_with_fields; type_with_fields = tdesc_create_struct (feature, "br128"); tdesc_type *field_type; diff --git a/gdb/features/i386/32bit-pkeys.c b/gdb/features/i386/32bit-pkeys.c index 272751f5781e81373e090d18e8bd133529d3570e..a2a72f40a31005153b2bd7ba35625ca39fa99b87 100644 --- a/gdb/features/i386/32bit-pkeys.c +++ b/gdb/features/i386/32bit-pkeys.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_pkeys (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.pkeys", "32bit-pkeys.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.pkeys"); tdesc_create_reg (feature, "pkru", regnum++, 1, NULL, 32, "uint32"); return regnum; } diff --git a/gdb/features/i386/32bit-sse.c b/gdb/features/i386/32bit-sse.c index 78fc02b863c7d1107d8360c4a4707a8df2ea4642..68fbab06a4003f0df9040a880968350d5b84f1dd 100644 --- a/gdb/features/i386/32bit-sse.c +++ b/gdb/features/i386/32bit-sse.c @@ -8,7 +8,7 @@ create_feature_i386_32bit_sse (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.sse", "32bit-sse.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.sse"); tdesc_type *element_type; element_type = tdesc_named_type (feature, "ieee_single"); tdesc_create_vector (feature, "v4f", element_type, 4); diff --git a/gdb/features/i386/64bit-avx.c b/gdb/features/i386/64bit-avx.c index 5f11035af3f208b0a0bdfee36802e4cc7b29ccf9..7e45c980dbc1ed25e22c116119b0c784b551a962 100644 --- a/gdb/features/i386/64bit-avx.c +++ b/gdb/features/i386/64bit-avx.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_avx (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx", "64bit-avx.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx"); tdesc_create_reg (feature, "ymm0h", regnum++, 1, NULL, 128, "uint128"); tdesc_create_reg (feature, "ymm1h", regnum++, 1, NULL, 128, "uint128"); tdesc_create_reg (feature, "ymm2h", regnum++, 1, NULL, 128, "uint128"); diff --git a/gdb/features/i386/64bit-avx512.c b/gdb/features/i386/64bit-avx512.c index 733910025bab29345124e4c006136ffa19e98339..acc07a3628b2fb7e01b839eb063eabbf99ad42a7 100644 --- a/gdb/features/i386/64bit-avx512.c +++ b/gdb/features/i386/64bit-avx512.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_avx512 (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx512", "64bit-avx512.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx512"); tdesc_type *element_type; element_type = tdesc_named_type (feature, "ieee_single"); tdesc_create_vector (feature, "v4f", element_type, 4); diff --git a/gdb/features/i386/64bit-core.c b/gdb/features/i386/64bit-core.c index efc7016380851ab21686cd7920b57666313a1bab..617425da217da0823dd1c49440312d86d54a778f 100644 --- a/gdb/features/i386/64bit-core.c +++ b/gdb/features/i386/64bit-core.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_core (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core", "64bit-core.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core"); tdesc_type_with_fields *type_with_fields; type_with_fields = tdesc_create_flags (feature, "i386_eflags", 4); tdesc_add_flag (type_with_fields, 0, "CF"); diff --git a/gdb/features/i386/64bit-linux.c b/gdb/features/i386/64bit-linux.c index c9c56f193cf7bee14b3c1b2b4733cb037196c5c6..68de9d27e8bb495b5cdb0a9e681171ed0f811284 100644 --- a/gdb/features/i386/64bit-linux.c +++ b/gdb/features/i386/64bit-linux.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_linux (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux", "64bit-linux.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux"); regnum = 57; tdesc_create_reg (feature, "orig_rax", regnum++, 1, NULL, 64, "int"); return regnum; diff --git a/gdb/features/i386/64bit-mpx.c b/gdb/features/i386/64bit-mpx.c index d923813d699d331c8669e1f4493706bb0851b4ba..ce4d611d9c11aa5e63a33e304f99b66d9e63fb87 100644 --- a/gdb/features/i386/64bit-mpx.c +++ b/gdb/features/i386/64bit-mpx.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_mpx (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx", "64bit-mpx.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx"); tdesc_type_with_fields *type_with_fields; type_with_fields = tdesc_create_struct (feature, "br128"); tdesc_type *field_type; diff --git a/gdb/features/i386/64bit-pkeys.c b/gdb/features/i386/64bit-pkeys.c index f1cbce0ce7fbf4af2a285dae9cbb1db2c569c3a5..70b88cf74db40f341a9c7195d897604d96b58d8b 100644 --- a/gdb/features/i386/64bit-pkeys.c +++ b/gdb/features/i386/64bit-pkeys.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_pkeys (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.pkeys", "64bit-pkeys.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.pkeys"); tdesc_create_reg (feature, "pkru", regnum++, 1, NULL, 32, "uint32"); return regnum; } diff --git a/gdb/features/i386/64bit-segments.c b/gdb/features/i386/64bit-segments.c index 900471fc48c9361d6c453c92c1bc67a93409941d..b06d40fbda3b9a5aa0bcea01831e23399cad27d6 100644 --- a/gdb/features/i386/64bit-segments.c +++ b/gdb/features/i386/64bit-segments.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_segments (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.segments", "64bit-segments.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.segments"); tdesc_create_reg (feature, "fs_base", regnum++, 1, NULL, 64, "int"); tdesc_create_reg (feature, "gs_base", regnum++, 1, NULL, 64, "int"); return regnum; diff --git a/gdb/features/i386/64bit-sse.c b/gdb/features/i386/64bit-sse.c index 294360197f588ddfc595e18d6386a53f108b60e6..e08309374115d16ee19c6b5bba63abbbf65ae821 100644 --- a/gdb/features/i386/64bit-sse.c +++ b/gdb/features/i386/64bit-sse.c @@ -8,7 +8,7 @@ create_feature_i386_64bit_sse (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.sse", "64bit-sse.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.sse"); tdesc_type *element_type; element_type = tdesc_named_type (feature, "ieee_single"); tdesc_create_vector (feature, "v4f", element_type, 4); diff --git a/gdb/features/i386/x32-core.c b/gdb/features/i386/x32-core.c index 9b0bcc5a7ef0df5835a1a95dbd9a50688cf8cd79..dd6e1a2ed6a9234aec1c8472e2f811dfa6efc13b 100644 --- a/gdb/features/i386/x32-core.c +++ b/gdb/features/i386/x32-core.c @@ -8,7 +8,7 @@ create_feature_i386_x32_core (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core", "x32-core.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core"); tdesc_type_with_fields *type_with_fields; type_with_fields = tdesc_create_flags (feature, "i386_eflags", 4); tdesc_add_flag (type_with_fields, 0, "CF"); diff --git a/gdb/features/tic6x-c6xp.c b/gdb/features/tic6x-c6xp.c index 261a562d903b7c1a203cd9a66f2f5fca8ac8bec7..bfd69d7fd52cf028c623bc32b0ea5e7377335411 100644 --- a/gdb/features/tic6x-c6xp.c +++ b/gdb/features/tic6x-c6xp.c @@ -8,7 +8,7 @@ create_feature_tic6x_c6xp (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.c6xp", "tic6x-c6xp.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.c6xp"); tdesc_create_reg (feature, "TSR", regnum++, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "ILC", regnum++, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "RILC", regnum++, 1, NULL, 32, "uint32"); diff --git a/gdb/features/tic6x-core.c b/gdb/features/tic6x-core.c index 65f73ec97df8fef36a265e0a0c2891dc6aedb2aa..0415209275a792f0ad287e35ab40674b164eb786 100644 --- a/gdb/features/tic6x-core.c +++ b/gdb/features/tic6x-core.c @@ -8,7 +8,7 @@ create_feature_tic6x_core (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core", "tic6x-core.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core"); tdesc_create_reg (feature, "A0", regnum++, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "A1", regnum++, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "A2", regnum++, 1, NULL, 32, "uint32"); diff --git a/gdb/features/tic6x-gp.c b/gdb/features/tic6x-gp.c index b62458837947247405564d055925acd424c6be03..4a0734c04a477e38b21b4b59a7055eade4db515a 100644 --- a/gdb/features/tic6x-gp.c +++ b/gdb/features/tic6x-gp.c @@ -8,7 +8,7 @@ create_feature_tic6x_gp (struct target_desc *result, long regnum) { struct tdesc_feature *feature; - feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.gp", "tic6x-gp.xml"); + feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.gp"); tdesc_create_reg (feature, "A16", regnum++, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "A17", regnum++, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "A18", regnum++, 1, NULL, 32, "uint32"); diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c index 0d9609bd4c3446b7a15df569923d22fc10105b74..b5cd8fa87576f415d0eede991148ef2e535b2097 100644 --- a/gdb/gdbserver/tdesc.c +++ b/gdb/gdbserver/tdesc.c @@ -195,11 +195,9 @@ tdesc_get_features_xml (target_desc *tdesc) /* See common/tdesc.h. */ struct tdesc_feature * -tdesc_create_feature (struct target_desc *tdesc, const char *name, - const char *xml) +tdesc_create_feature (struct target_desc *tdesc, const char *name) { - struct tdesc_feature *new_feature = new tdesc_feature - (xml != nullptr ? xml : name); + struct tdesc_feature *new_feature = new tdesc_feature (name); tdesc->features.emplace_back (new_feature); return new_feature; } diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 93e73571177c980b4cd1975256c89e8ffb9fcdd6..fa8ea66a6f57fdd99710e3447efa60d7387dad58 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -1130,8 +1130,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, /* See common/tdesc.h. */ struct tdesc_feature * -tdesc_create_feature (struct target_desc *tdesc, const char *name, - const char *xml) +tdesc_create_feature (struct target_desc *tdesc, const char *name) { struct tdesc_feature *new_feature = new tdesc_feature (name); @@ -1599,8 +1598,8 @@ public: printf_unfiltered (" struct tdesc_feature *feature;\n"); printf_unfiltered - ("\n feature = tdesc_create_feature (result, \"%s\", \"%s\");\n", - e->name.c_str (), lbasename (m_filename_after_features.c_str ())); + ("\n feature = tdesc_create_feature (result, \"%s\");\n", + e->name.c_str ()); } void visit_post (const tdesc_feature *e) override