From patchwork Thu Mar 22 08:44:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 26425 Received: (qmail 16569 invoked by alias); 22 Mar 2018 08:46:33 -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 44572 invoked by uid 89); 22 Mar 2018 08:45:34 -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: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01on0054.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 22 Mar 2018 08:45:29 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; Received: from C02TF0U7HF1T.arm.com (217.140.96.140) by AM2PR08MB0097.eurprd08.prod.outlook.com (2a01:111:e400:841e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.10; Thu, 22 Mar 2018 08:44:57 +0000 From: alan.hayward@arm.com To: gdb-patches@sourceware.org Cc: nd@arm.com, Alan Hayward Subject: [PATCH v4 09/10] Remove xml file references from target descriptions. Date: Thu, 22 Mar 2018 08:44:28 +0000 Message-Id: <20180322084429.26250-10-alan.hayward@arm.com> In-Reply-To: <20180322084429.26250-1-alan.hayward@arm.com> References: <20180322084429.26250-1-alan.hayward@arm.com> MIME-Version: 1.0 X-ClientProxiedBy: CWXP265CA0052.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:2c::16) To AM2PR08MB0097.eurprd08.prod.outlook.com (2a01:111:e400:841e::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4833e3df-f33b-4181-aa99-08d58fd13157 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM2PR08MB0097; X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 3:xmQ/cYMxgfyp8iUXEqS8WKMxV9vAIDS2UPHGQ8SgTOzokRUwuwW3nm2YUw+qq12XTbRzeHbdnzav9IezpbwG9owOBzF1XRdzH/goxrgXw0DqkfPXXRUtfrEl0cYuwGuAv9n3jFtKz+1gYEKrl39B3TsGihW2e6jK5++9fudwHy1U7M+msoInkra9db5Tz3NwMFNZ9Se+z2SkzL5OLS/jiltXHpbqyrNnnnyVZydEtB/f6g+cX26uGvFeu6Ua98na; 25:OpYBySI9GYq9nVdINu3+2ONC8rKdyX+FtrK1NGtah8V7ZovU2UsU00Q0BcVDKewqbTitIotSasTdw5VFDDTeHquciKgjdDMTzm+czjeN0cQnbwErJuSvuXDidIAH76SB3LrtmlhIsJokjXXN904Ozs0X10Nj5pYb0rciNjubiIl4sgx0GGvWXT0rPkJztTnWYNBT8w20bZlwyLGLSvCCITH8CMC8zhbBiiZx690ev6PdFxt6GbsmAJCq/z8lo9S9/ezlB+UnZa2dAg3rmp4YPbNXOUb0TaqNoNWYVN/K3riCbIwjBMEHANeFcEKBBSoiEtkhEM67+sk6vxj+UgW0LA==; 31:WRW/kXU/gGwPkHitHlfPnQCtcsMpVUBEhNtfNLfA3DlsW4VsyEWDWdTIZ4bILdTJJO0tvoYpRrVGzbo31V+S15CJ5hO5KH7F13mU3T5qxMmh9/NYpXQq4lxeWF9WDfKShyyBSr050mro+OmZQVPoZWpgSSeJbqiK76R++gMmtFRuG3Ied+7qLhzrwRZ/fhSWWEC3Tk8NP9wf3pDM0ervU7X4mNNG5+5mbgnraMpKhzw= X-MS-TrafficTypeDiagnostic: AM2PR08MB0097: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 20:zwJIUBKFfQwO081+WYQChG/j2RDXoBGOPF3364QqBUIkTzAg9Uf0gs9pGg8OXGsDsSgmPTj8Lj413Tf8OhV3GKJRz3STfUbTAiPKB8ZfJdslVZcehAD+L2WhbkpavGbZBuqZ8j67wGOINjM7R0qGitG3HIqy4Yv28OmDh0CJ2bY=; 4:8d3uv3CEj3e9n0b7Flt0FAa47Nvp/j4kJsmVxOHoFVITEKIgkgiPfXtjILjtlxvHnp2qMsAHHvNRY6HcpVGEb573h88xQ6nUsTmHdX3X5ihAyYlGFtBSlz/PAApPWcF0aQ9cA3gKy8UaIUt7+JLnmOz9wjPxrR6A/AdhiW4j4a9r+qQiLPiDqub3lthnQs/rql3NYCurtuxqQhXpVnzh5p5mf3l9/UAOTkpzJhG0x88KRxBwvHSSEJBCzKKuNqHjHpbM+vofLX0IYD/bMkOJCm1MvRib7olJ1g3HfEozoLgSl4XwsnlYLVKtSHElmmyL 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)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM2PR08MB0097; BCL:0; PCL:0; RULEID:; SRVR:AM2PR08MB0097; X-Forefront-PRVS: 0619D53754 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(376002)(39380400002)(396003)(39860400002)(377424004)(189003)(199004)(97736004)(72206003)(16586007)(7696005)(6666003)(86362001)(575784001)(6916009)(2906002)(2950100002)(66066001)(47776003)(6486002)(25786009)(53936002)(51416003)(4326008)(106356001)(1076002)(8676002)(105586002)(478600001)(53416004)(6116002)(305945005)(50226002)(36756003)(386003)(7736002)(52116002)(3846002)(81156014)(81166006)(9686003)(68736007)(76176011)(50466002)(8936002)(186003)(2351001)(16526019)(85782001)(26005)(316002)(5660300001)(2361001)(48376002)(446003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR08MB0097; H:C02TF0U7HF1T.arm.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR08MB0097; 23:fd/b6E1NPzS9oI/EIgcgMP7KY3zjLEPQKii1paW+U?= =?us-ascii?Q?xlaG39mt+oDkiGqgM5jST6+dh9eDmtCpfjpPTrGpSaYtvfR12jn6lkNb8tr3?= =?us-ascii?Q?8WaVQKKOPptDGw98prdMX4ieJ5k9+GDQ4SUXknLKSHwzr7UcWEfofEWBApjy?= =?us-ascii?Q?olJ9ON5OEIu247VCP69A4fWPpUv67ikkjhgQMi1R3P6mCWJ3QTHmZ56Y15vU?= =?us-ascii?Q?fRSf8kogF2gNNEpQVVM1Oj9ro0/4d0vcDMbYRhHSB4aRwApFeDK3hFgv4JRC?= =?us-ascii?Q?HXsWeBBvjFRJ45yTYDBO8XkZyq6h3Vao6j0USDeXpX3Qp/DV7LsBUmEXFFv2?= =?us-ascii?Q?Lv43keCVH8LKw6JI61bLkdW2GEDgctT0dEhX14VyZerv6I8WR8R5DcZBAJCR?= =?us-ascii?Q?V/CouKZGsA7rLq2zrYB9X6xrCfAlWS6ynEtTGsoQn0gAhVW2PwGVtw/6evWt?= =?us-ascii?Q?oMK+Eb+VE1GU0Z50SGyEz7x+Fb2iSsPmBYgSRaa+KGtaLeMablmN/yD5NYJG?= =?us-ascii?Q?vgf4N307nL2WyCYaz+DyRfp1o0iVoq8VRFzRKIZiETTNgxOotCnW1qC4Mf2m?= =?us-ascii?Q?J9oVVuw8QWdY9aGZkUw9tz9NZgEMQ5iYZPuxS1wzRg8FKGToJjerl43o0x5d?= =?us-ascii?Q?cL5sA8mDl/+T813Q0kYtcS8W94dPZgg+q0+RgjRp//6OjSvfFUfgjRjR3p6i?= =?us-ascii?Q?6wjHOPoYj+eE8RqQiJEau+oCmTiDFd2Fa7Y1dZK66qaFnP1KRJEGhIVtmsuw?= =?us-ascii?Q?Lmw9kDA4GCg8tOZlCkGzKeZkPT6wqX6whDx4SbHm7fNmKTd4OmprJJq9ml9W?= =?us-ascii?Q?TX6CNJqKVT+l730+JpA/cCWP/TurMw2dGwMLc4oHgHU19JIG/c9oMrICGHre?= =?us-ascii?Q?2GdIQ8zBHHmIz0WGD0xjaHz9jIT3+gTk2k35T/ePm4nZATMONyezzOKl7zrw?= =?us-ascii?Q?iQ/+3Xg7XcCSSUeIQXHQuRLUtcwhMrICx+61wW5uQw9cRRz9mXFznCPxm4dm?= =?us-ascii?Q?EWs69lxiTv1WvtLLa+7TnpFZXkOcrIjfOKSnuavDzzWs/lJGezlSumcAkBmj?= =?us-ascii?Q?X7xZouMajl0tlbU4c7TXYN6V8efJk0fQks7fq4QjvnhU45iOfaW5JYka27se?= =?us-ascii?Q?G+7M+pfhFeuC1rM1UFoZKE+ySY9Z2uBn0CJz8Lg0lHMcrei0qFFMuQEJratc?= =?us-ascii?Q?RRHgpkK+2HJFBqI6XKzV4ny3nG5+ufSkqbuWPDwReCuSJ1EGEIfADn1OB4vs?= =?us-ascii?Q?FWyL+ugjEm1U2o5MKuK5m4X5W/LdifRKf6oIZdBZAHwR64jwBnNnGOB67eEO?= =?us-ascii?Q?kLQNuJeMAXS1YWJU4VjDbE=3D?= X-Microsoft-Antispam-Message-Info: DTtIs+/ub/XE3iMek9kjmlZwyrqMSKW2GOMyAL1DwUktu87KgMgIX1qxSgrAAu6C6stH+415t5HJGb5GuJ+WTyKg5rahzySVOpqyLEhCUUAhT3vLpM8/4bdGIdDNU1NWUMu85lsr1LZM9xacBR+45r1NUOtK34XrJxWIKNZHEM+rmqPsdqJcqqHC9NFX15em X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 6:jCbtFe9uqefbu10LBm+OdDD/+YHeEIjMsVijH+6bSnqlEHAXylBiHDwRl3EpY0k9uNLjsWMHQIESRwMtSoxxxcLlptMFFQOjnm8oq1ADhWmKkTS5TjoPOBOiyMgo8X2p7Gceq/IDSWI0pqJdlY0Fu/nIOSgiVI9osvbuRwAyXoq4CgjGn03lMgpHWpm99O2KmjG+qsvNhDHnAg6RxQM/sHbR/GgA8552VHwrqZV+y6qeDGVFx/dRnr71syfGWkbAdZzn+yWUhR/U5p9Q8BLk2P50pARTpaj3errb004Fg9dw7EvtCqx0KtckRsKPI7w7L6+A+DPj4R2UR75q1RAAwmUaDG2F7yML5VMnE6scVuRRJa6mssYS0Y6pqt1w0Jder7yXwx3SdnI4mi/TwUjM623EYWPB4U1HUAIsDi1t0OWBquXrLaC7S46HLoBU+6tPKPVtIh1YEoyqj7jzqDheEg==; 5:zujd2VpskvKAjEu52vCNTOpRS/r5MdF6R9RyTTlcCwfwh86ij6HAFoOmP/KXcrioAF2/0Inzrk7yorqr6jvz9ZCM/qCBk0n7o86hUWNP801T8biuYrPO1LL5mpka/2rrNyefo7q4WoqXwIJiR63TmFASingRH6Yy4KVxDZJ7jpA=; 24:HBeAsPm9holzOSSN1EvHpRT6aEl1kxBBeaZBwEbFx/7EefSGQEQuXQAVBRU0LRg+wOLigxnM2QEGgCPo4LjvGYb2mrw241xrP6lkdGnsPqM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 7:iNGw+LIgfgpmxe9qkUUGInfmETUo3J512rhn8hWl3NErl+1EcjxeDYUtG4L+iZjuobH52s4sofVj4xM5oG6hxL29smx89syIWbNDNeH/3DgeOQzb6eMX06km5v4wpTnI/3e+IYysshpwh43DG+AUaovsZD/rHfrUxs6rj+DrrnxwuSL8xOEtQrsLujmgIWb3RQ4nuwRnvoNvogm8hmouuDx6V/9GOXj2VTXA+WlJso5gV9bwdjKTtxDuqJtQxN1A X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2018 08:44:57.9215 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4833e3df-f33b-4181-aa99-08d58fd13157 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR08MB0097 X-IsSubscribed: yes From: Alan Hayward 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 version. Alan. 2018-03-21 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 45eb24ea2b..3d23258acf 100644 --- a/gdb/common/tdesc.h +++ b/gdb/common/tdesc.h @@ -322,9 +322,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 5ec73d9117..13d7225f49 100644 --- a/gdb/gdbserver/tdesc.c +++ b/gdb/gdbserver/tdesc.c @@ -199,11 +199,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 467ae94e0c..e3e5f60b27 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