From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2072.outbound.protection.outlook.com [40.107.8.72]) by sourceware.org (Postfix) with ESMTPS id C982C3858C5E for ; Tue, 11 Apr 2023 04:27:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C982C3858C5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vYb9jIFiAPQXRlI8yx8RRVdReDuL6MFfkn9cLTpUkxA=; b=nqnxPkUfGIbINvTeb1M8pnC+guAIKIN3TlqFa8lFhEhS+F3I1JYlW5xCgpoLTOhGLQcyhmHd5kpL9LRTR+7djHtWxnK8rVFKaqLrXl0IpA9+B2fAKRJgrKvBwIx0Fg1E/9CBZ3hVbIis0/R383SA6DreUASWJREcjs2GwkkTOrY= Received: from AM6P194CA0015.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:90::28) by GV1PR08MB10369.eurprd08.prod.outlook.com (2603:10a6:150:a6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Tue, 11 Apr 2023 04:27:13 +0000 Received: from AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:90:cafe::22) by AM6P194CA0015.outlook.office365.com (2603:10a6:209:90::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Tue, 11 Apr 2023 04:27:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT015.mail.protection.outlook.com (100.127.140.173) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.28 via Frontend Transport; Tue, 11 Apr 2023 04:27:13 +0000 Received: ("Tessian outbound 3a01b65b5aad:v136"); Tue, 11 Apr 2023 04:27:13 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8b5d09a66bf6a10a X-CR-MTA-TID: 64aa7808 Received: from ae84809fec66.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 78359454-47D3-42DB-A125-A4B2CEE952CC.1; Tue, 11 Apr 2023 04:27:06 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id ae84809fec66.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 11 Apr 2023 04:27:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dxccae0kXRqK73LPl1BAiK3emxL/X9Pr6W1cp3bjyCsF3viMCX0jpeAtmr/nF+JDLZg7t9rHgMWOK9LwNBuAUqkPgBIJUDn2L9lyWdPLguYIDkLiB6BTx0ESDgdCpNVp2oZ838IJEvYFIYs/BtvX2jpxwIkMcqqt77vT3Mr6eAJfnwKFDR+YGznBfpbgwa+gIa/kaezAODkVVJ+lBDrvsYTb+4RVE/89DAFI+i5/s2cV65Agoq931kXd4598u75TJiQkSVg8Hp3f2tiWHBGXjp3JyG7h5VyXUexAcM2vHhZz1366jhrXJ6XIHSaDAXM703ry4neybXpvSsaciN2sdg== 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=vYb9jIFiAPQXRlI8yx8RRVdReDuL6MFfkn9cLTpUkxA=; b=F8wdhU+868qKGfvmT7oFnFBv0E+L3iKaIeTvZEE7dBTtCaG1MkOuv0mMXPb1o5PjONO0DvwXWZMvWDGmDTNFRink7P/ZoSKbCUBehfRnuyfnLAqU1pIXyPLDht7Fn6QcbwILtHTk35kir3+A2uiH3B/FAOB0c39/Dh3FBQ+SUxpzItp82DTTZDcDs60TgZzLV9E/uyZDCQuJYoZIQJAYYwdhkcWitb8mxi5MKc472EHdKsHaUUHnISyFWND7IuI0bhJgxuHtzlyzOYc5IaeBnwULaowq4EPtRJpkOqW80fTaGSPh6iEjxgp8xbNHfo8mjG4pxGsVVylML39xt9NXOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vYb9jIFiAPQXRlI8yx8RRVdReDuL6MFfkn9cLTpUkxA=; b=nqnxPkUfGIbINvTeb1M8pnC+guAIKIN3TlqFa8lFhEhS+F3I1JYlW5xCgpoLTOhGLQcyhmHd5kpL9LRTR+7djHtWxnK8rVFKaqLrXl0IpA9+B2fAKRJgrKvBwIx0Fg1E/9CBZ3hVbIis0/R383SA6DreUASWJREcjs2GwkkTOrY= Received: from AM5PR0502CA0005.eurprd05.prod.outlook.com (2603:10a6:203:91::15) by PAWPR08MB10238.eurprd08.prod.outlook.com (2603:10a6:102:365::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Tue, 11 Apr 2023 04:27:04 +0000 Received: from AM7EUR03FT016.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:91:cafe::d3) by AM5PR0502CA0005.outlook.office365.com (2603:10a6:203:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35 via Frontend Transport; Tue, 11 Apr 2023 04:27:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by AM7EUR03FT016.mail.protection.outlook.com (100.127.140.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6298.28 via Frontend Transport; Tue, 11 Apr 2023 04:27:04 +0000 Received: from AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Tue, 11 Apr 2023 04:27:04 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Tue, 11 Apr 2023 04:27:03 +0000 Received: from e129171.arm.com (10.57.80.123) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2507.17 via Frontend Transport; Tue, 11 Apr 2023 04:27:03 +0000 From: Luis Machado To: Subject: [PATCH 06/17] [gdbserver/aarch64] refactor: Adjust expedited registers dynamically Date: Tue, 11 Apr 2023 05:26:47 +0100 Message-ID: <20230411042658.1852730-7-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230411042658.1852730-1-luis.machado@arm.com> References: <20230411042658.1852730-1-luis.machado@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT016:EE_|PAWPR08MB10238:EE_|AM7EUR03FT015:EE_|GV1PR08MB10369:EE_ X-MS-Office365-Filtering-Correlation-Id: 507a0781-ad56-4084-9b90-08db3a450626 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jIFfd2MFfX6x3HRIXEgv6HtGeMuxFv+rtR1E0D/YWlbgDs9736KXW+4eatlVqf8ZjabjsEwTA82sZHJcPcLHVXKcCMo9kfB/GmuqFd3Dh3fN3Z5+FXsmFM0dsoalHSuoFV6xsEXV+SNPIAJHKVczGhmasG/2tvpYPqXbz1DwQPDmqBeUxeA5EqTV8HBvhqtnBw7dT9SdGW0+cLrR8F1PpuXvNMXGTBFCgiOHdFrA6bbnEAzNgObg2MAAo19YqvuNmxclYPTGZm+CL5KvNpIF3z6KzdX9mBEZ3thqNAIzawCyXra/UNA2OfRW6AXhacF0HQK/6o7TZlbEhx1bfAOI1SIOCNz4Cj/tsVympE8qTp9qze6T6Xesc7Q6RJNk5vD3rxBE2QXlujbdRu064q1dwGpn0I1ZivF0XJI+grGhrLZQ2BBL3i0HuS7/HaEuVZnlfKQEXNngvBgZ4ed8BCCbh+8qnHVF616h0zP8ufBbzygMYjJMdm0MM8BSWUGBVxiSRMQO2SRIaIpgxs8TkVFjjR2wP25Pm5rw1FFWJY8N2oAvb5EBm+cRvQmOVSmTIXisNtPLBLIegfFzTwVEnDVsSBt0+uDet9u2y+rbUgCXqEZ5tIdCNTX8XjWTyI+mTxoQlH6cLExf5ZO1jxYzMa2F5PzOFjeRTvCDVl8AdXLYhoAreLF6eaY+lDiJCRDRQGgqEu+SPijJRpcCLjM5QzIVYQ== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(396003)(39860400002)(346002)(451199021)(46966006)(36840700001)(70206006)(70586007)(478600001)(7696005)(6916009)(8676002)(41300700001)(316002)(83380400001)(36756003)(86362001)(47076005)(2616005)(426003)(336012)(1076003)(26005)(6666004)(2906002)(8936002)(44832011)(5660300002)(40480700001)(82310400005)(81166007)(186003)(82740400003)(36860700001)(356005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB10238 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 19a23179-2a4d-4bfc-30a6-08db3a4500e0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SFlMGIqYx0bUOWK4kzL+wiuBK/ESMRlF60uKpER9dSYvvwZYUkFaqqUlKxMmM4cMZN3k3JrOAlVVIQaPD4ukHqXDlfJznc5VN8mTBGWP52EyGBTRBiVRRoCGqyKdO+HEx1EqjiXfWaDwyag+MqggmPk0qcCFyg+RsyvWNlEcwC3Lr3tQwIVixiyREDMtrm05Wx+qep/OEYWFz0f5w6jXMNeRlFA8U1k/fxNZdYaWBGhpKJbJ1gDvBxhOmyZkyXgTTpcqJd5n+kp+qaiNIP23sc+5BR7Vf96ugYAPKpteDnWJkQfjC3eZzbaaWcnnX55gsp99vKpDqVAymPVyF+geIf1/wdFYd+dr2MxpajAu9GlnDd+3iOr0rnXy+P2H3ohUHsd6kBNi4bSTPZnkEo1RXZdBOUSsZY7nifq6CLYvaLIXFAIgROIecL0yvHRVG23K/mg9DNHvOqU0APARmSfFQXsjSEHMT6NcXy0HQdBF6rjYgu3x7MnSjk6J2Ee9TPHx1pUY5QgBUpcSEEXrihTbDaSC3e2Cmaf5sJ3pV1PmSEJie6EayqmRD3pVpoIxjzWf0SO0h6H3N4rraVWPHqyv3qOeb2oqCPQz2fZ2J5TCgIxfHLyg4MRbgddNdeIhtJY6XNykUyblAg2fMPef0UC5L+qs9D3MOvEIz8adVPBqp5emNm1A7JNokKhLUjcPT5aVtqHdpaTiLfJWw81yiBfp2A== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230028)(4636009)(396003)(346002)(376002)(39860400002)(136003)(451199021)(36840700001)(40470700004)(46966006)(70206006)(70586007)(1076003)(26005)(86362001)(316002)(6916009)(186003)(40460700003)(36756003)(6666004)(7696005)(40480700001)(478600001)(36860700001)(8676002)(8936002)(2616005)(41300700001)(81166007)(5660300002)(47076005)(2906002)(83380400001)(44832011)(82310400005)(426003)(336012)(82740400003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2023 04:27:13.2780 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 507a0781-ad56-4084-9b90-08db3a450626 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB10369 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Instead of using static arrays, build the list of expedited registers dynamically using a std::vector. This refactor shouldn't cause any user-visible changes. Regression-tested for aarch64-linux Ubuntu 22.04/20.04. --- gdbserver/linux-aarch64-tdesc.cc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc index 633134955e5..3c60e1a4db0 100644 --- a/gdbserver/linux-aarch64-tdesc.cc +++ b/gdbserver/linux-aarch64-tdesc.cc @@ -30,6 +30,8 @@ /* All possible aarch64 target descriptors. */ static std::unordered_map tdesc_aarch64_map; +static std::vector expedited_registers; + /* Create the aarch64 target description. */ const target_desc * @@ -44,15 +46,20 @@ aarch64_linux_read_description (const aarch64_features &features) if (tdesc == NULL) { tdesc = aarch64_create_target_description (features); + expedited_registers.clear (); + + /* Configure the expedited registers. By default we include x29, sp and + pc. */ + expedited_registers.push_back ("x29"); + expedited_registers.push_back ("sp"); + expedited_registers.push_back ("pc"); + + if (features.vq > 0) + expedited_registers.push_back ("vg"); - static const char *expedite_regs_aarch64[] = { "x29", "sp", "pc", NULL }; - static const char *expedite_regs_aarch64_sve[] = { "x29", "sp", "pc", - "vg", NULL }; + expedited_registers.push_back (nullptr); - if (features.vq == 0) - init_target_desc (tdesc, expedite_regs_aarch64); - else - init_target_desc (tdesc, expedite_regs_aarch64_sve); + init_target_desc (tdesc, (const char **) expedited_registers.data ()); tdesc_aarch64_map[features] = tdesc; } -- 2.25.1