From patchwork Wed Apr 3 14:24:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Lapshin X-Patchwork-Id: 87983 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C51E63846402 for ; Wed, 3 Apr 2024 14:25:25 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from HK2PR02CU002.outbound.protection.outlook.com (mail-eastasiaazon11020003.outbound.protection.outlook.com [52.101.128.3]) by sourceware.org (Postfix) with ESMTPS id 8A47E3858401 for ; Wed, 3 Apr 2024 14:24:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A47E3858401 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=espressif.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=espressif.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8A47E3858401 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=52.101.128.3 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712154302; cv=pass; b=DDh11U8eeNO496CZ3DP67xBYRRmW2sx1RuJ2ZgaWy9MEgZdBDZmjIk4ha9HhU2+iPVV93CfZW/9co21XHTJPdqzSHc2QshBikKPZwWod532KFaQvSOBv5yMgLRR5IP/pXN5N4vQW0czuzl/8u6qRBuRx0RdWdy/TvLyGEXo8OHg= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712154302; c=relaxed/simple; bh=geisOfAyFUcJLWJAAJaEOsJNZGeRRGjQxIRg4gkdqTE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=v4cCSl1HiwqsxX6IrFxWVCRaR3xubyBuJxDxb1FTUbqCAoCSzc9jP04ehC/t8LodelGaCYcewp0wAoKOzWlBddEMXulk0ip2j7J56HixP6NK+xJJxWnFE2vto6hzWrIFwyO0OYa2q0nfeyc5vczU/ktiQb+sG37gfFUMQczdry0= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EUeY9xerx/DM++XiDmweMFMTHhYUqwCxQZBp69CvntNAGSNFB1nACoVtEgC9u3snxnIVyk1fJ8b5JpOPCkMDm7nplltnFFmCMYj2cw5/iKyHecpx05HejkOntSx/MSZI61f7EMsDPJum5+AjuXX1zdC59UDh8R96IpLSMpuQL9rgKM2NPPcl7iN0ysbLYRDNKviydDGB0emHOCKmfUAACiNf6UjfoVspnkATeDp1q2cvcvZH1glOtuhxftb1nUjAUK5E1yEyGTXNwzgKQG4SkJsxhbPw4KZLV5qTehhUm73uEdhFLZGWmkKEY04pdv/c49tjt0taEaTaeRI6RmtHWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=geisOfAyFUcJLWJAAJaEOsJNZGeRRGjQxIRg4gkdqTE=; b=ERqTVAL/f/JyS73JUTzDLoLy+3rk1BWwEutpf8cV/jXg3WtQe9ESciE0KrsfFa+PPmFSqqDoOx8IzF57PjiNPyyiecp4QH2oM6JtB6+1UVKuH3GCnWLyTPUACg6MK25JLKPdptsz3m99oKAa+0ydoGXm3iuD8sgFgHfgDvFdNDoPdnBPR9JpSk99PCmPJprakTZTXyWscKMKwXsw47xO3gIa5mWRhk+xFNYc1CYNrUvMHbDO9uxywV7ek0rVYOX3MSpsw2H+9FnR9i9FeTIWHOWrWfwUE1piRAQxngK7Iy1m+PHqJO2aQdYJL3ZZyCv3SbwGsnhyR8Ce+mZgrAQd2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=espressif.com; dmarc=pass action=none header.from=espressif.com; dkim=pass header.d=espressif.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=espressifsystems.onmicrosoft.com; s=selector1-espressifsystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=geisOfAyFUcJLWJAAJaEOsJNZGeRRGjQxIRg4gkdqTE=; b=EbIBvV0HZuGg0S6ywDTJKjhenMLSJkf8dCqbYNMGPfn8ZCa7s/0ooyDjBfeoZ2NlA1dLfDCZ26jNdrl6J4LwLN7gwUMWpKcb/Up7Oda8Vxad662pdIrd0Blq1luXk23Q7h1j+O4H0r7o4Kk5066Y1nOyDkIazka/+rCyeswOWkE= Received: from TYZPR04MB5736.apcprd04.prod.outlook.com (2603:1096:400:1fa::7) by KL1PR04MB7747.apcprd04.prod.outlook.com (2603:1096:820:133::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 3 Apr 2024 14:24:50 +0000 Received: from TYZPR04MB5736.apcprd04.prod.outlook.com ([fe80::dd14:d91e:da7c:1a6d]) by TYZPR04MB5736.apcprd04.prod.outlook.com ([fe80::dd14:d91e:da7c:1a6d%7]) with mapi id 15.20.7409.042; Wed, 3 Apr 2024 14:24:50 +0000 From: Alexey Lapshin To: "gdb-patches@sourceware.org" CC: Alexey Gerenkov , Ivan Grokhotkov , "jcmvbkbc@gmail.com" Subject: [PATCH] gdb: xtensa: use rmap from dynconfig library Thread-Topic: [PATCH] gdb: xtensa: use rmap from dynconfig library Thread-Index: AQHahdKwEPcJtwQ5zEmII8CIAcXryQ== Date: Wed, 3 Apr 2024 14:24:50 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TYZPR04MB5736:EE_|KL1PR04MB7747:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vPiik9HPoObWu1p1yROX28EtPoLWYq6GFLopUgShEOzA5Eht4XhxaWw3SGEj6CN+rLJTgMFbhJGGauR6PfKGHJqk4yT3DuxuViFGbMsz0HwctF2Cle27JteG0huxCV2kmbrBPu5H+55j8zlftCAxHTHd15APuPJLliQJwdf/bVMy21582XmiSioUVfpbk8tXw6xVnsLHULq2+qDQ6u2jQOfl8hLbJ++Le8xeNpCumv/WaAojKEvQ6FZ0qA3i1CmehxYVDhZc83O5isEagFwfgeEQpfV81RqnwMTDpY+is7XFVY43wpHOM0PWzdBsGFEMZ4nEg+XFDkyWoJML7J1Z34jf5JNqGDhdEMoo5D4l62me3qDs+Npampkww0sjV9af9Ei2h6m3xZ/azZ4r9+tLw0FgHDX4cfabp6Ro5S+UcUQ4pWyJqMQxQeOmchhz5+XrxyUjRuAwtH27z+Cl7b4xJh42m92dcXjJ1oEaXQOC2f5afFnVMHvaNDwm0IZjaedua5dXzlP3VO4ZDN9mf1TXuPbRmGQFxXp401VzTLVa+Qvqme2i5bzuhmxkSd9Ynlb97wKuW1rVdtkkDkRJSBZKUSela881gOVGZp1ADhxfmj4sfsSDDwIcNwlV8nQiyAi8k30X/7C/bDB1Ugx2Eg81EPhDMhfXmGk+pbF/UzyGNHc= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYZPR04MB5736.apcprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(376005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?LFdxhi9VlGGtVANUBghrvOYqyg3J?= =?utf-8?q?2dvcwQfb2QsbPWGAQ55VpePwk9gDaj+3RqXdgvRyk8CUq/NSlXbdTo0gF23GtYfqV?= =?utf-8?q?/VM2qvOeJYfLcfDAlhY9IiFqOMXuWsPlhwE88wAE4VAk3ur1VKj+xw8AcQkLEgdTi?= =?utf-8?q?+ak+bFZsPsIIUglrgo5aMX08reaR7JBwmHYC1vlv31wA7Q0o9U3VWk2Q//sCb+3et?= =?utf-8?q?Vu33WKCNiIwQ8ogp22ZO6cOeR160kEBCYfZzgluBE48wMeHr04MyX+y0G8S6fUdla?= =?utf-8?q?erlzr124m60iPa1JacHKudtKVkDHqojttV7cJwB5pRI+iG5PAnIdG6cS8VKkOWIUP?= =?utf-8?q?n43FzJDCd6HoaZxOvoA9DkOvYgb/v46bbZuaVVYVTr1878c8MKEL/obv5wIqhTmhX?= =?utf-8?q?e1EFxhWyoXOPuFDdRsrh+71NqIwN2Tb4h8989BiZjABTY2zEnOj/V07L180bAHvw0?= =?utf-8?q?XHmaIdXi9mDkqp8fANCnOf6B9ObcLNw2tVKsErhCrbTzFRlEUaYxjoI6EBDgH0k+J?= =?utf-8?q?7vb01c+Pm3E3dSPooqNTYs5GBcmny6j5kOMEeK8UXlli9gZZaHofJlQB0PfOK7iBG?= =?utf-8?q?TebGTCzRUOMf2WZxkBMuangci0eYql8XPI7Si4BOt0XFF5IdQKjzXiKA3niNAzUom?= =?utf-8?q?oBYxWPb2csHDYR32NEjLShVUM4rQ3tHJx156Vc946+sOBhCvQ8cHchbebYX26G0aD?= =?utf-8?q?rPo5x7frOerL/Fb2tAjJMQGlzF8RS6hAX3sTVBbTlv78YrhOYucNewtGM/gGUxz4G?= =?utf-8?q?9JTS4mJ8PEWKeufOjzmdWIF6HUZzoSNKi4pFy30RDP+ShBQq9oMDxxipYUlFwVs6S?= =?utf-8?q?zhFQgV+u+bdC8hOvP2Oar9nScUMdxmSuF5x5+9HnIUGXITVSk6YoYI16ifv9P/wI/?= =?utf-8?q?nfx6tPiFSUpbgBojur0xFjY/SODBDaiBWaZPRVLToEpJ6GcFO0v/ivgMwuRRbHE9q?= =?utf-8?q?vFxEvDDEKKuuDm4v4sjiLp/tdKuk3HiDwdZlSV5fw0RIqXbrbuuRXk4u7WxHeX8Es?= =?utf-8?q?qO2UJs89Jtq0gctxIit3Qp2pqL6kOEzC8Joej/s+/atFepEmq6gV2GeQcupD2NZ60?= =?utf-8?q?VXqTALhcDKkwCW4y94Hd1npjclG/4DauYtBZSDsar1fQQUZcNaiH7an7gEfD5JwpD?= =?utf-8?q?U5NFtpDSbTzucoxYuCbA0nxVmja+6Y02KRQk7IsdsPRvRtHWY+tDTKVW2Q1H7ZH9o?= =?utf-8?q?2jmYSK8fG7hJ83pj13QcENAd3+S0YGAtMYCZt7uBkAGecmJK5qAmtAQthCRFcMBha?= =?utf-8?q?FRfovz8sAP5o/mNNwQDhlIlPhP6XRWpOsA5BBwygOtW30kwuhvf3yXliCOws8hV9V?= =?utf-8?q?sG1gzXCvLBX3p93nu1jPQtSkgG1kDdy7x7Nxy3ldF6TCE5k9jywLGrz+Z7abJ0Ilf?= =?utf-8?q?FkIHmwqVvi7IErJd0/9YwFTiEw24AyR7NnO0A7A8k6AoUtQ02G0bTUWbutvN7aFxK?= =?utf-8?q?bUlSO+AKfB/RWkZFn2/nZFsq4vseLBVI+Y+EnnJhladQGi41uCWkpgi5eXI0/UYwm?= =?utf-8?q?lzwfyr3p2W+DHl1FynZ5AZYUJyU69wIN4Tj6bcFAj33/egtwCx3PAIk=3D?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: espressif.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TYZPR04MB5736.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4fe521b-54d9-4b92-5c61-08dc53e9d2b0 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Apr 2024 14:24:50.6519 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5faf27fd-3557-4294-9545-8ea74a409f39 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: uLr6gbPhKkGCiLmmjR1MK5pY3wUck7bt5QYLn/u5xC9q9jCpiDCQvqHtxYy1iWBsNSpq0unrXnKzlu6laDWiZ2GR1KVrgJPRaWoAeDoH3LA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR04MB7747 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org --- gdb/xtensa-config.c | 4 ++-- gdb/xtensa-tdep.c | 6 ++---- gdb/xtensa-tdep.h | 11 +++++++---- 3 files changed, 11 insertions(+), 10 deletions(-) --- 2.34.1 diff --git a/gdb/xtensa-config.c b/gdb/xtensa-config.c index a40ce9380dc..a0153b037ec 100644 --- a/gdb/xtensa-config.c +++ b/gdb/xtensa-config.c @@ -21,7 +21,7 @@ #define XTENSA_CONFIG_VERSION 0x60 -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" #include "xtensa-tdep.h" @@ -62,7 +62,7 @@ const xtensa_mask_t xtensa_mask15 = { 1, xtensa_submask15 }; /* Register map. */ -xtensa_register_t xtensa_rmap[] = +xtensa_register_t xtensa_rmap_default[] = { /* idx ofs bi sz al targno flags cp typ group name */ XTREG( 0, 0,32, 4, 4,0x0020,0x0006,-2, 9,0x0100,pc, 0,0,0,0,0,0) diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index e8a143fadab..d14caeb232e 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -42,7 +42,7 @@ #include "xtensa-isa.h" #include "xtensa-tdep.h" -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" #include @@ -3160,8 +3160,6 @@ xtensa_derive_tdep (xtensa_gdbarch_tdep *tdep) /* Module "constructor" function. */ -extern xtensa_register_t xtensa_rmap[]; - static struct gdbarch * xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -3175,7 +3173,7 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) gdbarch *gdbarch = gdbarch_alloc (&info, - gdbarch_tdep_up (new xtensa_gdbarch_tdep (xtensa_rmap))); + gdbarch_tdep_up (new xtensa_gdbarch_tdep ())); xtensa_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); xtensa_derive_tdep (tdep); diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h index ba1101b7b5b..3be26a5eedf 100644 --- a/gdb/xtensa-tdep.h +++ b/gdb/xtensa-tdep.h @@ -22,7 +22,7 @@ #include "arch/xtensa.h" #include "gdbarch.h" -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION whenever the "tdep" structure changes in an incompatible way. */ @@ -169,9 +169,12 @@ struct ctype_cache struct xtensa_gdbarch_tdep : gdbarch_tdep_base { - xtensa_gdbarch_tdep (xtensa_register_t *regmap) - : regmap (regmap) - {} + xtensa_gdbarch_tdep () + { + extern xtensa_register_t xtensa_rmap_default[]; + regmap = (xtensa_register_t *) xtensa_load_config ("rmap", NULL, NULL); + regmap = regmap ? regmap : xtensa_rmap_default; + } unsigned int target_flags = 0;