From patchwork Tue Apr 10 14:33:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 26673 Received: (qmail 54312 invoked by alias); 10 Apr 2018 14:34:23 -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 54219 invoked by uid 89); 10 Apr 2018 14:34:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 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.2 spammy= X-HELO: EUR02-HE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr10045.outbound.protection.outlook.com (HELO EUR02-HE1-obe.outbound.protection.outlook.com) (40.107.1.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Apr 2018 14:34:18 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; Received: from c02tf0u7hf1t.manchester.arm.com (217.140.96.140) by HE1PR0802MB2138.eurprd08.prod.outlook.com (2603:10a6:3:c2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Tue, 10 Apr 2018 14:33:57 +0000 From: Alan Hayward To: gdb-patches@sourceware.org Cc: nd@arm.com, Alan Hayward Subject: [PATCH v5 7/8] Remove xml file references from target descriptions. Date: Tue, 10 Apr 2018 15:33:36 +0100 Message-Id: <20180410143337.71768-8-alan.hayward@arm.com> In-Reply-To: <20180410143337.71768-1-alan.hayward@arm.com> References: <20180410143337.71768-1-alan.hayward@arm.com> MIME-Version: 1.0 X-ClientProxiedBy: CWXP265CA0019.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:2e::31) To HE1PR0802MB2138.eurprd08.prod.outlook.com (2603:10a6:3:c2::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: eabc9cc5-576d-49f1-242a-08d59ef01865 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0802MB2138; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2138; 3:uPKShT6Bhd57uT/m/PzEMoRQG5buCp2uwK3k1v89JuEQ0j6I3dWmIwWAIhb+tU2OJ+JEUcpyPJN9dNV0dlstyK+UtC4amgQQ33AFLB5mtB9Xsyz78oJY9Fyo9CcSubV5ZqD9VfcdEzFN0aptkvUXzgu6FEjSFZQQnDdklYdqx4dPYWIsjqMsXDyPIQM8Qfhs7mHSUNVBX+rclfuWMXKsczSbNmVTnfwN35Tr5OrfiP4zbteCxgL0nGgMRN5T1ZI6; 25:J3oJMhMEa/PuLVketM1rMTt75TkYRtu+++krd/ZGcpUjo/NbHNuXx5NNktCnfERNd0yxlOBisColu9rFTAtnwcsMmlbofaJOWhMiwlGN0V87Es6DyDOxg1vROXjgjMOUEJ3hl8Vur4wSkoE2F2y/SpiFYUdNGhYgXZ0jq99sts1zZfWe0niHA+sS9hvt45D/iQ+Zrizr6fRK14Ycpae4Y9zKDJfVBeO4dLkW3TMbgZN5qhfyqBhIbo5qNpBzMi2Z4ADR1RRlrGW3IxNEzFLxACpHRwYR9ZsliFcKJdYFDmJeyRA/2p+X1eSiVok2f+xlc3u3Ka7I6V9XCxH0ggE+7g==; 31:IggPiZrYjupiCkqX13X4L1cQp2yXtO8c7vuy3JJogkbEElWS/7FTkkEqhQhQ0ggUsHvT2vAC+DOJmt3aPg1kKapqAl8yELH4gB+DJigpUJvNhu5T9v0hLPy2DFC39wocBzYZNBo3JEP+EH3vSwTUk6JZENr95+Sx6YA2rKt9ywvwRk6p3m/5DK8tD/S5Ga/SqShzFv/AWJQIulNRUw7BViAemFOW/+hYeUbipqwQjko= X-MS-TrafficTypeDiagnostic: HE1PR0802MB2138: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2138; 20:s/i+SrfiYn6RkswTOzcYB898QELwsvM/LGh6bp7Sx9rReX3wikIK6KFySt8ADNL6MnvQGxs1Dfi0tuL20O7UjN9JXvEC9QY66CmTSM9Ic0iHSfAfpllaUQFMKji1JLxTMWZd3sXLaAtuP0SJdjU3TDSgNUioKk4C3+/pRL8Wtb4=; 4:1JExxPraclBSYtpmd/fFgzcwAdZDjb7NlSVwHJJP4WVfSmX/jqoB9EElZohM2YbwHuT7ZfDNoeAtofcGOYmMGpXlxtbdS3v3t3g+MCQMYc/jivfQQw9UJmiydRf9Mux/5/PDKQ4/ZcQ/KAbjpP/N4TWFR1c6p3HqT0+oWsOUOtK39Wsxevu2qf9kdCQ1kgyiwYVr+wb5M1f7UrFtNv2IieAVQCbl07+RD+plYBn3vZ90SRTpGo2L2Fo7Klp0UEjQLvmbsJTN/IXYhufedzXFZIjn1zwQ8Qmpbgcql7vxdgllJHPHztvzIfEOybbGLGhG X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR0802MB2138; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2138; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(396003)(346002)(39860400002)(366004)(376002)(377424004)(189003)(199004)(76176011)(386003)(52116002)(7696005)(36756003)(51416003)(6486002)(105586002)(486006)(6666003)(11346002)(6916009)(476003)(2906002)(3846002)(2616005)(6116002)(956004)(2361001)(446003)(1076002)(2351001)(186003)(316002)(26005)(86362001)(16526019)(8676002)(68736007)(16586007)(81166006)(81156014)(5660300001)(7736002)(8936002)(53936002)(106356001)(4326008)(478600001)(66066001)(305945005)(25786009)(48376002)(97736004)(72206003)(575784001)(50226002)(50466002)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0802MB2138; H:c02tf0u7hf1t.manchester.arm.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0802MB2138; 23:DOTo/sZ8pohgBSBsPMaxhs3N0OL4ppwmsg2DbSi?= =?us-ascii?Q?IxFblSaEgPf60BagvYqNB9IJenEu/6ZqQj7Ht4mtfKxWjx8126sW53wN8ID+?= =?us-ascii?Q?ls8Ncv2oaro69cO7qLMBxMscZVKLbOdy3FcRxlz6EsM0CyHPGur/diZqanCj?= =?us-ascii?Q?DWa6AGdKxMbIaVwGAU2v4kiBv9n3RLumUEXby66b3UtM5dKfNNkc7qXfP7UD?= =?us-ascii?Q?cWmYM+lwUyQK3vZoWtCo1nOm3BhLQKSN/GLYAXSDh2yaxSdWHZPC8CwPAcRW?= =?us-ascii?Q?lzdi5yZ6XV/yxrXZ5uw4ami0Bogg5qVEPuOQXlKnc0xlMXRv3XmLLiUCN/ke?= =?us-ascii?Q?ENv8tqNvEnpDx5s8qIwZ+O4eSuCz+LRglqwQ2I0ujFHMvavrlezEZdSnXbLT?= =?us-ascii?Q?LzSsDUKaqlSjH18J/MwgIiAsKzGfxzVTcK8hZUfnumIHy5a6CdV8PSwihumc?= =?us-ascii?Q?m+MhVSc31KpHhjo28Xvi6twCMwg8fBBRUhHjW4bgO2JfJBtUaTbF3MpIUJo2?= =?us-ascii?Q?w5FLH1mpv48D1IBP0e9oISy6TScc5C/DN6G27aQkUChP+/8/q4fMyQ79MUCV?= =?us-ascii?Q?41Iaak2Lo3wXB3Fs9KOD+Ne+JA8LT0nHUgF4Tszu+PhUSdhf/9nNUy5fea1T?= =?us-ascii?Q?x6cohDLEoIkx7HjeyEgeFkMo1Ewmf6q4nAJeKTBiZbXT3I+4WUpQ/DNWZ5CL?= =?us-ascii?Q?PHumOehhEuQz2JbzxkxhLuZa3IADqwne5AGv6t6o/xpbBZyu1Q66NLzY3msE?= =?us-ascii?Q?aabuX7uTgxO2RBa/l1NBj2hTZSWqah2AUo1J+5C6jSOfcbV6sHbroKkCvOoY?= =?us-ascii?Q?whRSgAG7n0+VtLBe0s0TMQ3RBEbB4LeybolZXsG+krzNA6TNjQ6J9RNbn/wo?= =?us-ascii?Q?jH6Zb7tPfuPpD325orr/UnrLkuj0EA+x/OrleyTAe1flTUKHMek++jJ5Grq7?= =?us-ascii?Q?c1KQ2s6ijh8giYQaLXc6w3T2mIoEn959h1NcU359t3yQhUo6x+O79WtuMKxV?= =?us-ascii?Q?U2Q3HjsIbKoa/BrqQg35y0hauojRj1fASyBJTdpvZ7OGKNhHd/hMwfAfHN69?= =?us-ascii?Q?r1PV5w5yeRCf3v3u83OHfFvR416O0hZYzYxMU8r6K7hEXyshJ+mtNPgXM1VH?= =?us-ascii?Q?qZalZR21FoKt3BrVk+HAJe68TNCQYSN1cGVY80/OylpDggvVr5ssgNjjxuuw?= =?us-ascii?Q?EArCWCNAgyfYvdytw64+NqYD1/oQAQ1sZlTW1IXnx8vKVd6tSs6KSN+46akH?= =?us-ascii?Q?+GMIfO65JnmKIKFSu4Dc9G2G1ZWSD+w+JkE5hajw4yzm3oC9x2MnVmfU6FPL?= =?us-ascii?Q?nMQ=3D=3D?= X-Microsoft-Antispam-Message-Info: FubKIeTD2r0JEZXWZn7WSwKWbfgp+f6wdXkn3kMO0eVPmXPuj/RAIcEuCjUseH3tbcKypY55Y4vh3GEg/a2VcNPIriuwZ5OZVqn1IWnJ8aQjnsAQVa+OD5RDHRqQTcSVzzmHlflFsiL0444tG4s/Gfw/wuAarieg5sIURR4mC6GNwKB9FxkcWnoqdjq+eHkY X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2138; 6:GxuBuOymeJadexaqJEoFHNye1oNqDIetQn8Tp8rDpJlWEpMIiT/eond6wdXJTeXt9ZUYmiV6HG2CMPFf4aUiyQxM436ucrW6YL4YdrO0TSf5jejPpUcs5a8LcK/i/MKuZ+tscYotVMQrTNVJLjgn4SSS63ARWXKOZOG7zb/vyZI1AJOnRoAK5zfbizXQqfy7luzP4vk2vb4jnGSJz8x6CHVL/c86sNhJVC3oNQOuJa6wU0nu2mKVzBVSeC8n9l3WnslxDhtkcAt+8Ru7ggfVcb7SsPfg4JuA4J4zNZt3NnyVd9zEC1MJyzQ0K1BBhuOGsrMHiQYsHu/Dgw6aw63bjgulkA3aiQm355ieXKZXYwC8lk1IDELUAHxYt97f46BpGQ7a/91Q2ECl1gKJHs8CK/X/wHh05+9VRxwPGyB+tuSOCJ2bXQnlIZKFCypUjyjrCLQaLhenE5g07mbP8anCAQ==; 5:4IbWijmUdDeFRvrus8ah6ec0ta4PDpMqc2Ax7Fk/oETJb5BGgTg6OSIYealOHOlX8qXkL7cz7aGTrak3YYXrDs8m/fVduJzmXuH3EmhMCsQbQAXnbkihH4Miyb5O2onutH8S1fAaKY6Hz4oTrVXMZS4qdjA5BoCliK8j1ejkigg=; 24:EmoT9o/jsxfv19Mdry0KCzStRmKi8klXsJaE8isYYv/L3pSiEOP5jJ0+s6S0n2d1dfcYowC7Yg8bVcGcKlMRquAjnM1avrsZu2cZiC99WRg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2138; 7:G908CYx4I39MfGpFU3kiD9QydJ8PVNsgdyUVbUln0FKuBa0oTvfyyLyWM1rqWeCGan7+DPzkdtd2vCtDTSIZGlishleP/RJjT53R8hIJ7CkZgbHU2ICOdbf4IE6SDmbmQ4dCDCUTb6H0KtAf/Rbv7bwtJY6A1iC1zaasiDOdsXVG1ctxvIjX4MHIy3HPLDNj9qi5uLGv3C6ciGvDItvTGlq5Xma2Aw5Ve56MKh9qTkOC11tE1QFk6TJr2HBGu2C0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2018 14:33:57.7508 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eabc9cc5-576d-49f1-242a-08d59ef01865 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2138 X-IsSubscribed: yes We no longer need to know the name of the xml file for targets using the new target descriptions. This patch removes the references and regenerates the C files. This patch is identical to the V3/4 versions. Alan. 2018-04-10 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. --- gdb/common/tdesc.h | 4 +--- gdb/features/aarch64-core.c | 2 +- gdb/features/aarch64-fpu.c | 2 +- gdb/features/i386/32bit-avx.c | 2 +- gdb/features/i386/32bit-avx512.c | 2 +- gdb/features/i386/32bit-core.c | 2 +- gdb/features/i386/32bit-linux.c | 2 +- gdb/features/i386/32bit-mpx.c | 2 +- gdb/features/i386/32bit-pkeys.c | 2 +- gdb/features/i386/32bit-sse.c | 2 +- gdb/features/i386/64bit-avx.c | 2 +- gdb/features/i386/64bit-avx512.c | 2 +- gdb/features/i386/64bit-core.c | 2 +- gdb/features/i386/64bit-linux.c | 2 +- gdb/features/i386/64bit-mpx.c | 2 +- gdb/features/i386/64bit-pkeys.c | 2 +- gdb/features/i386/64bit-segments.c | 2 +- gdb/features/i386/64bit-sse.c | 2 +- gdb/features/i386/x32-core.c | 2 +- gdb/features/tic6x-c6xp.c | 2 +- gdb/features/tic6x-core.c | 2 +- gdb/features/tic6x-gp.c | 2 +- gdb/gdbserver/tdesc.c | 6 ++---- gdb/target-descriptions.c | 7 +++---- 24 files changed, 27 insertions(+), 32 deletions(-) diff --git a/gdb/common/tdesc.h b/gdb/common/tdesc.h index 00eaada072..2c173074de 100644 --- a/gdb/common/tdesc.h +++ b/gdb/common/tdesc.h @@ -316,9 +316,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 db10c4aa06..cd3de02cbc 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 0c40c4cef2..47962d1f24 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 6e2cfdbdcb..b9feac377c 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 863c119ac4..51a403259d 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 f6de737074..098c2ca31c 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 af476da194..3bc593739c 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 84101746b5..8288e9d758 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 272751f578..a2a72f40a3 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 78fc02b863..68fbab06a4 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 5f11035af3..7e45c980db 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 733910025b..acc07a3628 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 efc7016380..617425da21 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 c9c56f193c..68de9d27e8 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 d923813d69..ce4d611d9c 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 f1cbce0ce7..70b88cf74d 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 900471fc48..b06d40fbda 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 294360197f..e083093741 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 9b0bcc5a7e..dd6e1a2ed6 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 261a562d90..bfd69d7fd5 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 65f73ec97d..0415209275 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 b624588379..4a0734c04a 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 126589f3e3..92524b3dec 100644 --- a/gdb/gdbserver/tdesc.c +++ b/gdb/gdbserver/tdesc.c @@ -175,11 +175,9 @@ tdesc_get_features_xml (const 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 b96ef961a4..0c5e51ee5c 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