From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2083.outbound.protection.outlook.com [40.107.21.83]) by sourceware.org (Postfix) with ESMTPS id 0198B3857736 for ; Mon, 18 Sep 2023 21:27:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0198B3857736 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=NMYaSnFumKM6bUKjXIriBsbwoQNovqZrQJXB+MXxO0A=; b=i20XIZbFv11tkuyQTfHQK57vBFZl2bj+s3KhP7IH24/knlQ3YCnpu/qTXPN1fsrOs7xjr7r9WdsZCz6ykGYvi6JAxAPICIk9rLi4p8nA3RNUTwtlcQj5uznnb3wKbI1w3j3QVo+sRjL60vsjcsLoAVo5JwmTbhs8g/dDeEtgjSs= Received: from AM6PR10CA0012.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::25) by AS4PR08MB7577.eurprd08.prod.outlook.com (2603:10a6:20b:4fc::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep 2023 21:27:17 +0000 Received: from AM7EUR03FT047.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:89:cafe::25) by AM6PR10CA0012.outlook.office365.com (2603:10a6:209:89::25) 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:17 +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 AM7EUR03FT047.mail.protection.outlook.com (100.127.140.69) 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:16 +0000 Received: ("Tessian outbound 1eb4e931b055:v175"); Mon, 18 Sep 2023 21:27:16 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 01962679db6585db X-CR-MTA-TID: 64aa7808 Received: from 59732eeb41c9.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 832E5003-2DFE-453D-8119-ABF04ACB5837.1; Mon, 18 Sep 2023 21:27:09 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 59732eeb41c9.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Sep 2023 21:27:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CTm4uSbkIbPXKogmFlrcbJs0sEDSa9mmlBwlPvE5u+RXzOQ+h3pK9r/bPF987sxa14WMOWzuPNAoj9/XCm2I5yibbK7EkvRVu5YEfjkkegksDNkJrXgjkJ6RI9mtmCasYzWtBjoC+M0ymbxZ3yLLcW2gtF6AJDQQh1pcU4bJ9UmqNqOlhX7J2JemMmlqXP6Y9Dx3aezO+aaJeOyOu3ZS62Y6ntCWZLsaPOmd/lORGhpABgoJQhNlAl8QJhqjKiB2jXSPXmK9SD+gzqmPSuaQPUEmuyPREs/nkWW3PpxeEQkDzdAeXWUxvoxjkLW+UEwNmTEiGmGIM1+skY0zZWPYLw== 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=NMYaSnFumKM6bUKjXIriBsbwoQNovqZrQJXB+MXxO0A=; b=hexVGgaxEvbV3LcWcv+LvgD3bW5YNyMik6KfaUY75mjPWrSgsWx62QBx/7oa7Y9kSsVzLAnrDyrRKT1WQ7mAHlUYCdIiyOqJFpfX4Gg/Kz8Ksyx1NGGSIOunDdVCaMOhGxzH0oUh/SpPGAVjI0UDpAPiWG3F/7+bR6FDROy7WZEE0WPJTADrwbnVg6FvNypn7+/r5EIqYBfE2RB1fiX8hOV1ANPdsx5mC9V/sT/OCF7bTvyLRJCfkKketaGroGNrZOXE0sPOjSaXRX+owDxeR2MuGWYK+sYS6qrmCj7LBN+Xoa5Jc/J2l8Yz2mKEWAzFZ9mGCHuNKxnUebsHbHOq5w== 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=NMYaSnFumKM6bUKjXIriBsbwoQNovqZrQJXB+MXxO0A=; b=i20XIZbFv11tkuyQTfHQK57vBFZl2bj+s3KhP7IH24/knlQ3YCnpu/qTXPN1fsrOs7xjr7r9WdsZCz6ykGYvi6JAxAPICIk9rLi4p8nA3RNUTwtlcQj5uznnb3wKbI1w3j3QVo+sRjL60vsjcsLoAVo5JwmTbhs8g/dDeEtgjSs= Received: from AM6P193CA0127.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::32) by VI1PR08MB10032.eurprd08.prod.outlook.com (2603:10a6:800:1cc::6) 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:06 +0000 Received: from AM7EUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:85:cafe::6e) by AM6P193CA0127.outlook.office365.com (2603:10a6:209:85::32) 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:05 +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 AM7EUR03FT009.mail.protection.outlook.com (100.127.140.130) 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:05 +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; Mon, 18 Sep 2023 21:27:05 +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; Mon, 18 Sep 2023 21:27:05 +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:05 +0000 From: Luis Machado To: CC: , Subject: [PATCH v7 10/18] [gdb/aarch64] sme: Signal frame support Date: Mon, 18 Sep 2023 22:26:43 +0100 Message-ID: <20230918212651.660141-11-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT009:EE_|VI1PR08MB10032:EE_|AM7EUR03FT047:EE_|AS4PR08MB7577:EE_ X-MS-Office365-Filtering-Correlation-Id: bf941e4c-6aee-45aa-13d0-08dbb88e0870 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: sX3PV9xgeMqdCHFzpSwpbiuedxt/sCEPNDbKuWiMlEMi3Bki6+OCCFmId0EaFaJM3/ejUtVFuT3Ytc10Ur4Evbbo3qkRIBrLwms5CLxWCRGJTtIZpMtKJzJJjfg0F821kVpDQYVjwIpmj/G8mYZC/703eMadsOQQOnhwIDSLWSVKJVoNwBLgcY8eWbRuLB6zlMfD0LJLmOSGFyuCNCAw4g0YpbDnSCRnQ1Oa904EK9SdrTPz0l841flb1qprJ29XuE8+ZhlLsaTeej7RQmiq87BumD2L+Kj+LmQAApaEehkl18Ry4J1e+yi5+cv/K+HX/sGkoJ5ovFlmBhh6re9EDdz4mhxvHhDqBFBkYbyhChUYduKk+jPcZrCjmXIjHBMjtbp2QAygQGRUni4JQ7zklDxkuodcN86Cw9Wux7CujbmEQrVQ6RVioyjJIuZjaedSjlULngw9rkMkOi+oeo+GLC7sXHxatBHm/bdmbzMXkZtuJjySSOS0Mhiyz+Apc0boHtsW/oiPbwGpJH7dLyYEWms8bThh7ui6wMwhBfqkRLsoqcBRl6fUZNE6etqcasc0BXgETYtTS3wGAyllCOInHOtS5gAOSrdEQYViw5liEAXPsAkKxEeiFP9LB0pJaBdJpbOStOLbBUwWLKcuemf/iYkEPxtjDHSysb88IQUEfq2Z+CR315v/UOGNB9nAbqViOkAoJy48fd8/BRq1o6ylBXtG4XRCZHZCRMC132T2szygAZa1SLdcFgU60wA9wFcM 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)(396003)(376002)(346002)(136003)(39850400004)(82310400011)(186009)(1800799009)(451199024)(36840700001)(46966006)(81166007)(86362001)(36756003)(82740400003)(40480700001)(356005)(6916009)(7696005)(44832011)(70586007)(4326008)(70206006)(316002)(8936002)(41300700001)(6666004)(2906002)(478600001)(1076003)(83380400001)(426003)(8676002)(5660300002)(47076005)(36860700001)(54906003)(26005)(336012)(2616005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB10032 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6a18eb70-fba3-447b-938d-08dbb88e01e2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NCgJbae+jdRurAX8VAMsT7Ae+ZmN5o/isSQjVcJlT0YsYMorueWBviju/b3JBbf9sRQf0W8GdoUOb3JOjjsjgaJ0Qoopdaz1UGppiNhz1rmmaFLr2FbGwnQEzCtwuOB+YE3zpuWolOoV3PPssoEBjxWBWKyEjJQqDQiGGPZ2kLU7P5rg9/pmVN6ZIsjU/R8C9VIyJCpdJ+A1EEoXefinFRiR9yUaS3/xuxH3M/rBt+auoL98as1d8zWC67RgkM1Dj9vghsz/RxbcSDVz6kqfJued4sgU2CtDG1XPdAf6W7bjuqM4qOiClI+9wiDNIy6PpYt2++DWkGFlIQmE1NuzJIl9+kOw9V3iLxL0qkF7gGhOvkLI3i/2epGaUSyg8BkTrHghX/KC1/UDzez5TMb+4zQuywh48vamMkdK23eE4z2JISkj6BQf7F9zmXej9be3aiGCMPPYD1uzL24ryPWFPCIjhICspHmnccE56gMABxi26+YSsv5iRvGWvizK/a6H8oNMaE4fCRCQbNdgIbzxoEHomEAy3GBUX0DF9aozaRvjhYcI8b6FgLvbgXQTC2L4EEqm+N0kjMiO/Jv5ELHtf6BfYXAdgZ+UkJABiTfrRoSHEIeFzSy+EaKpuQkV4wqP90PCa9swo3oDs64IvL0zih/GfdqIotgSlTulPHAtqUWg5ZmYA0CNe6JdAoi1qBagguMwTsbGYsAoM+7DpgpRd2AkcC3sb4xws0GltqEkciUXTIafrRgAYqXl8fAfV14Q 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)(346002)(136003)(396003)(376002)(39860400002)(451199024)(186009)(82310400011)(1800799009)(46966006)(40470700004)(36840700001)(40460700003)(86362001)(47076005)(83380400001)(81166007)(82740400003)(36860700001)(36756003)(107886003)(2616005)(26005)(1076003)(426003)(336012)(6916009)(7696005)(6666004)(316002)(54906003)(478600001)(70586007)(70206006)(5660300002)(2906002)(4326008)(40480700001)(41300700001)(8676002)(8936002)(44832011);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 21:27:16.8861 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf941e4c-6aee-45aa-13d0-08dbb88e0870 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: AM7EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7577 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: Teach gdb about the ZA/SSVE state on signal frames and how to restore the contents of the registers. There is a new ZA_MAGIC context that the Linux Kernel uses to communicate the ZA register state to gdb. The SVE_MAGIC context has also been adjusted to contain a flag indicating whether it is a SVE or SSVE state. Regression-tested on aarch64-linux Ubuntu 22.04/20.04. Reviewed-by: Thiago Jung Bauermann --- gdb/aarch64-linux-tdep.c | 88 +++++++++++++++++++-- gdb/nat/aarch64-scalable-linux-sigcontext.h | 5 +- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index bdd5cb05c10..f76d1888072 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -48,6 +48,7 @@ #include "linux-record.h" #include "arch/aarch64-mte-linux.h" +#include "arch/aarch64-scalable-linux.h" #include "arch-utils.h" #include "value.h" @@ -152,6 +153,7 @@ #define AARCH64_EXTRA_MAGIC 0x45585401 #define AARCH64_FPSIMD_MAGIC 0x46508001 #define AARCH64_SVE_MAGIC 0x53564501 +#define AARCH64_ZA_MAGIC 0x54366345 /* Defines for the extra_context that follows an AARCH64_EXTRA_MAGIC. */ #define AARCH64_EXTRA_DATAP_OFFSET 8 @@ -164,13 +166,23 @@ /* Defines for the sve structure that follows an AARCH64_SVE_MAGIC. */ #define AARCH64_SVE_CONTEXT_VL_OFFSET 8 +#define AARCH64_SVE_CONTEXT_FLAGS_OFFSET 10 #define AARCH64_SVE_CONTEXT_REGS_OFFSET 16 #define AARCH64_SVE_CONTEXT_P_REGS_OFFSET(vq) (32 * vq * 16) #define AARCH64_SVE_CONTEXT_FFR_OFFSET(vq) \ (AARCH64_SVE_CONTEXT_P_REGS_OFFSET (vq) + (16 * vq * 2)) #define AARCH64_SVE_CONTEXT_SIZE(vq) \ (AARCH64_SVE_CONTEXT_FFR_OFFSET (vq) + (vq * 2)) +/* Flag indicating the SVE Context describes streaming mode. */ +#define SVE_SIG_FLAG_SM 0x1 +/* SME constants. */ +#define AARCH64_SME_CONTEXT_SVL_OFFSET 8 +#define AARCH64_SME_CONTEXT_REGS_OFFSET 16 +#define AARCH64_SME_CONTEXT_ZA_SIZE(svq) \ + ((sve_vl_from_vq (svq) * sve_vl_from_vq (svq))) +#define AARCH64_SME_CONTEXT_SIZE(svq) \ + (AARCH64_SME_CONTEXT_REGS_OFFSET + AARCH64_SME_CONTEXT_ZA_SIZE (svq)) /* Read an aarch64_ctx, returning the magic value, and setting *SIZE to the size, or return 0 on error. */ @@ -324,7 +336,10 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, CORE_ADDR section_end = section + AARCH64_SIGCONTEXT_RESERVED_SIZE; CORE_ADDR fpsimd = 0; CORE_ADDR sve_regs = 0; + CORE_ADDR za_state = 0; + uint64_t svcr = 0; uint32_t size, magic; + size_t vq = 0, svq = 0; bool extra_found = false; int num_regs = gdbarch_num_regs (gdbarch); @@ -360,7 +375,7 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, /* Check if the section is followed by a full SVE dump, and set sve_regs if it is. */ gdb_byte buf[4]; - uint16_t vq; + uint16_t flags; if (!tdep->has_sve ()) break; @@ -373,9 +388,23 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, } vq = sve_vq_from_vl (extract_unsigned_integer (buf, 2, byte_order)); - if (vq != tdep->vq) - error (_("Invalid vector length in signal frame %d vs %s."), vq, - pulongest (tdep->vq)); + /* If SME is supported, also read the flags field. It may + indicate if this SVE context is for streaming mode (SSVE). */ + if (tdep->has_sme ()) + { + if (target_read_memory (section + + AARCH64_SVE_CONTEXT_FLAGS_OFFSET, + buf, 2) != 0) + { + section += size; + break; + } + flags = extract_unsigned_integer (buf, 2, byte_order); + + /* Is this SSVE data? If so, enable the SM bit in SVCR. */ + if (flags & SVE_SIG_FLAG_SM) + svcr |= SVCR_SM_BIT; + } if (size >= AARCH64_SVE_CONTEXT_SIZE (vq)) sve_regs = section + AARCH64_SVE_CONTEXT_REGS_OFFSET; @@ -384,6 +413,38 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, break; } + case AARCH64_ZA_MAGIC: + { + if (!tdep->has_sme ()) + { + section += size; + break; + } + + /* Check if the section is followed by a full ZA dump, and set + za_state if it is. */ + gdb_byte buf[2]; + + if (target_read_memory (section + AARCH64_SME_CONTEXT_SVL_OFFSET, + buf, 2) != 0) + { + section += size; + break; + } + svq = sve_vq_from_vl (extract_unsigned_integer (buf, 2, + byte_order)); + + if (size >= AARCH64_SME_CONTEXT_SIZE (svq)) + { + za_state = section + AARCH64_SME_CONTEXT_REGS_OFFSET; + /* We have ZA data. Enable the ZA bit in SVCR. */ + svcr |= SVCR_ZA_BIT; + } + + section += size; + break; + } + case AARCH64_EXTRA_MAGIC: { /* Extra is always the last valid section in reserved and points to @@ -422,7 +483,7 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, for (int i = 0; i < 32; i++) { - offset = sve_regs + (i * tdep->vq * 16); + offset = sve_regs + (i * vq * 16); trad_frame_set_reg_addr (this_cache, AARCH64_SVE_Z0_REGNUM + i, offset); trad_frame_set_reg_addr (this_cache, @@ -440,12 +501,12 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, offset); } - offset = sve_regs + AARCH64_SVE_CONTEXT_P_REGS_OFFSET (tdep->vq); + offset = sve_regs + AARCH64_SVE_CONTEXT_P_REGS_OFFSET (vq); for (int i = 0; i < 16; i++) trad_frame_set_reg_addr (this_cache, AARCH64_SVE_P0_REGNUM + i, - offset + (i * tdep->vq * 2)); + offset + (i * vq * 2)); - offset = sve_regs + AARCH64_SVE_CONTEXT_FFR_OFFSET (tdep->vq); + offset = sve_regs + AARCH64_SVE_CONTEXT_FFR_OFFSET (vq); trad_frame_set_reg_addr (this_cache, AARCH64_SVE_FFR_REGNUM, offset); } @@ -461,6 +522,17 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, aarch64_linux_restore_vregs (gdbarch, this_cache, fpsimd); } + if (za_state != 0) + { + /* Restore the ZA state. */ + trad_frame_set_reg_addr (this_cache, tdep->sme_za_regnum, + za_state); + } + + /* If SME is supported, set SVCR as well. */ + if (tdep->has_sme ()) + trad_frame_set_reg_value (this_cache, tdep->sme_svcr_regnum, svcr); + trad_frame_set_id (this_cache, frame_id_build (sp, func)); } diff --git a/gdb/nat/aarch64-scalable-linux-sigcontext.h b/gdb/nat/aarch64-scalable-linux-sigcontext.h index 74407bd266a..18623443744 100644 --- a/gdb/nat/aarch64-scalable-linux-sigcontext.h +++ b/gdb/nat/aarch64-scalable-linux-sigcontext.h @@ -30,7 +30,10 @@ struct sve_context { struct _aarch64_ctx head; __u16 vl; - __u16 __reserved[3]; + /* Holds flags. This field was defined for SME support. Prior to it, + this used to be a reserved 16-bit value. */ + __u16 flags; + __u16 __reserved[2]; }; /* -- 2.25.1