From patchwork Wed Jan 31 13:40:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 25710 Received: (qmail 92992 invoked by alias); 31 Jan 2018 13:40:17 -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 92979 invoked by uid 89); 31 Jan 2018 13:40:16 -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, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:sk:mail-he, H*r:sk:EUR01-H, H*r:104.47.0 X-HELO: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01hn0223.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.223) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Jan 2018 13:40:13 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; Received: from C02TF0U7HF1T.local (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_CBC_SHA384_P256) id 15.20.444.14; Wed, 31 Jan 2018 13:40:08 +0000 To: gdb-patches@sourceware.org Cc: nd@arm.com From: Alan Hayward Subject: [PATCH] Move arch/tdesc.h to common/common-tdesc.h Message-ID: <97948063-b3db-fd3a-f62e-b552935cb8dd@arm.com> Date: Wed, 31 Jan 2018 13:40:04 +0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 X-ClientProxiedBy: VI1PR0101CA0051.eurprd01.prod.exchangelabs.com (2603:10a6:800:1f::19) 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: 70f3e622-e2b7-46ac-b4d9-08d568b02541 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM2PR08MB0097; X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 3:UQPxGv+2blfrI1ftGuDC0OPMaQ2dF9NjDqLOAqP/XGVJ0F9dH4/A/RRz2G2cDfBsHwROgK9hI4txDC5UthQ4yXSAd99GNpsVYWp7bAcahlWi1bIOSqRZhXB1byGtfAcytB3yFqKZCeNo6fbEOQY/TSBx+Wr9RKuw8tqfNNtW/vT4q4QtldvUF3y20W2oZm3BAvWSJqgnokQACIdoZt4ktKZueRnayE1tFOxShvL6fVN01mUERaC3BaGcncf2LlRH; 25:5l9NkY/HZGd6s2XYLKELTFnwMwFroJ6paHYYU0Wa03sUXFIbPnCZR/pq5bVMkzpWaW+bW12p/r4MmnE9sZUjaQFXKGpv3aLZUUQNBUwFXSU2dE8OxYWSx3/OsVL/eYehzhe1N+eh1VsAQ2ZFu1MtEX6YPdD2ozcyJC9b/JWKzXgjM2k5Bd9wRSxI6TflfPyafD8WRh4rJF2IDdZ9lZZa+nEPISy8B2K1LC/Rk5KZMbI/9+bwDvr9sx9PAD4qmblPaZHyMfr7lop/fxJu4YPdBZqeB+e4HQJgLNbmX6zwCiRA3lZz3gvh4ZaHbX3SXmpVKHKa1ocpUlIg8lrBJT3LkA==; 31:LSxhyhNV4o862pePOrqSDS75h8Qj1tKxERuqstF0k0Knyvb9gSN0dZ4u8ziac/PyyL5UsPpR1xYR9HReoU7Ynk/ZgV/jxbmqmli3enbEWWP7fJDFZ6daIgmwACiwx+d5F5TrHrDHhR5yrqc2lAth/xmmLAIFjp6WWVUt1rq91Vh1mUHXmI9E2PiIgJskhvhcr8vNOoUneNcyYC1b/tl6lhG4e8d2rNiHJhUk0wNfgco= X-MS-TrafficTypeDiagnostic: AM2PR08MB0097: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 20:S7Mp9ggopdKUULi2ImGckFtGv8NGb/9YCpS/yCDdGXqoYObaSFJ9Em82wsqKq0RkNBQkjipPb2uZ9jZ4ENdTLakZk9iTf+og6p/K7zXDMhWTjq7iiK01a4KXmOWNSG3Vtfi6232POMKqLDSWin5v4p4D9+4AKEtVdQiu5fZGC3M=; 4:soMjwhJrcCffhODZnse6Uifu1F46Euj/QKRSuP3XZzpA6NsMoJrgJc3L27vL353nSVfi9Fretw75ny57carZZEZxdDxwm5E0m88OsQIg6F8mZ1aG+5j+maLR+MrN5iQ72KywwCCQhE9OZLRATC7XnYAts+dy2I85Dnq0/KJ95M9JaqbtomYonfLXtOaAyHUO0WqjmiI0MZN1ICuSMKUQWWyRKsOSz9Ob5zXVNd441yNP68UekKCP4uuCxwyJmM3dvyZr/ghiuRiU0MyuSF1d+0uYfz4H09bqQH/wOOCcmPiiPM5KjCUbQFoLWdwZuLQ/FAX6Rx8JGewkaiuftdIPwE868tVEBlIAsr+mFMX4sqOJJVkBVEBaH95DUKsbv1kA X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(2400082)(944501161)(93006095)(93001095)(6055026)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:AM2PR08MB0097; BCL:0; PCL:0; RULEID:; SRVR:AM2PR08MB0097; X-Forefront-PRVS: 056929CBB8 X-Forefront-Antispam-Report: SFV:SPM; SFS:(10009020)(376002)(346002)(396003)(39860400002)(39380400002)(366004)(199004)(189003)(377424004)(2906002)(6306002)(58126008)(106356001)(6916009)(53936002)(6666003)(26005)(2351001)(16526019)(6486002)(5660300001)(64126003)(316002)(65956001)(97736004)(230700001)(83506002)(105586002)(2361001)(36756003)(86362001)(6506007)(81156014)(8676002)(52116002)(386003)(6116002)(52146003)(66066001)(575784001)(68736007)(25786009)(23676004)(2486003)(81166006)(8936002)(4326008)(50466002)(65806001)(47776003)(478600001)(31696002)(305945005)(3846002)(7736002)(65826007)(72206003)(6512007)(31686004)(60810400002); DIR:OUT; SFP:1501; SCL:5; SRVR:AM2PR08MB0097; H:C02TF0U7HF1T.local; 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) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTJQUjA4TUIwMDk3OzIzOnBlZ2psN0xSVC9IbFBFN0d6NFNkR0tkNURH?= =?utf-8?B?bzNvYTJuTXhrNDlqdEhqdUY3QkJyVGlqRVgxaGVoakExQis2YmUxQ3VJZndG?= =?utf-8?B?Y1RyalJBR2ZadnFjZ3l0Uk5RbEtxZlJRbk44SEhWM2I4cUVBWjg4VVZXV1Zh?= =?utf-8?B?dlVMbmszNk9NQlBsNU8wNk5KTStXc3VEOWxydTRvVk5ONllTdlhXbmdTbVpH?= =?utf-8?B?OFFWckxtSFBzUzlzZysrOGdhSEIwWlRxNDAxalhMd2FpT2Z4NWdCbTFma2JK?= =?utf-8?B?ZTV0RTRSaHVidThBN0gvU09ZQW9Nd0dLQnkzVzJWc1Eva0YraW9Ta0FPZDJi?= =?utf-8?B?emRJbHRvdS9rTDNKYVl3clgvUWd6Zm1JU0VraHB6dW94cUxKVFcwcTRzOEVv?= =?utf-8?B?NmRVTEo2U0pRQ3lBdFVaejM2S2RycnVMUHNZNmJEWXN1cGwwUCs3dVUzNmdj?= =?utf-8?B?Tld3MWZyNjVoZ3o3VlVWbWhnZnNad3kxZGdqS3ArTnZpUWR1Y0d5emswcHJT?= =?utf-8?B?ODQxU2doRjQ0a1lNQThLVkFnSGk4WWthMlJwODBMZWVMTXFSM1B6VGxhaHkv?= =?utf-8?B?bjh0MEFML1NrQzhGWUVUOTE5dGFqMm9wYzM5WEVYV1EzYkpNMFVmb1ZteXFL?= =?utf-8?B?SS94VEEyc2J3a3I4cU5vMXRMWjJ2WmRlNzFldzdvQUZubW5Pb1hUako0OGR5?= =?utf-8?B?OEN0c3Z0QkJNRzUwQ0tqQ2t0RFdzbEpncGordzJRMXI1c0djUkdQUnpxQlFV?= =?utf-8?B?MlJXR0hsWWlmNnBRbXE0Si9KU0lQUW91QndmR1dWKzEwSENMVm52U3Q4N0kr?= =?utf-8?B?VGd1aENZMmthakFDTHRCSXRsL2o4THRrOHMrMjZnQTFsVStGK1VhSkZsanFo?= =?utf-8?B?eDRZYndhSis5VjBPQjU1SU1haVkrZS9BRU1TYzR4SjhrMUp5UGtzNC9NKzJK?= =?utf-8?B?MEsvc1JpYTI1NFJRYUVVcDRoSXJMWGxsSThCNUU3S2VLYU5TM2JsWk9CbXZ3?= =?utf-8?B?K3g0ZkF1dU53Wk5sRlBCdFJkaStLY0UrRy8vQUVPWnNIYW9QYXpscXdsR2Y2?= =?utf-8?B?MmV0TGNuYUlRTTQxRVBjWVI2ZWJLYkZ0cmRaYnkzeTdaMWJDeFJTMWpSZ0M2?= =?utf-8?B?RkZLRmFCdmNuM3pmU3VHdmx6YzlyeFdWYzJ6SDhLRUQwamNXNThKYjdaSXJt?= =?utf-8?B?ZDB1WGZ3SWRXUy9PWnNKNzc0cjA2ZEZ6cWlUYnNTNUtoKzh5U3FDMEhzTUpJ?= =?utf-8?B?NVNYemsyakVLazk1dzBra3BiemI4V1kvVnlEaXNCeERSbVRoQm12Y0gvenlv?= =?utf-8?B?WFZ2S1c3YjJxNEkyMkZqejIxaFhlOUovSGV1TVZ3TWlZalJEVEoyMThWSTM0?= =?utf-8?B?djF4dmFvdDBVcURUTG9TbURPbUhYeTNRSVVtcTArUzFRbWkyc1hBQkZ4dHdw?= =?utf-8?B?QXBGeHJJSUs4SGlWS1crbTJ0aXljU1FpSnhMNDdIaldPL3ptdys2eHEwclNl?= =?utf-8?B?WEphdVdUbFBFT3RQNlJEWndvNUNqS1ZkalNScHVENzdwb3lwTm5GU2hqeUNJ?= =?utf-8?B?Z1grYm9LR1ZFdGFBM0duUDk3SGtSTE1JOUNKOGlYcmlhc2VaazZxSDVSenZX?= =?utf-8?B?SjVsRmlQek5JR1BsazlmVi9kRjFPWXhIMzUrV0xFQ3FzTlZxTnRHTEQySWpS?= =?utf-8?B?Zm5JdjZqQlpMbWQ4SUsyZ0h1ZE1JRTBlVlNoMEkxcUszV05mTjcxaGJWcUtq?= =?utf-8?B?TW1sTDBQTUtQZUE1TWdST3plSGxFZHVNZkl0UG1sY1dDKzEwV01zdGZhc2pS?= =?utf-8?B?OG1wZENmc0FqZGNRVkY3Q2JxekQycHN1SXByUkR4MWtYblUwYzNrcnFWaEQ0?= =?utf-8?Q?O9kZMvkzu+r9bHX9cBWNMyoo7JjQZrsS?= X-Microsoft-Antispam-Message-Info: gWAaeq/DHmz9ASdP2dES5W3jbKMRe/rdX34j/RXiD7U0FzjRg0GXsiF7viHhHvK6WUQrEaspNMOqhVOip6y9sXwZkHEMgVc56ZWU0+6qIBMgYBN07KcbucdWnSqEieNa/rPYuRu2dXpamC2KDKyBNWD8a77IwSL6upoc0VhJJMBaCyEuE+ef7UO9DH3qjsV9NtrteB7Oa16aRckUI7zByQ== X-Microsoft-Exchange-Diagnostics: 1; AM2PR08MB0097; 6:rzTA17JM0rkEBzFlrJtAgNui0amYJWnpvA8JimstMdjo/ZvuMZ31m2Hf/359zemT59ujsalPrEoDL4Slk6Z7M8lyF3MxAPyWbHUPa2V/A1SCdfsSnQyI3tTx744hlQPvk21dekmmV7Tc6NPkNYr1WvjVxpwGLVGp1mNzOcj80P6ZM5/iCax7Xp3j1KJ9KQH1TUNvpeuK1DbabWEkGDg6W6ohIetou/aIquBgkP3r+W6wI7mmWk67BucScontiiyyVNFv+2oUgA+N8wnCeJFKS7EVnXUZHLNhvVM1dSYVXtED4Js/kkvMbpkRUHmWEbn3EboV8GnmOUGUeJZ0pOgQXRk3u1PMmTf8ODA7syCe8FgratGTnoH8ucfy+Q+82Sn+9JGlfVSSd6veU3ofW8O0zg==; 5:IQHZvSCCiCak28rUnpvZ4Fa5I1XE268CqGZc6P6POZKudoc6UVMw3ICTOVDaGRC/RStARIorT/1pdU8hDta5Osz1WT0+h3uUKRBAcfEtyMdf80whdLmL6+r4jAwkxPORcXn7kOH4ZUKEM/H3R1v+lqKYiFlyeG3mnkw4kjgCJbw=; 24:MKxHZkiYiZ40NrolDZSv1zGZN9J9GjLbO7jGksgcL4R86VK8J6F7R4AzwWobMlOw4CwBOHdkbPe4aJH/NRcIfg==; 7:+oFO4MRF4tV9SFQKK2lk+OX0z6d7UPy9Cnpoocik3dVKnan16hrIavbL/KgeZqmXEjAQggOAYBv2C9irDBxeiTYW/juWNzzbkdxoy4s80IHOKzy0ANzNLKdkEAWR7KiDVXGO0knGZrA1DgFqf/oEwCJy/C4gkOms+EV1mJVfrHU79+9L2tCMeKzPIW/VTpr1PoNKedtrUZ7GTtmQoRiHzfNBiWvmwqUbl5OY9iY4bmFpMEOWGGOSC2OfzHQbaDen SpamDiagnosticOutput: 1:22 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2018 13:40:08.6701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70f3e622-e2b7-46ac-b4d9-08d568b02541 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 Following on from review comments for: [PATCH v2 5/8] Use tdesc types in gdbserver tdesc This patch simply moves arch/tdesc.h to common/tdesc.h. The arch/ directory is for port specific code. tdesc.h is not port specific, and is common to both gdb and gdbserver. Updated all the references to the file, including those generated from xml. I am adding this because my xml patch series will add a common-tdesc.c file. This patch contains no functional changes. Tested by building for x86, ppc and aarch64. Ran unittests for x86. Checked that my later patch series can apply on top. 2018-01-31 Alan Hayward gdb/ * arch/aarch64.h: Use common-tdesc.h. * arch/amd64.h: Likewise. * arch/i386.c: Likewise. * arch/i386.h: Likewise. * arch/tic6x.c: Likewise. * arch/tdesc.h: Move file from here... * common/common-tdesc.h: ...to here. * features/aarch64-core.c: Regenerate. * features/aarch64-fpu.c: Regenerate. * features/i386/32bit-avx.c: Regenerate. * features/i386/32bit-avx512.c: Regenerate. * features/i386/32bit-core.c: Regenerate. * features/i386/32bit-linux.c: Regenerate. * features/i386/32bit-mpx.c: Regenerate. * features/i386/32bit-pkeys.c: Regenerate. * features/i386/32bit-sse.c: Regenerate. * features/i386/64bit-avx.c: Regenerate. * features/i386/64bit-avx512.c: Regenerate. * features/i386/64bit-core.c: Regenerate. * features/i386/64bit-linux.c: Regenerate. * features/i386/64bit-mpx.c: Regenerate. * features/i386/64bit-pkeys.c: Regenerate. * features/i386/64bit-segments.c: Regenerate. * features/i386/64bit-sse.c: Regenerate. * features/i386/x32-core.c: Regenerate. * features/tic6x-c6xp.c: Regenerate. * features/tic6x-core.c: Regenerate. * features/tic6x-gp.c: Regenerate. * target-descriptions.c: Use common-tdesc.h. * target-descriptions.h: Likewise. gdbserver/ * tdesc.h: Use common-tdesc.h. * tdesc.h: Likewise. --- gdb/arch/aarch64.h | 2 +- gdb/arch/amd64.h | 2 +- gdb/arch/i386.c | 2 +- gdb/arch/i386.h | 2 +- gdb/arch/tic6x.c | 2 +- gdb/{arch/tdesc.h => common/common-tdesc.h} | 0 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 | 24 ++++++++++++------------ gdb/gdbserver/tdesc.h | 2 +- gdb/target-descriptions.c | 28 ++++++++++++++-------------- gdb/target-descriptions.h | 2 +- 31 files changed, 54 insertions(+), 54 deletions(-) rename gdb/{arch/tdesc.h => common/common-tdesc.h} (100%) diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h index 1ca83114f6..418a46f628 100644 --- a/gdb/arch/aarch64.h +++ b/gdb/arch/aarch64.h @@ -20,7 +20,7 @@ #ifndef ARCH_AARCH64_H #define ARCH_AARCH64_H -#include "tdesc.h" +#include "common-tdesc.h" target_desc *aarch64_create_target_description (); diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h index b50051f698..17c044f425 100644 --- a/gdb/arch/amd64.h +++ b/gdb/arch/amd64.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "tdesc.h" +#include "common-tdesc.h" #include target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32, diff --git a/gdb/arch/i386.c b/gdb/arch/i386.c index d3e1eb90e0..d60196fc54 100644 --- a/gdb/arch/i386.c +++ b/gdb/arch/i386.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include "i386.h" -#include "tdesc.h" +#include "common-tdesc.h" #include "x86-xstate.h" #include diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h index ffc34e3913..ba283c2bc2 100644 --- a/gdb/arch/i386.h +++ b/gdb/arch/i386.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "tdesc.h" +#include "common-tdesc.h" #include target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux); diff --git a/gdb/arch/tic6x.c b/gdb/arch/tic6x.c index 9fc36cd4ca..da3a656f78 100644 --- a/gdb/arch/tic6x.c +++ b/gdb/arch/tic6x.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "tdesc.h" +#include "common-tdesc.h" #include "tic6x.h" #include "common/common-defs.h" diff --git a/gdb/arch/tdesc.h b/gdb/common/common-tdesc.h similarity index 100% rename from gdb/arch/tdesc.h rename to gdb/common/common-tdesc.h diff --git a/gdb/features/aarch64-core.c b/gdb/features/aarch64-core.c index 3707b7e055..b89f94b1ff 100644 --- a/gdb/features/aarch64-core.c +++ b/gdb/features/aarch64-core.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: aarch64-core.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_aarch64_core (struct target_desc *result, long regnum) diff --git a/gdb/features/aarch64-fpu.c b/gdb/features/aarch64-fpu.c index cac3981f7d..0d1449ce5b 100644 --- a/gdb/features/aarch64-fpu.c +++ b/gdb/features/aarch64-fpu.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: aarch64-fpu.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_aarch64_fpu (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-avx.c b/gdb/features/i386/32bit-avx.c index 8a0c35655d..37bfd922ad 100644 --- a/gdb/features/i386/32bit-avx.c +++ b/gdb/features/i386/32bit-avx.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-avx.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_avx (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-avx512.c b/gdb/features/i386/32bit-avx512.c index 39c7e9771a..d4c1983845 100644 --- a/gdb/features/i386/32bit-avx512.c +++ b/gdb/features/i386/32bit-avx512.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-avx512.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_avx512 (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-core.c b/gdb/features/i386/32bit-core.c index 294e86d81e..7909340537 100644 --- a/gdb/features/i386/32bit-core.c +++ b/gdb/features/i386/32bit-core.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-core.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_core (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-linux.c b/gdb/features/i386/32bit-linux.c index 136e3d71b4..d3e18024e9 100644 --- a/gdb/features/i386/32bit-linux.c +++ b/gdb/features/i386/32bit-linux.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-linux.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_linux (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-mpx.c b/gdb/features/i386/32bit-mpx.c index 8f1be3a60f..4c16713c9a 100644 --- a/gdb/features/i386/32bit-mpx.c +++ b/gdb/features/i386/32bit-mpx.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-mpx.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_mpx (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-pkeys.c b/gdb/features/i386/32bit-pkeys.c index 4ad7649915..76d38b9a1c 100644 --- a/gdb/features/i386/32bit-pkeys.c +++ b/gdb/features/i386/32bit-pkeys.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-pkeys.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_pkeys (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/32bit-sse.c b/gdb/features/i386/32bit-sse.c index cf48960353..e52baf8a5c 100644 --- a/gdb/features/i386/32bit-sse.c +++ b/gdb/features/i386/32bit-sse.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 32bit-sse.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_32bit_sse (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-avx.c b/gdb/features/i386/64bit-avx.c index d8e391423b..0cc8a4e16e 100644 --- a/gdb/features/i386/64bit-avx.c +++ b/gdb/features/i386/64bit-avx.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-avx.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_avx (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-avx512.c b/gdb/features/i386/64bit-avx512.c index e103e43464..e281144a6a 100644 --- a/gdb/features/i386/64bit-avx512.c +++ b/gdb/features/i386/64bit-avx512.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-avx512.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_avx512 (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-core.c b/gdb/features/i386/64bit-core.c index 9e39ee42d9..e2f197fcce 100644 --- a/gdb/features/i386/64bit-core.c +++ b/gdb/features/i386/64bit-core.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-core.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_core (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-linux.c b/gdb/features/i386/64bit-linux.c index 570910b9cc..4304476779 100644 --- a/gdb/features/i386/64bit-linux.c +++ b/gdb/features/i386/64bit-linux.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-linux.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_linux (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-mpx.c b/gdb/features/i386/64bit-mpx.c index 725e76a0dd..602c21bddf 100644 --- a/gdb/features/i386/64bit-mpx.c +++ b/gdb/features/i386/64bit-mpx.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-mpx.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_mpx (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-pkeys.c b/gdb/features/i386/64bit-pkeys.c index 9d974c3772..444239f106 100644 --- a/gdb/features/i386/64bit-pkeys.c +++ b/gdb/features/i386/64bit-pkeys.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-pkeys.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_pkeys (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-segments.c b/gdb/features/i386/64bit-segments.c index 7a1fbf53f3..28c4307066 100644 --- a/gdb/features/i386/64bit-segments.c +++ b/gdb/features/i386/64bit-segments.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-segments.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_segments (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/64bit-sse.c b/gdb/features/i386/64bit-sse.c index 2859217f45..8b661ecfb6 100644 --- a/gdb/features/i386/64bit-sse.c +++ b/gdb/features/i386/64bit-sse.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: 64bit-sse.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_64bit_sse (struct target_desc *result, long regnum) diff --git a/gdb/features/i386/x32-core.c b/gdb/features/i386/x32-core.c index c268e11bea..aca0317e26 100644 --- a/gdb/features/i386/x32-core.c +++ b/gdb/features/i386/x32-core.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: x32-core.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_i386_x32_core (struct target_desc *result, long regnum) diff --git a/gdb/features/tic6x-c6xp.c b/gdb/features/tic6x-c6xp.c index 5b0f566ee4..5d745844a4 100644 --- a/gdb/features/tic6x-c6xp.c +++ b/gdb/features/tic6x-c6xp.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: tic6x-c6xp.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_tic6x_c6xp (struct target_desc *result, long regnum) diff --git a/gdb/features/tic6x-core.c b/gdb/features/tic6x-core.c index 823d4c1da1..9e5e3a021f 100644 --- a/gdb/features/tic6x-core.c +++ b/gdb/features/tic6x-core.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: tic6x-core.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_tic6x_core (struct target_desc *result, long regnum) diff --git a/gdb/features/tic6x-gp.c b/gdb/features/tic6x-gp.c index df0d0e37fc..86efffa561 100644 --- a/gdb/features/tic6x-gp.c +++ b/gdb/features/tic6x-gp.c @@ -1,7 +1,7 @@ /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: Original: tic6x-gp.xml */ -#include "arch/tdesc.h" +#include "common-tdesc.h" static int create_feature_tic6x_gp (struct target_desc *result, long regnum) diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c index c39b5e7d27..29e13d7216 100644 --- a/gdb/gdbserver/tdesc.c +++ b/gdb/gdbserver/tdesc.c @@ -66,7 +66,7 @@ current_target_desc (void) return current_process ()->tdesc; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void set_tdesc_architecture (struct target_desc *target_desc, @@ -75,7 +75,7 @@ set_tdesc_architecture (struct target_desc *target_desc, target_desc->arch = xstrdup (name); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void set_tdesc_osabi (struct target_desc *target_desc, const char *name) @@ -132,7 +132,7 @@ tdesc_get_features_xml (target_desc *tdesc) struct tdesc_type {}; -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ struct tdesc_feature * tdesc_create_feature (struct target_desc *tdesc, const char *name, @@ -144,7 +144,7 @@ tdesc_create_feature (struct target_desc *tdesc, const char *name, return tdesc; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ tdesc_type_with_fields * tdesc_create_flags (struct tdesc_feature *feature, const char *name, @@ -153,14 +153,14 @@ tdesc_create_flags (struct tdesc_feature *feature, const char *name, return NULL; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_add_flag (tdesc_type_with_fields *type, int start, const char *flag_name) {} -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ struct tdesc_type * tdesc_named_type (const struct tdesc_feature *feature, const char *id) @@ -168,7 +168,7 @@ tdesc_named_type (const struct tdesc_feature *feature, const char *id) return NULL; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ tdesc_type_with_fields * tdesc_create_union (struct tdesc_feature *feature, const char *id) @@ -176,7 +176,7 @@ tdesc_create_union (struct tdesc_feature *feature, const char *id) return NULL; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ tdesc_type_with_fields * tdesc_create_struct (struct tdesc_feature *feature, const char *id) @@ -184,7 +184,7 @@ tdesc_create_struct (struct tdesc_feature *feature, const char *id) return NULL; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_create_reg (struct tdesc_feature *feature, const char *name, @@ -212,7 +212,7 @@ tdesc_create_reg (struct tdesc_feature *feature, const char *name, tdesc->reg_defs.push_back (reg); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ struct tdesc_type * tdesc_create_vector (struct tdesc_feature *feature, const char *name, @@ -226,14 +226,14 @@ tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name, int start, int end) {} -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_add_field (tdesc_type_with_fields *type, const char *field_name, struct tdesc_type *field_type) {} -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_set_struct_size (tdesc_type_with_fields *type, int size) diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h index 783500598b..28ffdc597e 100644 --- a/gdb/gdbserver/tdesc.h +++ b/gdb/gdbserver/tdesc.h @@ -19,7 +19,7 @@ #ifndef TDESC_H #define TDESC_H -#include "arch/tdesc.h" +#include "common-tdesc.h" #include "regdef.h" #include diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 1b20a12d76..6302c15563 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -991,7 +991,7 @@ tdesc_predefined_type (enum tdesc_type_kind kind) gdb_assert_not_reached ("bad predefined tdesc type"); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ struct tdesc_type * tdesc_named_type (const struct tdesc_feature *feature, const char *id) @@ -1442,7 +1442,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_create_reg (struct tdesc_feature *feature, const char *name, @@ -1455,7 +1455,7 @@ tdesc_create_reg (struct tdesc_feature *feature, const char *name, feature->registers.emplace_back (reg); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ struct tdesc_type * tdesc_create_vector (struct tdesc_feature *feature, const char *name, @@ -1467,7 +1467,7 @@ tdesc_create_vector (struct tdesc_feature *feature, const char *name, return type; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ tdesc_type_with_fields * tdesc_create_struct (struct tdesc_feature *feature, const char *name) @@ -1479,7 +1479,7 @@ tdesc_create_struct (struct tdesc_feature *feature, const char *name) return type; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_set_struct_size (tdesc_type_with_fields *type, int size) @@ -1489,7 +1489,7 @@ tdesc_set_struct_size (tdesc_type_with_fields *type, int size) type->size = size; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ tdesc_type_with_fields * tdesc_create_union (struct tdesc_feature *feature, const char *name) @@ -1501,7 +1501,7 @@ tdesc_create_union (struct tdesc_feature *feature, const char *name) return type; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ tdesc_type_with_fields * tdesc_create_flags (struct tdesc_feature *feature, const char *name, @@ -1529,7 +1529,7 @@ tdesc_create_enum (struct tdesc_feature *feature, const char *name, return type; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_add_field (tdesc_type_with_fields *type, const char *field_name, @@ -1554,7 +1554,7 @@ tdesc_add_typed_bitfield (tdesc_type_with_fields *type, const char *field_name, type->fields.emplace_back (field_name, field_type, start, end); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name, @@ -1572,7 +1572,7 @@ tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name, tdesc_add_typed_bitfield (type, field_name, start, end, field_type); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void tdesc_add_flag (tdesc_type_with_fields *type, int start, @@ -1596,7 +1596,7 @@ tdesc_add_enum_value (tdesc_type_with_fields *type, int value, value, -1); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ struct tdesc_feature * tdesc_create_feature (struct target_desc *tdesc, const char *name, @@ -1662,7 +1662,7 @@ set_tdesc_property (struct target_desc *target_desc, target_desc->properties.emplace_back (key, value); } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void set_tdesc_architecture (struct target_desc *target_desc, @@ -1678,7 +1678,7 @@ set_tdesc_architecture (struct target_desc *target_desc, target_desc->arch = arch; } -/* See arch/tdesc.h. */ +/* See common-tdesc.h. */ void set_tdesc_osabi (struct target_desc *target_desc, const char *name) @@ -2043,7 +2043,7 @@ public: printf_unfiltered (" Original: %s */\n\n", lbasename (m_filename_after_features.c_str ())); - printf_unfiltered ("#include \"arch/tdesc.h\"\n"); + printf_unfiltered ("#include \"common-tdesc.h\"\n"); printf_unfiltered ("\n"); } diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h index 759fd34a0f..ec8d39a819 100644 --- a/gdb/target-descriptions.h +++ b/gdb/target-descriptions.h @@ -21,7 +21,7 @@ #ifndef TARGET_DESCRIPTIONS_H #define TARGET_DESCRIPTIONS_H 1 -#include "arch/tdesc.h" +#include "common-tdesc.h" struct tdesc_arch_data; struct target_ops;