From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2079.outbound.protection.outlook.com [40.107.241.79]) by sourceware.org (Postfix) with ESMTPS id BC2343858402 for ; Wed, 13 Sep 2023 10:18:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BC2343858402 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=AB88m4o+Xg05guiSahLmxc0uSaxnKDNbc+/pu2jhZbZatOS3B1Knb2U/SaEcZfJFi29owBJut8dZX0hbxCXtSVFSCJcrUnkh5TStxzj7YqThbyolb4FhpTUZZkFu2BE65gWSGkst5sm+BpaggJ8Fabv32rHT+vwHYfyFkOsc+C8= Received: from AM5PR0101CA0034.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::47) by PA4PR08MB6046.eurprd08.prod.outlook.com (2603:10a6:102:e4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Wed, 13 Sep 2023 10:18:38 +0000 Received: from AM7EUR03FT061.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:16:cafe::94) by AM5PR0101CA0034.outlook.office365.com (2603:10a6:206:16::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 10:18:38 +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 AM7EUR03FT061.mail.protection.outlook.com (100.127.140.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 10:18:38 +0000 Received: ("Tessian outbound c99fbc01d472:v175"); Wed, 13 Sep 2023 10:18:38 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4ec7795d36a83508 X-CR-MTA-TID: 64aa7808 Received: from c7b84247b6df.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4E2D9970-796D-48E2-B068-0698AB8CF974.1; Wed, 13 Sep 2023 10:18:30 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c7b84247b6df.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 13 Sep 2023 10:18:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIBKsXRuq6KVZQMzSt5Aejo6e4wWhcvUBFJmAYOWnMOhKSU6T4gNFpGRKG5NeHfZ6JKS3zo/lySCgcS5c1I37HoJhbk3OfOyUgpaHSsRAlPim7mFjPNCJro6dKj1/zVGXT3xGARMoDtnWp26eX4aJXVzOugNv5mMxkZjajWw36IqUMMtCBqrdNbITXAQZz49RnCDv1W5NLuN7ubVholywaKMW4rm+L/LBzpAi24PzU9J2TFp/WCOTWMnJdNj4LqkzhzjeSCUCkimr7KtJkkVlGgL6ZW1fgPFPaWe1zOOT7ouFGaPZ3ioTrVigrqsyfXLDWFBdlOMXAMOIJqfwU/TLg== 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=PElCSGLnuE36o7Vj/K9rcjP6MsuxqYGk0nCuKjzg79/Q3Gm+jE05m8YWmig3UbHVWcoDjNeFmL5EWi5sMW/MPFp87D08pVdrbHCaSG6FkUu7sdDv1wJuhpwtSyxjUKjv+tV2VrTZ+XUt4TBPdQdtRaIJWKbTBmtrNvdixhyhOIkxsxMHrLacT84TbcK9Xs+fKsDej+AJqommOvSLqs3HyTsuCmkwB0ZLisFxW38/a15e3rkmEIbf/IQhnMOWLBjq1VY/9ltVs9Gc6VdRaxn/Xpb9jLbqYyY2WK/oskqSHcGPlQrKxztMK8s+F62QE+xMXNR7RnbavRUgOiP2Vck1IA== 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=AB88m4o+Xg05guiSahLmxc0uSaxnKDNbc+/pu2jhZbZatOS3B1Knb2U/SaEcZfJFi29owBJut8dZX0hbxCXtSVFSCJcrUnkh5TStxzj7YqThbyolb4FhpTUZZkFu2BE65gWSGkst5sm+BpaggJ8Fabv32rHT+vwHYfyFkOsc+C8= Received: from AS4P189CA0027.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5db::16) by AS8PR08MB9096.eurprd08.prod.outlook.com (2603:10a6:20b:5c0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.30; Wed, 13 Sep 2023 10:18:28 +0000 Received: from AM7EUR03FT040.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:5db:cafe::2d) by AS4P189CA0027.outlook.office365.com (2603:10a6:20b:5db::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 10:18:28 +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 AM7EUR03FT040.mail.protection.outlook.com (100.127.140.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 10:18:28 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 13 Sep 2023 10:18:28 +0000 Received: from e129171.arm.com (10.57.66.200) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Wed, 13 Sep 2023 10:18:28 +0000 From: Luis Machado To: CC: , Subject: [PATCH v6 07/17] [gdbserver/aarch64] refactor: Adjust expedited registers dynamically Date: Wed, 13 Sep 2023 11:18:05 +0100 Message-ID: <20230913101815.178154-8-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230913101815.178154-1-luis.machado@arm.com> References: <20230913101815.178154-1-luis.machado@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT040:EE_|AS8PR08MB9096:EE_|AM7EUR03FT061:EE_|PA4PR08MB6046:EE_ X-MS-Office365-Filtering-Correlation-Id: 4090247a-cb81-459e-c277-08dbb442cc09 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: RC0Sdc414/RsEV9xdjRTXDCQBCHc41y5GCMJtqrL/DQ5l+dboIbRSso6uefOKoW7ZDOD5SXt5Gdd/Z5hbGX7r+ObjgfOihfJp32QOCGl+0oLohOUAxc3NHclBJ12RzWDravxPnIKpJtgWicEE1IJZ+c8AdJ+0DLXHOyQfljfXQIa8zJaHP0RDp2QuHwhurZpSEOvzF9rh12lGt0zJg46lENn/sYfQ2vqhme4ergsEnuRWfKvNTFDGX10HVX+Wlb7SGg0dFGGmQ+DmH419ZICO5vGCmQWuBY6nxnmhBqmOnoruLOSnHf4l2B+ZQfdZniwnjko1qiAd5RVZO60/WZ7w8EHwKHMScNsizh39HYgrMgjU6HQXIIMudcUBgqwJQ0HYGME1w7TBwOmUCG00wXqlgSr1PcvTPdDYmdhpm851OArxeZ2skxQCYK98VhwcHu/OcGZPq/qmbtC+iMNuLor++miYGH4AAqXknexkbITV1i6YKgtPaQ+licyj9mKL/4y+fh4xF+4SmJNR3TgGO8blkS0jp7jtxyF6FPalyBbYiC2oHq8bnyRCeT5tG12C4+a5MYae8uYwjrv94kzj1nX//EhB/u6HmM5c71EuwTuFcGjTZitvlFsp9Xq/jcKI2m3OvAk2YhomA3yPqe3rRAjDmGnD0ZGb+maBMc3hNQ7rXN+LFF4OfE/885+TZWDIx/73b3Ej3gdVpidwIAgLBnj1cFwmKW8LOvTsp6GHKTPS/uf1RxSmI/4NSvBIjquVa37oAuWnmAGEBDsT1ytRXl+zw== 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:(13230031)(4636009)(136003)(346002)(396003)(376002)(39860400002)(1800799009)(186009)(451199024)(82310400011)(40470700004)(36840700001)(46966006)(6916009)(5660300002)(44832011)(8936002)(4326008)(8676002)(2906002)(70586007)(7696005)(70206006)(316002)(41300700001)(6666004)(478600001)(54906003)(426003)(26005)(2616005)(1076003)(336012)(83380400001)(47076005)(36860700001)(81166007)(82740400003)(356005)(40460700003)(40480700001)(36756003)(86362001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9096 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT061.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 30b455a1-b520-482d-2b95-08dbb442c62b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3JEM7YzyZJ63QGJtN1GiSVds0BmsFQrDuu03hv5sbyW7AAODmlF4Tnc+i0c9rc2cMhUMBLmfiRATEB2M1i0Qr6cJ0m3y3OhNmM4duZbQupTaDviyu7E3r8JI8ZGcwhP2c6KEXuwxhfggE7pYsThplGie7zoBMmo1q/XX0WeRFBavgxWOUoIiLz2Q3d31Gh/mjpI1Io9kOL8vETJLtakcdpenZh6ycsUttf7yufNile8f0aWA81oKmPp821XTZTlSI3TYd/HJT9u5HYbL27hSlbDWOHhiZfnDZ2D/3CKENpMuOmEmUOG8ikbFGfWLbx54tNEzuVzp4N0Qf/nbiOMpg6q3/wQFNKYktkD3ypBWFlGy5bCCMZ11JTX6CICrCX/OpZctxgFYAYSBz1nrs9LhS1yBaWEfBo8YihvaYOcFlUL/dn0V8T3ICTb8z024sB4BDX/Qo2KJ/HUnHp5LHWD3GIlEVwIKgIVVlDD1rLc66q9FmOAVAjcYYeNSlaAEEpzK8xZFfcC1pgugr5ZPMNCFaiYc2YsMH/I0mg/Jlqf0ap/ekT2unWuiV1hDOEXfWl7UJDRKKm+vSOpkt0hmXgG0ri7cefHcDI+IxhCtyAif7i/+pnrmzjYE0EQs7EUCBPi/0iPYvANOWtTSvH7KqRFNZytwijPJ8whBxVDy8VAN2VY3nVlrGK6RmwTBbHAANueeSKa5BohFKh7XAFSVNnyY15+ho0GGYym4w4+5N/Z09QzmcZPUkvt6y2rAdM4hGBls 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:(13230031)(4636009)(39860400002)(136003)(346002)(396003)(376002)(1800799009)(451199024)(186009)(82310400011)(36840700001)(46966006)(40470700004)(36860700001)(40460700003)(2906002)(47076005)(36756003)(86362001)(81166007)(82740400003)(40480700001)(107886003)(2616005)(26005)(8936002)(8676002)(4326008)(1076003)(6666004)(7696005)(41300700001)(70586007)(70206006)(54906003)(6916009)(316002)(336012)(426003)(478600001)(5660300002)(83380400001)(44832011);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 10:18:38.6465 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4090247a-cb81-459e-c277-08dbb442cc09 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: AM7EUR03FT061.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6046 X-Spam-Status: No, score=-11.8 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