From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2051.outbound.protection.outlook.com [40.107.20.51]) by sourceware.org (Postfix) with ESMTPS id 8E8E2385C6E4 for ; Tue, 22 Aug 2023 11:21:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E8E2385C6E4 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=hI0I27x2DUiirlYMA0+kvRuxuYeSCGwe9bsAuMDpdQh3og6HueR1KVEEP05JoHVyyzyP8dzW69q+r1wvx5IBR4Nb6XSU6r4dRqJXAgUxcvTugNthNEoPKk9yaD3nXCNEMbsOWx4TieH8pNVsy1fzNxQARKTdR5urXMNX4vaLL8Q= Received: from AM7PR02CA0003.eurprd02.prod.outlook.com (2603:10a6:20b:100::13) by AS2PR08MB9022.eurprd08.prod.outlook.com (2603:10a6:20b:5fc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Tue, 22 Aug 2023 11:21:47 +0000 Received: from AM7EUR03FT053.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::e0) by AM7PR02CA0003.outlook.office365.com (2603:10a6:20b:100::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 11:21:47 +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 AM7EUR03FT053.mail.protection.outlook.com (100.127.140.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6723.15 via Frontend Transport; Tue, 22 Aug 2023 11:21:45 +0000 Received: ("Tessian outbound c99fbc01d472:v175"); Tue, 22 Aug 2023 11:21:45 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0b275c2ef36924c7 X-CR-MTA-TID: 64aa7808 Received: from d2d73a926f41.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BFDD04B8-0902-42BF-804C-A95A793E82F5.1; Tue, 22 Aug 2023 11:21:39 +0000 Received: from EUR02-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d2d73a926f41.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 22 Aug 2023 11:21:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TRs+rv3uhSvt8waxsZmHJCSaQcFklV17ME3UZKI7CZ20x5A0JYx6NPLhCSz5M5Abzb6Ve96Dpfn0fbsQLDrg5Zb5JZldzyHs/7NL0eFOVIuoAZTZYdunSDTFr4ys//FGS2Cj/P5VIgryaZG0RptT91F6crPBR8LJJzVZ8dUdFeLbZFb6negKkxL+AQDHsc3hHIOMRB1pPiZPmLe6SMcpEL5FZPmqn0fTPZP5TS51+RIxkiigQM1QT8i+Wp2l0C8y6O2mfuKWt7jdN3EyroAFsCRBE9V7kkdwwWfyatkyhvDeTKD/fMNa3DIJZj+s+ckjB2+UyHd6mn/Cqhst9RcXew== 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=n5IUv94tLnnwLn7CYsAHPW4DPUt0XhLlyajxoSOiSDtzACHAXGvtKNuB5tMmDdSd0QU//47fCTnX0xWuBCZP/DuGApYTgeyHpcX2T5ru1J4f/ZGmwh8ehR7S/tzuVEa11CtTCnjgkcoP4cHmiwClWWs56S2jr9rnzWKJrsVvXAMgKMt8aGmUZkgjfzASVfIaK49EfuGRyLm6A09UwNUcqqPNMMIFPh5IkUKxfAzYhZgS/jduVbAsZPu+JFH/g3I2SZ8VxzRt8QSHr+/6SHd2eid3qDLqOhzEhqlwPm1fPcHof1XrSWfnRJsJgR5wDmfRATsIJKpt07zuzOoAPYeFHQ== 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=hI0I27x2DUiirlYMA0+kvRuxuYeSCGwe9bsAuMDpdQh3og6HueR1KVEEP05JoHVyyzyP8dzW69q+r1wvx5IBR4Nb6XSU6r4dRqJXAgUxcvTugNthNEoPKk9yaD3nXCNEMbsOWx4TieH8pNVsy1fzNxQARKTdR5urXMNX4vaLL8Q= Received: from DB7PR05CA0010.eurprd05.prod.outlook.com (2603:10a6:10:36::23) by AS4PR08MB8120.eurprd08.prod.outlook.com (2603:10a6:20b:58c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Tue, 22 Aug 2023 11:21:37 +0000 Received: from DBAEUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:36:cafe::7d) by DB7PR05CA0010.outlook.office365.com (2603:10a6:10:36::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 11:21:37 +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 DBAEUR03FT022.mail.protection.outlook.com (100.127.142.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6723.15 via Frontend Transport; Tue, 22 Aug 2023 11:21:37 +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.27; Tue, 22 Aug 2023 11:21:37 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.27; Tue, 22 Aug 2023 11:21:36 +0000 Received: from e129171.cambridge.arm.com (10.1.34.58) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Tue, 22 Aug 2023 11:21:36 +0000 From: Luis Machado To: CC: Subject: [PATCH v4 06/16] [gdbserver/aarch64] refactor: Adjust expedited registers dynamically Date: Tue, 22 Aug 2023 12:21:20 +0100 Message-ID: <20230822112130.1513216-7-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230822112130.1513216-1-luis.machado@arm.com> References: <20230822112130.1513216-1-luis.machado@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT022:EE_|AS4PR08MB8120:EE_|AM7EUR03FT053:EE_|AS2PR08MB9022:EE_ X-MS-Office365-Filtering-Correlation-Id: 68382c8b-f9d3-4d4d-c2aa-08dba301f854 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: mHeOiNbyNY/fsBDpDwZpUnuXamUY1ndm1r/SLbIouaqPX/tHTHFASrDJe04jQq5z1rRyDMvWUCThTM4B32IXSYVQdGkESabfmojGR/lDVJ9ATP+VDcq+To7in7FlKUB9ISHl8AxLhJtm9Ca38iz/VjB4RMLAvaj9J/IhhNppiHxb2Sr9A7ONMc4rX55wrVSdL1HyhPulFR8PrM96XNhXXQs8r9mDJY2aVk+0cvE5ImuuoeJ6/J856Q8YpGBYQ+quW/n2SmevG30NXbl1FRR2XxAdDj/fQzmC3OPjOeEeYGuA85Usx269eI+zG1nXMRCga5rJDprb4ZdhaynWXykOX0CzI/uQ8FLZUZ0qRyODDlKN6QTUbuGIc5MCzDTt1hFHNbKSW05y561vQnnqmXKQGUv/Ay3st5u4q0QfwAoQRggx95P/ZVy2bq00WZFQxkusIo6z1Hra74qzNWVBXW7I+JtMoWYK5hzLbGSBKvY4PYAc86KV6cJgCYB7N6jxOj9gq0ZRCXE6CcU9M4HtyRO4eS3LM7dSeEw+IcWZhD6dW95ZCxVnP27ZQ0NZc2/Z9axkmIyvkHZP00MKhuWxCkKOU5Fjw6uzJQvG370Nxgnk1uXsj3GUAFhoPvgFpJUVzlOXfsKXU9yTdV/VZ0CaIvTcjmi9UTzI6VwxU6WSZr5xSL7gHijieZGO1p6vIh5ikqOiJTlQDN0OpXDng4zey0Qjt7HSHAzG7udkY1JN30qlzYXnIn4+v1cey6QMRkNDETJQpGtEANT24qptqV6mnJTtHQ== 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)(376002)(396003)(39860400002)(346002)(1800799009)(186009)(451199024)(82310400011)(36840700001)(40470700004)(46966006)(6916009)(316002)(70586007)(70206006)(8676002)(8936002)(2616005)(4326008)(36756003)(40460700003)(41300700001)(1076003)(82740400003)(356005)(81166007)(478600001)(6666004)(40480700001)(83380400001)(2906002)(86362001)(47076005)(7696005)(36860700001)(336012)(44832011)(426003)(5660300002)(26005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB8120 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT053.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: dc2f3045-f645-4da6-6191-08dba301f33e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XFlk/IRLkemNXZOg4trGMwtS0O0BTUP4VIxUUQgsgu+c3q2u5w8Dc4DTKkQ7weWz6rYT2fkcyDk70ZCI4EunChnQwGffHbtx8/qsj0Mm6tNrgu7y5AYaacAQ8hSwssRziYxSX65MmVM7erhDAiGJjg0KUQiNCyoSHVkvjaZdsJgCj//OIVk/2S9Df2magh+hBIs7nfqhYB6X9KXjGJdYBtYNDBV/54c0qz8jIIZDo5a6pnwg0/t5I2963Jsqv4Y2qVjgc4BcTwEwjhTbW5VC2UiY+J/y+TDvnE2UQUXr5t4aKWTwFHdnQfwfoqp0xWuyh8JuVPu1OROlmnDIHSyXeS2JL6z6fXNrQfysT4kuWbtD+w+WQ2SyzGwVLdDrqovRm4+Tthq1sKfX6kKne6Wg5j+bd1FOk+v41lZuIVTICelTC4nisI1aELsEWrMrbMK7/QLZ/U7SQpjgwggLuefzhiq1FHnZ7WYLDaaMJfKtjzI0sUQdgjur3pdFEtmsHr0IKhnLZnJnAearjOVTCNg0OmYikC8sHtir+lVrVXIIA7jXL1osVN33bAX5CRo5/d/5IDKAumS2I6ohbmsHIiqm5EMALoVLkKE1uO7oC6aQxT64iZK3zUaJg3gtunkL03OqxhV6fceiDnNCsAa1aUTnSxJD3PQZP8xXJGcZpoDTFUu7Kn7gxw3qilCoTN19BtoT3V9oRht6bVjYyVG+5S97Xj4r8dNHQWimK7Ph3+9GNEmEo86Q7RvmmWbE52JZ6eSq 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)(136003)(376002)(396003)(39860400002)(346002)(1800799009)(186009)(451199024)(82310400011)(36840700001)(40470700004)(46966006)(6916009)(316002)(70586007)(70206006)(8676002)(8936002)(2616005)(107886003)(4326008)(36756003)(40460700003)(41300700001)(1076003)(82740400003)(81166007)(478600001)(6666004)(40480700001)(83380400001)(2906002)(86362001)(47076005)(7696005)(36860700001)(336012)(44832011)(426003)(5660300002)(26005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 11:21:45.9031 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68382c8b-f9d3-4d4d-c2aa-08dba301f854 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: AM7EUR03FT053.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB9022 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