From patchwork Mon Sep 18 21:26:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Machado X-Patchwork-Id: 76314 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 3AC9A3854178 for ; Mon, 18 Sep 2023 21:28:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3AC9A3854178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695072484; bh=DYJ9HDmD5xpMZux8zle+8qw+dk/hXB0rCsN79ef3iL8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=FhVu+qe8C7umR6u8AB4jDexQflTbkMKrzrXr1nfFZq2h0MYzGKobZz0PFNcRIqvfV q6izPWcxHZDE81Ve9GogACKP8aF6D0SAhvD/rRWrg8KMadfMef4jwDFvmDBbel4170 LWuvDjeiQUnGCXtLZycAihu47kAYHXhYN6JPd7wo= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2057.outbound.protection.outlook.com [40.107.104.57]) by sourceware.org (Postfix) with ESMTPS id 2F3F8385771C for ; Mon, 18 Sep 2023 21:27:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F3F8385771C Received: from AS8PR04CA0148.eurprd04.prod.outlook.com (2603:10a6:20b:127::33) by AS8PR08MB9043.eurprd08.prod.outlook.com (2603:10a6:20b:5c1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.30; Mon, 18 Sep 2023 21:27:14 +0000 Received: from AM7EUR03FT055.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:127:cafe::e3) by AS8PR04CA0148.outlook.office365.com (2603:10a6:20b:127::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27 via Frontend Transport; Mon, 18 Sep 2023 21:27:14 +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 AM7EUR03FT055.mail.protection.outlook.com (100.127.141.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.16 via Frontend Transport; Mon, 18 Sep 2023 21:27:14 +0000 Received: ("Tessian outbound 169aaa6bf2b7:v175"); Mon, 18 Sep 2023 21:27:14 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d5397d932a3b904f X-CR-MTA-TID: 64aa7808 Received: from a30ef453b03a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BFA82439-02FC-4239-A086-167E0892C7CC.1; Mon, 18 Sep 2023 21:27:07 +0000 Received: from EUR02-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a30ef453b03a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Sep 2023 21:27:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NOi0nIlq/8/paodMQ0OO3+9FfQubXap6VT++vSAb7rydwDSy2UJHCWeDMD12/UZFRX8xUikwQq/FStqy3RERwkby3N1QiJAFkQU/d5X9BYkYVsiLNXrT9GXx89RUvo10FjiLyvem3cbAX+irjyzwz2BfUlTUtEEpj8LZrNGRQ6qdcXJadhUQUg1iW1bw41v9wgXqzZZouFj5HIqlOuFSJWE3eigkfD2C6RGV1rKSXpG9sHHAkTbqENATFtPc3xvJhQOm8I9gRIO3Z4ri39iePNvWHzc95emQIxoboJI23XTZNvHnUfzUvvOFIvR7ytD5FOJjns33ZSgtB2pz33jFdA== 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=DYJ9HDmD5xpMZux8zle+8qw+dk/hXB0rCsN79ef3iL8=; b=EpG1w/nCvlwbRL8DOY/zUyS48WEO0Naqo0lZLOgYkwgHuVwM9BkjbO3lfOc6FKGu/fflw2pazHqm9HoFgb/zKC1QYZpDt5ZLy2aG5hamsUe8Je03ES8c1vqe7EBLklgbb76hPZ6mk5UedjBbBJJ/R22iOG0SrLMogU/ZZrRL1tS3fkOkxzN1xmLHUM0UsOI2RPolg2VsxRAHG96HV7IUiv0G5fMzfI9Zmnrd9Xc0Eu2//d/+x3kV2m7sJKSdCWN8igwdCvF2Zk1q52jPo1k0NXSpNjQiLDcrYtdP7+Itu/tM3bz3FdNav2PygFFFsEL2TstPlQ/mrUYT0BhFBp2iAw== 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 Received: from AS8PR07CA0029.eurprd07.prod.outlook.com (2603:10a6:20b:451::30) by DU0PR08MB7662.eurprd08.prod.outlook.com (2603:10a6:10:318::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.24; Mon, 18 Sep 2023 21:27:02 +0000 Received: from AM7EUR03FT058.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:451:cafe::80) by AS8PR07CA0029.outlook.office365.com (2603:10a6:20b:451::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27 via Frontend Transport; Mon, 18 Sep 2023 21:27:02 +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 AM7EUR03FT058.mail.protection.outlook.com (100.127.140.247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6813.16 via Frontend Transport; Mon, 18 Sep 2023 21:27:02 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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; Mon, 18 Sep 2023 21:27:01 +0000 Received: from e129171.arm.com (10.57.64.238) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Mon, 18 Sep 2023 21:27:01 +0000 To: Subject: [PATCH v7 02/18] [gdb/aarch64] refactor: Rename SVE-specific files Date: Mon, 18 Sep 2023 22:26:35 +0100 Message-ID: <20230918212651.660141-3-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230918212651.660141-1-luis.machado@arm.com> References: <20230918212651.660141-1-luis.machado@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT058:EE_|DU0PR08MB7662:EE_|AM7EUR03FT055:EE_|AS8PR08MB9043:EE_ X-MS-Office365-Filtering-Correlation-Id: 82c63add-2aa9-4479-26ca-08dbb88e070b 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: Gr9YCkRhSyNIo+I+waKLWPJQ7/OQjLn+/GU57UdbCKj8ECffoO7bLxmpEm3Em94XJlgLKgjN13rOeZR9ygTv2ciyx84knEnwPo5Xa+7nRnK3vt0BDjrngrFXJY2dJ/WgVhKOGWmK5Bk4Hfqqz94Xql9V9b8Cipt7Hb2f5qY1CENlaFVTzLVyx0itiLgLIIJwTQFV1vbxic3peDzNJ+YCrDSofZdvsJCTgWe0MhpZbvc9u2WmWnngP4K+8yWzsi4Euz+nweXplb9b0fIRlMj7AK95tsRs4+sl2PCCUWNL5u8eLgzZY/ZTx2XlmmfYSug+e97LxKgIwA7VgO14rn2xSPgumYdTifgFHFyNMkfIYJW/BLeI0pj1AnPf8zznsHjcsiOw73pYMY0Apt49GAeQZZfVFmASVBwTwlFFyWXR4xZYkNK6vpT+kmp0Qzemj/BK27dcesJ/eTKN80FJPOWonRpre+IPs8rNunGf2V/JKxGKjVncdlECzHcRhO2MuH5yuF1c20dSLu/6Eo1ruIwTgbmiJzGkH5+KinQG0GUxSQPZYczL6YzymKH9IzLCCrl+in+kP+qleJ6MIM3EInlgCyTDF3qH2QyQ6RmwsnGDbDZ1hJaGC1u8La1YKEYPFwOZ3iG6gfpf3h64uNssYO7Z1+KcXe8NQ8Scf6/TUugfI/nlTR2dyv1BnSWVxRTzAWUrQM3BLgePJy57EYA0YJmfA598lIAqyky9bOg/QASydQRWh/Ai7maE3TvP3Z4ls8sPUhGn+GTdtXAwbxsjK8xS4YHAILoYMu3sF8VYJunU5x8= 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)(39860400002)(346002)(376002)(136003)(396003)(451199024)(82310400011)(186009)(1800799009)(40470700004)(36840700001)(46966006)(40480700001)(44832011)(7696005)(86362001)(54906003)(316002)(41300700001)(70586007)(70206006)(5660300002)(6666004)(478600001)(6916009)(8936002)(2616005)(8676002)(356005)(81166007)(26005)(82740400003)(2906002)(36860700001)(36756003)(47076005)(426003)(336012)(1076003)(4326008)(40460700003)(83380400001)(2004002)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7662 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT055.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 9004cab6-7fa3-4701-3e2c-08dbb88dffd9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1435SAGMa8ZKLj7ZMcoxjZlYePCjkDub7hIT29jaWhl8y6t9+uMIN4duCDsMlmkNOCrsE2Rsr1fxjFMRvG+p1Ko6N2UN2JiL9pPX7s997mVlSG9sK0LwTSeCd4bE3R9GJ4Y1+n8vlFZEf1RMwJ7z8M7yVufYS0Ba0KEGbKM7dP5C/tjKolsyqITkQpI+yOSjaUCSbyFfdIYUOPz45bH7hmdUbgxfafcSrkfGTWYQgn9AHN//ogR8cpiLV+5ZrP0b/YhJhqLMJx/8iQO2RDM8JZKyHRK/Xvk1PxDc5Q++Lsrth8BBilexbXESLWjUP17ETlEKyP+CsT9C4KZ54ni49GL6U4q0eTh2dZgl+TXfYU+aYZllX5TuAKCSOnqo7wfAXD5Pwi20DUG/Yofg/yC+9o3E2RVnynU5PFObdeZ31kGGt3zPbtPTa/Lr/ZISiM6Tz4JKciW1i1bifHeUDkYRlfkEyxis1Aas6dbJX4M65K0Ii8QBJb8MIKNlQSkz//0gfxfp+kHDfcYMiujKpxGaxjtyvPibmYpSTDALJlaZsp4gZeexSIBfAnNpHIPxzgugY4Nek2kUMFVmReuO8BhpsCbshqqHVAmQWmY9EtTeYEDjF0J5hZgh73VAur/Gva977zgNCK6KWy2G1HPlESH56tPhaeSfH/4qKYVEE+d1ogjnsAmXvCu4lN6S0IUj2BA2ILTP4IzrFhyut5LOx9Y1W2dnFvsCoxHL/UwYUFVZM+RpanAOuqEx1+dD96iMF82V 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)(376002)(346002)(39860400002)(396003)(136003)(451199024)(82310400011)(186009)(1800799009)(36840700001)(40470700004)(46966006)(2906002)(40460700003)(83380400001)(107886003)(1076003)(36756003)(86362001)(7696005)(6666004)(2616005)(478600001)(336012)(426003)(26005)(40480700001)(36860700001)(8676002)(8936002)(4326008)(41300700001)(47076005)(5660300002)(44832011)(6916009)(82740400003)(70586007)(54906003)(316002)(70206006)(81166007)(2004002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 21:27:14.5314 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82c63add-2aa9-4479-26ca-08dbb88e070b 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: AM7EUR03FT055.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9043 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, 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 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: , X-Patchwork-Original-From: Luis Machado via Gdb-patches From: Luis Machado Reply-To: Luis Machado Cc: thiago.bauermann@linaro.org Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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. Reviewed-by: Thiago Jung Bauermann --- 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 9b992a3d8c0..cdfbad4deed 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1561,7 +1561,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 8844fc722cf..9f32279c0ac 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 2739d14a1c4..1dc4206b69c 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -239,7 +239,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 72256f82871..7a7575ac43b 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 2474a000ea3..8b22f1979d6 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