From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2071.outbound.protection.outlook.com [40.107.8.71]) by sourceware.org (Postfix) with ESMTPS id 58E833858D28 for ; Tue, 11 Apr 2023 04:27:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 58E833858D28 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=ARNdYQ2DiulGRK+4WyKBhdKgynyUizuC94+vV72mWks=; b=qCIJ9ysNvI98oraMepS8kZ+40QKfPCIF7vW9CCZvrgKM6FsKvATQp2nw2KA0RJK60K3DWb7oj7C+9buPW20wVNWsPcH5x0dn4YDANSF7UHUEWAecDmSt2AKQ9WSQuYXlQNLLZDs+1pvad8kpUO9SBjL+vkFcjp/LXGun4C6LbdA= Received: from DB6PR0301CA0101.eurprd03.prod.outlook.com (2603:10a6:6:30::48) by AS8PR08MB10270.eurprd08.prod.outlook.com (2603:10a6:20b:63c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Tue, 11 Apr 2023 04:27:11 +0000 Received: from DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:30:cafe::e7) by DB6PR0301CA0101.outlook.office365.com (2603:10a6:6:30::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.40 via Frontend Transport; Tue, 11 Apr 2023 04:27:11 +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 DBAEUR03FT012.mail.protection.outlook.com (100.127.142.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.27 via Frontend Transport; Tue, 11 Apr 2023 04:27:11 +0000 Received: ("Tessian outbound 3570909035da:v136"); Tue, 11 Apr 2023 04:27:11 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b0bd90d4d1d11c8e X-CR-MTA-TID: 64aa7808 Received: from b42796cde1bf.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 3BA6EE50-1B9E-4B4A-88B5-6F968E93C04C.1; Tue, 11 Apr 2023 04:27:04 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b42796cde1bf.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 11 Apr 2023 04:27:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XysMKg9Jcv9VfTQ+Mz9TtR4e9ErwHscK2lrngjXk1gaocnHxH691OrY810Wjh4mr/Z9BQ7/zHDxU0BtB9cFyMQSs5MPZ8ar/nSX9e0+0KAQ/qFBE2nNude9pMlDqS3rSAm3G5qhKETX+bRzsbgdodhrPjLZqJP8yL7cXWXBK1N9t69sAMZzxK6tTat4Fbxr+YUBFxLCIFd42W2nP1Uor1Qt+4XB0+uGGz2st/MpYDF0cp6YiI80EPQkE5E+Ny43RxCoNJBQ27OygvfF6Jsh1c5xXzvyM2YvI2PXCakCYmP+WifWItSDw/yRQMklXQkO9Xui50dj5t7S6grhRjLDgcg== 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=ARNdYQ2DiulGRK+4WyKBhdKgynyUizuC94+vV72mWks=; b=VHef3qFqJuMyDnNiF4JCL/YiTsa1lxxBzjy4klR77O1fm/Fctfm+OQ+s2kU8g6rEb3p7DQPT0Dfc3xJx9uBw+JNyeN78JpUfXuhvVVqWg9HlzP3BnXZXbg9KsoWGh2A6LsWdOXorIutndVwouZJtJGV+7XvjkP6vZwQBQkd7cBuN+SVY4IdHfAUjsMuhZw2tJ/WZhCEuo5EZmQJCbH9crEhxd8D1qh+Lq+GARTfpn92EBJ0kLxcD8F56IiZAoB2B9UlyYhUCcKXG3sJqu1zBfmUDjRj5F1PL3RlHp8y2lZC611ei+CpKIXuTpjC/6TjKFUnGPsSDI6W2IJt0ABWHTA== 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=ARNdYQ2DiulGRK+4WyKBhdKgynyUizuC94+vV72mWks=; b=qCIJ9ysNvI98oraMepS8kZ+40QKfPCIF7vW9CCZvrgKM6FsKvATQp2nw2KA0RJK60K3DWb7oj7C+9buPW20wVNWsPcH5x0dn4YDANSF7UHUEWAecDmSt2AKQ9WSQuYXlQNLLZDs+1pvad8kpUO9SBjL+vkFcjp/LXGun4C6LbdA= Received: from AM3PR05CA0122.eurprd05.prod.outlook.com (2603:10a6:207:2::24) by AM8PR08MB6594.eurprd08.prod.outlook.com (2603:10a6:20b:36a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Tue, 11 Apr 2023 04:27:03 +0000 Received: from AM7EUR03FT053.eop-EUR03.prod.protection.outlook.com (2603:10a6:207:2:cafe::16) by AM3PR05CA0122.outlook.office365.com (2603:10a6:207:2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.40 via Frontend Transport; Tue, 11 Apr 2023 04:27:03 +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 AM7EUR03FT053.mail.protection.outlook.com (100.127.140.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6298.25 via Frontend Transport; Tue, 11 Apr 2023 04:27:03 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) 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.17; Tue, 11 Apr 2023 04:27:02 +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:02 +0000 From: Luis Machado To: Subject: [PATCH 02/17] [gdb/aarch64] refactor: Rename SVE-specific files Date: Tue, 11 Apr 2023 05:26:43 +0100 Message-ID: <20230411042658.1852730-3-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: AM7EUR03FT053:EE_|AM8PR08MB6594:EE_|DBAEUR03FT012:EE_|AS8PR08MB10270:EE_ X-MS-Office365-Filtering-Correlation-Id: c03fc140-810a-4dfb-fb07-08db3a45052b 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: Gma34rmaIFLlzA+2nK6zNx/wymhSmibD18Y26evc669FblQRT/qSFBPkBP8SNZWQn5MFUr7Rvpv/kqIq24fHVKGekgQ2JggiKgNiLsxv+MSCuDj3XgaT832cAxdc5tKJk5xr+tCMEgbxadg7+ffb6Qc1jTpWDO1AR57ykRVB8mx2A5WtUvQHrQBp5HvMSuqOoym67hfVlo1cSiUUvS+L8ic/rcebySWyA2GDdtDWxsrTQJuJ2awyfZEvyIRJphgNFIjT+VmNa0sQZ+PMhx5yUzVSdIHsP2IDuGXQoJy1yCRE4+9IOWfBgtWaDRBn6CL0YmpLV2OviEXfPFV113WiMTEIIhVK4ix7Z2S87k0Zn3J2T6nhil0Ci/j/+1Q+Go8hKe6gSOtQMHMnfPQdzCYloEfAcomexQrn0AfxD/w0pSXOaGYaCEyzv0cQYHfNKmV8yROalS/+DnDamutmBMen+XFl8p+5oufrrBl8lahLax+vfaB8sFMUyfoMhxxWNiUIPCb1AeB4+keW+v7QmBj3wtWJkIe8p/d/vEAgO1voIjHA1hDVvD7iI9qwOchH9BEYzfM/E8yFUMYekc6kKL8ulSyN0cC1cyvvQzmqgG3YU3uTIliuzTEOro641+oq0RXwhPx6teT2zXuGvJctFiKn6bhxfYzbVfhO9BDOiY1LDpB0JQR63uWdeiX/M/UZxuscWlLKYqmxKGoYMvaHgcPT8w== 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)(8936002)(5660300002)(44832011)(82310400005)(41300700001)(70206006)(70586007)(8676002)(6916009)(316002)(2906002)(478600001)(36756003)(6666004)(7696005)(86362001)(26005)(1076003)(40480700001)(2616005)(336012)(426003)(186003)(356005)(81166007)(82740400003)(83380400001)(47076005)(36860700001)(2004002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB6594 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: be31e1a5-cd42-41c6-5283-08db3a45005f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p70pZV/UmPjc3K5cibOUwAOSfrjjbIUwNyUQVce7Z7q4cWVFzy+LkBCHZtCAb+QKhUf9ZdXKqgsc1q0wAjbKF7mU6uyZSbhq8AIEPuqOzHh2aRYArmNbrb376A7l6AMGGkEfeGav6ksK5pROUUd+RgKbvyXOt9XsxxqZ7N63VlTC7WU/KYipLdzXMd5jk5CaSwfP65m0ejaXAuUp2YugPDPVLCU4ZHn9xGGANB/0PIsRmgSyPpvYKwH8Nd0sLzYFq4MBCW0WJPm0rGjPkKd9FbyheWHOxAzQpby6ykSOLP41U7F13F7JQcZNgzu5ofhmDA0pT5JPh3U4d44c07g4hNNhm+qxXyP0Fi7swQLNo41a2112uK/5OUK7MsTwYf623gZxZ40H4X8Da5r6WW5bGM3MIQGo9UoRvXf6pEt+sN7b5ksCTTBkbbmqEBd32Acd+DyLqNR0cz7Nrij12nSZmNn+4EurHp9/veSYLjIZEuvVii/fOI5eZJmSnpmK1lis3L68PYLWwtZ9g7F4HSWhCaKyAOtUQtcMan/Ln7pKxfbgGeClSdTXmpcubBMNk6yDSnfFzizOSCfPlK0+T56Lk2YULsY1sMI6+rcruKWeExV4xoTI7P57X3Ksw2kQk3NAA/+zNjaoXhON5v6JIPa8HgLRxk4Jja+vOlJIoSvDX4Prdi1BwgIMDcNlQZBHCHHzVPfJbnUb+X0ghtlktAlxCQ== 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)(136003)(39860400002)(396003)(346002)(376002)(451199021)(46966006)(40470700004)(36840700001)(6916009)(2616005)(41300700001)(36860700001)(44832011)(82740400003)(336012)(426003)(5660300002)(2906002)(47076005)(70206006)(70586007)(40480700001)(1076003)(186003)(26005)(86362001)(83380400001)(40460700003)(7696005)(6666004)(82310400005)(316002)(8936002)(8676002)(36756003)(81166007)(478600001)(2004002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2023 04:27:11.6823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c03fc140-810a-4dfb-fb07-08db3a45052b 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: DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB10270 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,KAM_SHORT,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: In preparation to the SME support patches, rename the SVE-specific files to something a bit more meaningful that can be shared with the SME code. In this case, I've renamed the "sve" in the names to "scalable". No functional changes. Regression-tested on aarch64-linux Ubuntu 22.04/20.04. --- gdb/Makefile.in | 2 +- gdb/aarch64-linux-nat.c | 2 +- gdb/configure.nat | 2 +- ...ptrace.c => aarch64-scalable-linux-ptrace.c} | 17 +++++++++-------- ...ptrace.h => aarch64-scalable-linux-ptrace.h} | 11 ++++++----- ...xt.h => aarch64-scalable-linux-sigcontext.h} | 11 +++++++---- gdbserver/Makefile.in | 2 +- gdbserver/configure.srv | 2 +- gdbserver/linux-aarch64-low.cc | 2 +- 9 files changed, 28 insertions(+), 23 deletions(-) rename gdb/nat/{aarch64-sve-linux-ptrace.c => aarch64-scalable-linux-ptrace.c} (96%) rename gdb/nat/{aarch64-sve-linux-ptrace.h => aarch64-scalable-linux-ptrace.h} (90%) rename gdb/nat/{aarch64-sve-linux-sigcontext.h => aarch64-scalable-linux-sigcontext.h} (96%) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 40497541880..bd9d8d0df10 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1558,7 +1558,7 @@ HFILES_NO_SRCDIR = \ nat/aarch64-linux.h \ nat/aarch64-linux-hw-point.h \ nat/aarch64-mte-linux-ptrace.h \ - nat/aarch64-sve-linux-ptrace.h \ + nat/aarch64-scalable-linux-ptrace.h \ nat/amd64-linux-siginfo.h \ nat/gdb_ptrace.h \ nat/gdb_thread_db.h \ diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 62656a7347b..0dd9652d001 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -35,7 +35,7 @@ #include "arch/arm.h" #include "nat/aarch64-linux.h" #include "nat/aarch64-linux-hw-point.h" -#include "nat/aarch64-sve-linux-ptrace.h" +#include "nat/aarch64-scalable-linux-ptrace.h" #include "elf/external.h" #include "elf/common.h" diff --git a/gdb/configure.nat b/gdb/configure.nat index aabcdeff989..8d26f521792 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -238,7 +238,7 @@ case ${gdb_host} in aarch32-linux-nat.o nat/aarch64-hw-point.o \ nat/aarch64-linux-hw-point.o \ nat/aarch64-linux.o \ - nat/aarch64-sve-linux-ptrace.o \ + nat/aarch64-scalable-linux-ptrace.o \ nat/aarch64-mte-linux-ptrace.o" ;; arc) diff --git a/gdb/nat/aarch64-sve-linux-ptrace.c b/gdb/nat/aarch64-scalable-linux-ptrace.c similarity index 96% rename from gdb/nat/aarch64-sve-linux-ptrace.c rename to gdb/nat/aarch64-scalable-linux-ptrace.c index 51146535672..cc43f510892 100644 --- a/gdb/nat/aarch64-sve-linux-ptrace.c +++ b/gdb/nat/aarch64-scalable-linux-ptrace.c @@ -1,4 +1,5 @@ -/* Common target dependent for AArch64 systems. +/* Common target dependent routines for AArch64 Scalable Extensions + (SVE/SME). Copyright (C) 2018-2023 Free Software Foundation, Inc. @@ -22,13 +23,13 @@ #include "gdbsupport/common-defs.h" #include "elf/external.h" #include "elf/common.h" -#include "aarch64-sve-linux-ptrace.h" +#include "aarch64-scalable-linux-ptrace.h" #include "arch/aarch64.h" #include "gdbsupport/common-regcache.h" #include "gdbsupport/byte-vector.h" #include -/* See nat/aarch64-sve-linux-ptrace.h. */ +/* See nat/aarch64-scalable-linux-ptrace.h. */ uint64_t aarch64_sve_get_vq (int tid) @@ -60,7 +61,7 @@ aarch64_sve_get_vq (int tid) return vq; } -/* See nat/aarch64-sve-linux-ptrace.h. */ +/* See nat/aarch64-scalable-linux-ptrace.h. */ bool aarch64_sve_set_vq (int tid, uint64_t vq) @@ -88,7 +89,7 @@ aarch64_sve_set_vq (int tid, uint64_t vq) return true; } -/* See nat/aarch64-sve-linux-ptrace.h. */ +/* See nat/aarch64-scalable-linux-ptrace.h. */ bool aarch64_sve_set_vq (int tid, struct reg_buffer_common *reg_buf) @@ -117,7 +118,7 @@ aarch64_sve_set_vq (int tid, struct reg_buffer_common *reg_buf) return aarch64_sve_set_vq (tid, sve_vq_from_vg (reg_vg)); } -/* See nat/aarch64-sve-linux-ptrace.h. */ +/* See nat/aarch64-scalable-linux-ptrace.h. */ std::unique_ptr aarch64_sve_get_sveregs (int tid) @@ -161,7 +162,7 @@ aarch64_maybe_swab128 (gdb_byte *dst, const gdb_byte *src, size_t size) #endif } -/* See nat/aarch64-sve-linux-ptrace.h. */ +/* See nat/aarch64-scalable-linux-ptrace.h. */ void aarch64_sve_regs_copy_to_reg_buf (struct reg_buffer_common *reg_buf, @@ -250,7 +251,7 @@ aarch64_sve_regs_copy_to_reg_buf (struct reg_buffer_common *reg_buf, } } -/* See nat/aarch64-sve-linux-ptrace.h. */ +/* See nat/aarch64-scalable-linux-ptrace.h. */ void aarch64_sve_regs_copy_from_reg_buf (const struct reg_buffer_common *reg_buf, diff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-scalable-linux-ptrace.h similarity index 90% rename from gdb/nat/aarch64-sve-linux-ptrace.h rename to gdb/nat/aarch64-scalable-linux-ptrace.h index 9539e199d34..2847c4e0263 100644 --- a/gdb/nat/aarch64-sve-linux-ptrace.h +++ b/gdb/nat/aarch64-scalable-linux-ptrace.h @@ -1,4 +1,5 @@ -/* Common target dependent for AArch64 systems. +/* Common target dependent definitions for AArch64 Scalable Extensions + (SVE/SME). Copyright (C) 2018-2023 Free Software Foundation, Inc. @@ -17,8 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef NAT_AARCH64_SVE_LINUX_PTRACE_H -#define NAT_AARCH64_SVE_LINUX_PTRACE_H +#ifndef NAT_AARCH64_SCALABLE_LINUX_PTRACE_H +#define NAT_AARCH64_SCALABLE_LINUX_PTRACE_H #include #include @@ -32,7 +33,7 @@ #include #ifndef SVE_SIG_ZREGS_SIZE -#include "aarch64-sve-linux-sigcontext.h" +#include "aarch64-scalable-linux-sigcontext.h" #endif /* Indicates whether a SVE ptrace header is followed by SVE registers or a @@ -69,4 +70,4 @@ extern void aarch64_sve_regs_copy_from_reg_buf (const struct reg_buffer_common *reg_buf, void *buf); -#endif /* NAT_AARCH64_SVE_LINUX_PTRACE_H */ +#endif /* NAT_AARCH64_SCALABLE_LINUX_PTRACE_H */ diff --git a/gdb/nat/aarch64-sve-linux-sigcontext.h b/gdb/nat/aarch64-scalable-linux-sigcontext.h similarity index 96% rename from gdb/nat/aarch64-sve-linux-sigcontext.h rename to gdb/nat/aarch64-scalable-linux-sigcontext.h index aba3c1595d0..e0120e093a0 100644 --- a/gdb/nat/aarch64-sve-linux-sigcontext.h +++ b/gdb/nat/aarch64-scalable-linux-sigcontext.h @@ -1,4 +1,7 @@ -/* Copyright (C) 2018-2023 Free Software Foundation, Inc. +/* Linux Kernel sigcontext definitions for AArch64 Scalable Extensions + (SVE/SME). + + Copyright (C) 2018-2023 Free Software Foundation, Inc. Contributed by Arm Ltd. This file is part of GDB. @@ -16,8 +19,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H -#define NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H +#ifndef NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H +#define NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H #define SVE_MAGIC 0x53564501 @@ -264,4 +267,4 @@ struct user_sve_header { SVE_PT_SVE_OFFSET + SVE_PT_SVE_SIZE(vq, flags) \ : SVE_PT_FPSIMD_OFFSET + SVE_PT_FPSIMD_SIZE(vq, flags)) -#endif /* NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H */ +#endif /* NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H */ diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 39cb9e7a151..b597515d428 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -218,7 +218,7 @@ SFILES = \ $(srcdir)/../gdb/arch/ppc-linux-common.c \ $(srcdir)/../gdb/arch/riscv.c \ $(srcdir)/../gdb/nat/aarch64-mte-linux-ptrace.c \ - $(srcdir)/../gdb/nat/aarch64-sve-linux-ptrace.c \ + $(srcdir)/../gdb/nat/aarch64-scalable-linux-ptrace.c \ $(srcdir)/../gdb/nat/linux-btrace.c \ $(srcdir)/../gdb/nat/linux-namespaces.c \ $(srcdir)/../gdb/nat/linux-osdata.c \ diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv index f0101994529..f625c808859 100644 --- a/gdbserver/configure.srv +++ b/gdbserver/configure.srv @@ -51,7 +51,7 @@ case "${gdbserver_host}" in srv_tgtobj="$srv_tgtobj arch/aarch64-mte-linux.o" srv_tgtobj="$srv_tgtobj linux-aarch64-tdesc.o" srv_tgtobj="$srv_tgtobj nat/aarch64-mte-linux-ptrace.o" - srv_tgtobj="$srv_tgtobj nat/aarch64-sve-linux-ptrace.o" + srv_tgtobj="$srv_tgtobj nat/aarch64-scalable-linux-ptrace.o" srv_tgtobj="${srv_tgtobj} $srv_linux_obj" srv_linux_regsets=yes srv_linux_thread_db=yes diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc index 2ed6e95562c..a20a3485ebc 100644 --- a/gdbserver/linux-aarch64-low.cc +++ b/gdbserver/linux-aarch64-low.cc @@ -44,7 +44,7 @@ #include "linux-aarch32-tdesc.h" #include "linux-aarch64-tdesc.h" #include "nat/aarch64-mte-linux-ptrace.h" -#include "nat/aarch64-sve-linux-ptrace.h" +#include "nat/aarch64-scalable-linux-ptrace.h" #include "tdesc.h" #ifdef HAVE_SYS_REG_H -- 2.25.1