From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30059.outbound.protection.outlook.com [40.107.3.59]) by sourceware.org (Postfix) with ESMTPS id BFA493857C6F for ; Mon, 16 May 2022 09:25:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BFA493857C6F ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=D8mGgNmNvlRVHrMUTwAF1+ye1Ac5YY3ytoq1N9zzrHJ9iWJXUHNCsUVgWycDym+RMzOQ/3BKhZGcNb/+P4xfTQ9LPcg6ETqLxpcT1Cu4ktxa+Q9O8cbmlmi6RkJhMcoO1qnXAbsGqO7R1hih5wp2rHqzT58bwV9ew9sYMG3koo7aZGqFePRqk2SHT+mrAecBcG8P5YJXzRQTN57ropyaDQKVlBsPRq5dbLVY0DyvCpWGv2gY40uG413jKgsig6y5cn9s+oVlIes4cWOOeM3CbDS1vaIo9FLU4HrEkUS7W7nl1uWFKr09JWZCmA1x9+dcJ0m3hCayKG8wJwYcSdRiaA== ARC-Message-Signature: i=2; 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=hdAwmIy7s2G5lz59XIMup1p7pSOfgCuggJIibycpSWo=; b=KS8Zi9JuFgwChqGBYNh2BwGqEo6c6ed1AR6YkxAQYumb6t4Gd0Zcf54I2YnKBsJf/YfgqTPgkECr8Bi3Au5iWb0WNU97Ml8FmFZZkRQjkx5XDu3bZXWohzkEl8vZVwvWwQaOgF672GZhTXZf/XR8GYmpFO4AldEf153hbiw4jz4nWBhTD3CPZck/6+BG7MldUai6qbg835z6yxbzxWrQVljW942Qi053sRFA18EX6EQQZJJsaAwaxhWnuk/Q6hEYlZChyi2XBuNF6iAgY1FawmUQyrsRL4zKVfBV6sWDQ9gcv4cK516rnZ3DoqJ3mxbyeIEftW50wuTA79uIUSWkvA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=temperror (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=temperror action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) Received: from AS9PR06CA0307.eurprd06.prod.outlook.com (2603:10a6:20b:45b::32) by AM8PR08MB5714.eurprd08.prod.outlook.com (2603:10a6:20b:1dd::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Mon, 16 May 2022 09:25:26 +0000 Received: from VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45b:cafe::77) by AS9PR06CA0307.outlook.office365.com (2603:10a6:20b:45b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14 via Frontend Transport; Mon, 16 May 2022 09:25:26 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=temperror action=none header.from=arm.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT025.mail.protection.outlook.com (10.152.18.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 16 May 2022 09:25:25 +0000 Received: ("Tessian outbound 361d68419a2f:v119"); Mon, 16 May 2022 09:25:25 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d16765a1459bc511 X-CR-MTA-TID: 64aa7808 Received: from e4957a45c40d.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A5A183CE-94CE-4E30-BE96-3C6C32B64EB2.1; Mon, 16 May 2022 09:25:18 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e4957a45c40d.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 16 May 2022 09:25:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l3CfsqIeLJFb1uliMqqS2uDeosSfl4i2PrK+lo/V77EI96wV8rbDixHA3QXJ1zuRS71alt+C46ULy0swXQXaRl09AYDZ4JadUfMFIa/1/OJgFjB/cNtIdRZ56mGKFF4O52Fiq6YODwvib0g4Wy+GW+fDrYOSHTdL5l1bkY8/PcCiFYUBkGqsNYgMu9HgSawZESbX08hZmZxOWhuGQG8bUMunR9auUKdLBLIPCtFUzZJUqnlVjK+biSZWDBfoTpWgoOZhBDsthT3uRTLPJXhyFYVaCqPapLarihg0XFIgGahbnNOnkglVc04LykIdqxFX2oXn8I0SsQi7AopyCzRTAg== 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=hdAwmIy7s2G5lz59XIMup1p7pSOfgCuggJIibycpSWo=; b=BOIQOlQIFqmH+krcFJCGHZXcC6jg7Z4nF0JqCss63xxhHJDV5FuFeD9do9qhyCafGwJRSp7wdHwKMzpeFypFWYXfZ6dNG/lH4iKbHSf2KkVJw65QUW9EAcvXW9+cvqa5/VbzEZ6JbKrlc8NFikZyft2ZLR7yzB87c5U+WZkHc816U7aotuVKt85u715y5biOgXvzOySpi0CVgByui0WnAddnEICk67kFC38djqMDhu9wqeGGNgFEQnTR6DaSk2gHen/U/zEo+rNJhjyb6INwnV6jYiFIiaupUSp3YFmxR8tfVw0Im+fPA8At6eHXt45RrboD8zeGnBRqdptUPtjUwA== 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 DU2PR04CA0350.eurprd04.prod.outlook.com (2603:10a6:10:2b4::22) by AM8PR08MB5572.eurprd08.prod.outlook.com (2603:10a6:20b:1db::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Mon, 16 May 2022 09:25:17 +0000 Received: from DBAEUR03FT044.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b4:cafe::3e) by DU2PR04CA0350.outlook.office365.com (2603:10a6:10:2b4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18 via Frontend Transport; Mon, 16 May 2022 09:25:17 +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; Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT044.mail.protection.outlook.com (100.127.142.189) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5250.13 via Frontend Transport; Mon, 16 May 2022 09:25:17 +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.2308.27; Mon, 16 May 2022 09:25:22 +0000 Received: from e129171.cambridge.arm.com (10.2.80.41) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.27 via Frontend Transport; Mon, 16 May 2022 09:25:22 +0000 From: Luis Machado To: Subject: [PATCH] [AArch64] Rename PAUTH_RA_STATE to RA_SIGN_STATE Date: Mon, 16 May 2022 10:25:13 +0100 Message-ID: <20220516092513.85036-1-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 37196898-e385-4976-cf76-08da371e0282 X-MS-TrafficTypeDiagnostic: AM8PR08MB5572:EE_|VE1EUR03FT025:EE_|AM8PR08MB5714:EE_ X-Microsoft-Antispam-PRVS: 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: C9EYmGF6tBt6JDhV3sJURUD6yo/buESqfWnDVS3t7qgkYRNG7C2/6AoBA8t368AcKJALiEuIBmOUkTLlFN6iO/Ckd5yWvKowvpwR5R35I9vq96ORJgRFmFWyWh/dWCLZuZIoeufmR4vG0ahNyHIwx8MdXimmgJfPe3cLknMNhUN3wNbfPMkXxQYldMayxc5xzHexgqoGnjHkW1gp3RWQtqjxwtHP8rlSPa7hk0+uQOwvV1pgihkY8ZL80u42RHsc1xZA+NGB6oxmR5QGLt2b252d0XGTrcDT21r5/J5HJ5PDePINt8CAv/KrQfQSy5u0U2AWTyUW4RnuJsE6wp0ldh2kkU2XXG1jNELSjhiTOb9o7REOuNar1T5xPpm8bap8T/PTNp4OmqyltaqdrOAvOmwcmLBP1ViexIyztMVn4dsXVoc7XFKIcsqUt7G0sMzoRo7eEMCHihQ+KkxR3etHKqAxSnBCOcpKver94zHwLIIyUkUSTrM8iXdC/Z0nzegGIRxKGkVgWhNcSPuYsmL8R2eoKXCCP3jwH25/M5OiYOc+YrA2YFxyVuInnULGtlyRosOHRaNGJLm9TDNqQ3918uLICL4FW3S6aXZohfTxniNdcS/Q2rwc3ytl5Gll7PILLWeBzhKIaH8ofTQ92eBmomUZvbtlHnbiaC1dujhOWIJNb1Lt4tdANKEtrHLaNzAoAUXeohm6S0BtbMmXD3t0HEgKWTf+EkDe7RC+6trNoNf13MxvLa3QuBWNXeIeLVKxKWxzrU+hTyYG7oXSU0z6f4AivyGBLy07VwVIfRYRv3g= 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:(13230001)(4636009)(40470700004)(46966006)(36840700001)(70206006)(81166007)(70586007)(86362001)(26005)(8676002)(6916009)(508600001)(8936002)(7696005)(336012)(356005)(44832011)(1076003)(186003)(5660300002)(966005)(36860700001)(2906002)(6666004)(316002)(2616005)(36756003)(83380400001)(47076005)(426003)(82310400005)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5572 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: bf1a37ca-adbe-4dca-418f-08da371dfd62 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rBVoXKaOpoxn3F2EfYzg6TdCNN1HILEPuZ/eF/lJk3X1gG0mDjB9uhPOYXwyOqoc5+XeIkobbdAxLKpJ3M9NO6lKlGtLP6O0z1IxCnrSPVzZ4/XPEOLj4+ywuPf50oDGhf2zXHwTpUosxpETg9gxFA46eMbb4xQaz6FudjFN6GdrmPaGMnjenSgs3Mk4XqE3/sUnW2yD5YyKkmnPWAFm4CPZGm5/yATLu4QAXsycd1DtykxqizJfod1IzffR6O/FJb2rGBLFXRqW0+dU03+YVx0ltfpZI0x/9pADqMfCXfwJwl7yizTADFPAgTfW27Fa24iC0icAQyuBuyMZLSEwZuSi+nvK5HNINO1V8VUhfew6bom2+vRqeSEvevpzras9H1e9kiSpGGgmuF0oAvF3TcugWbrs2Ih7CLSPXe3YCv/hUpDVRljRCtldal9T0N7hWf3PmMBIOJfQwzyoviMRgos2YM+4t4dPMJ/+4fkd94q41X32DX4VfPr1JPBTYF/3qIzJJAgWnMnsJmrnk68jnkT94fWwWp1t46MEW4FE6Io2qADEhi30E0u+Y5nry+8fBJbuHJMFh7zNUOPtpmyRIvLx4ewHmCkRJWCTr/oR+d/upRiYwrP7+O8XgcDpy0b1nrYuB8DGNxlGt6pK3n4dzv6Y64v3BUZghGq6uNsJeqTWtzbeSG5a/3tV4BUdAlrLZholTkkw7i4cG8uDmcteHLWkJ0uMbX6c+QAJ8sH3oRnbN+1b/5cNvValnHPThVU6 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(5660300002)(63370400001)(63350400001)(86362001)(81166007)(7696005)(6666004)(1076003)(186003)(2616005)(47076005)(83380400001)(2906002)(426003)(316002)(6916009)(508600001)(82310400005)(966005)(36860700001)(44832011)(8936002)(8676002)(70206006)(26005)(40460700003)(336012)(36756003)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 09:25:25.6082 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37196898-e385-4976-cf76-08da371e0282 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: VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5714 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2022 09:25:31 -0000 The aadwarf64 [1] names this register RA_SIGN_STATE, so update the code to use the same name. [1] https://github.com/ARM-software/abi-aa/blob/main/aadwarf64/aadwarf64.rst --- gdb/aarch64-tdep.c | 32 ++++++++++++++++---------------- gdb/aarch64-tdep.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 9d06ebfe27c..d85c406069b 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -253,7 +253,7 @@ aarch64_frame_unmask_lr (aarch64_gdbarch_tdep *tdep, { if (tdep->has_pauth () && frame_unwind_register_unsigned (this_frame, - tdep->pauth_ra_state_regnum)) + tdep->ra_sign_state_regnum)) { int cmask_num = AARCH64_PAUTH_CMASK_REGNUM (tdep->pauth_reg_base); CORE_ADDR cmask = frame_unwind_register_unsigned (this_frame, cmask_num); @@ -529,7 +529,7 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch, if (tdep->has_pauth () && cache != nullptr) { - int regnum = tdep->pauth_ra_state_regnum; + int regnum = tdep->ra_sign_state_regnum; cache->saved_regs[regnum].set_value (ra_state_val); } } @@ -869,7 +869,7 @@ aarch64_analyze_prologue_test (void) if (tdep->has_pauth ()) { - int regnum = tdep->pauth_ra_state_regnum; + int regnum = tdep->ra_sign_state_regnum; SELF_CHECK (cache.saved_regs[regnum].is_value ()); } } @@ -1124,7 +1124,7 @@ aarch64_prologue_prev_register (struct frame_info *this_frame, lr = frame_unwind_register_unsigned (this_frame, AARCH64_LR_REGNUM); if (tdep->has_pauth () - && cache->saved_regs[tdep->pauth_ra_state_regnum].is_value ()) + && cache->saved_regs[tdep->ra_sign_state_regnum].is_value ()) lr = aarch64_frame_unmask_lr (tdep, this_frame, lr); return frame_unwind_got_constant (this_frame, prev_regnum, lr); @@ -1331,7 +1331,7 @@ aarch64_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, /* Init pauth registers. */ if (tdep->has_pauth ()) { - if (regnum == tdep->pauth_ra_state_regnum) + if (regnum == tdep->ra_sign_state_regnum) { /* Initialize RA_STATE to zero. */ reg->how = DWARF2_FRAME_REG_SAVED_VAL_EXP; @@ -1364,10 +1364,10 @@ aarch64_execute_dwarf_cfa_vendor_op (struct gdbarch *gdbarch, gdb_byte op, return true; /* Allocate RA_STATE column if it's not allocated yet. */ - fs->regs.alloc_regs (AARCH64_DWARF_PAUTH_RA_STATE + 1); + fs->regs.alloc_regs (AARCH64_DWARF_RA_SIGN_STATE + 1); /* Toggle the status of RA_STATE between 0 and 1. */ - ra_state = &(fs->regs.reg[AARCH64_DWARF_PAUTH_RA_STATE]); + ra_state = &(fs->regs.reg[AARCH64_DWARF_RA_SIGN_STATE]); ra_state->how = DWARF2_FRAME_REG_SAVED_VAL_EXP; if (ra_state->loc.exp.start == nullptr @@ -2239,8 +2239,8 @@ aarch64_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int reg) if (reg >= AARCH64_DWARF_PAUTH_DMASK && reg <= AARCH64_DWARF_PAUTH_CMASK) return tdep->pauth_reg_base + reg - AARCH64_DWARF_PAUTH_DMASK; - if (reg == AARCH64_DWARF_PAUTH_RA_STATE) - return tdep->pauth_ra_state_regnum; + if (reg == AARCH64_DWARF_RA_SIGN_STATE) + return tdep->ra_sign_state_regnum; } return -1; @@ -2647,7 +2647,7 @@ aarch64_pseudo_register_name (struct gdbarch *gdbarch, int regnum) /* RA_STATE is used for unwinding only. Do not assign it a name - this prevents it from being read by methods such as mi_cmd_trace_frame_collected. */ - if (tdep->has_pauth () && regnum == tdep->pauth_ra_state_regnum) + if (tdep->has_pauth () && regnum == tdep->ra_sign_state_regnum) return ""; internal_error (__FILE__, __LINE__, @@ -2683,7 +2683,7 @@ aarch64_pseudo_register_type (struct gdbarch *gdbarch, int regnum) && p_regnum < AARCH64_SVE_V0_REGNUM + AARCH64_V_REGS_NUM) return aarch64_vnv_type (gdbarch); - if (tdep->has_pauth () && regnum == tdep->pauth_ra_state_regnum) + if (tdep->has_pauth () && regnum == tdep->ra_sign_state_regnum) return builtin_type (gdbarch)->builtin_uint64; internal_error (__FILE__, __LINE__, @@ -2717,7 +2717,7 @@ aarch64_pseudo_register_reggroup_p (struct gdbarch *gdbarch, int regnum, && p_regnum < AARCH64_SVE_V0_REGNUM + AARCH64_V_REGS_NUM) return group == all_reggroup || group == vector_reggroup; /* RA_STATE is used for unwinding only. Do not assign it to any groups. */ - if (tdep->has_pauth () && regnum == tdep->pauth_ra_state_regnum) + if (tdep->has_pauth () && regnum == tdep->ra_sign_state_regnum) return 0; return group == all_reggroup; @@ -3417,7 +3417,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) const struct tdesc_feature *feature_pauth; bool valid_p = true; int i, num_regs = 0, num_pseudo_regs = 0; - int first_pauth_regnum = -1, pauth_ra_state_offset = -1; + int first_pauth_regnum = -1, ra_sign_state_offset = -1; int first_mte_regnum = -1, tls_regnum = -1; /* Use the vector length passed via the target info. Here -1 is used for no @@ -3531,7 +3531,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) if (feature_pauth != NULL) { first_pauth_regnum = num_regs; - pauth_ra_state_offset = num_pseudo_regs; + ra_sign_state_offset = num_pseudo_regs; /* Validate the descriptor provides the mandatory PAUTH registers and allocate their numbers. */ for (i = 0; i < ARRAY_SIZE (aarch64_pauth_register_names); i++) @@ -3572,8 +3572,8 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->jb_elt_size = 8; tdep->vq = vq; tdep->pauth_reg_base = first_pauth_regnum; - tdep->pauth_ra_state_regnum = (feature_pauth == NULL) ? -1 - : pauth_ra_state_offset + num_regs; + tdep->ra_sign_state_regnum = (feature_pauth == NULL) ? -1 + : ra_sign_state_offset + num_regs; tdep->mte_reg_base = first_mte_regnum; tdep->tls_regnum = tls_regnum; diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h index e4cdebb6311..9ca3aee1ed1 100644 --- a/gdb/aarch64-tdep.h +++ b/gdb/aarch64-tdep.h @@ -34,7 +34,7 @@ struct regset; /* AArch64 Dwarf register numbering. */ #define AARCH64_DWARF_X0 0 #define AARCH64_DWARF_SP 31 -#define AARCH64_DWARF_PAUTH_RA_STATE 34 +#define AARCH64_DWARF_RA_SIGN_STATE 34 #define AARCH64_DWARF_PAUTH_DMASK 35 #define AARCH64_DWARF_PAUTH_CMASK 36 #define AARCH64_DWARF_V0 64 @@ -95,7 +95,7 @@ struct aarch64_gdbarch_tdep : gdbarch_tdep } int pauth_reg_base = 0; - int pauth_ra_state_regnum = 0; + int ra_sign_state_regnum = 0; /* Returns true if the target supports pauth. */ bool has_pauth () const -- 2.25.1