From patchwork Thu Nov 10 10:37:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinath Parvathaneni X-Patchwork-Id: 1702105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=DkJg8tui; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N7JGK4mhbz23lT for ; Thu, 10 Nov 2022 21:38:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 72DAF3858C60 for ; Thu, 10 Nov 2022 10:38:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 72DAF3858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668076711; bh=A+bqlxTRNiOqiUoIigep96ujgALoJ7j18vdcQzZfIag=; h=To:CC:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=DkJg8tuitptNNft6lquK2XVc8hJo1rA9OlmGvb1AChOpxBzmt6pHWRc/CL/BbXWJ4 ZSrJ/DFHsY1wJ2RIEPcSsGllWdkxm0dCO1syx2YeJCd/v8GGDaN2zqnRmLct5qRaak fOyYnC73cOBatvCBYAF9DyjmHUfdLeOBklL1ghWg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by sourceware.org (Postfix) with ESMTPS id A03543858D35 for ; Thu, 10 Nov 2022 10:38:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A03543858D35 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=SNkZSj9/KEOQBb7LzjQiFbAKom2VMSAYMHzQlUnIiIU4adDJ3vaDvyiGKPYLmxG49ZvsRPPR89s2E06B7eDiJURFfiCMzEFrumNBej7voq8qRVOot5P8zS8aA9Fm2lGADKMol3pQFFStkqIyzy1Q5rHEgv3vHLZgz/gaC/Fb9YVBhDqfJjttX2KZYcVDfCIbEKug74WuFm+zq0N2xCILqjUod2O8/e+orbNipzeJA7jNPTh5BaIRDH903L0BaYccnKn6egxYhYd0CZCh0l91IMR3ynbtFiKvy0xQE5I12GPePfwI1Io6NL+OOzFzdJyVFH8T9yJ59Vt9wCfUFjb35g== 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=A+bqlxTRNiOqiUoIigep96ujgALoJ7j18vdcQzZfIag=; b=HzOW+cjBMEpDAo7RG+LF4rPNIKlAmv84yTwj6Fwp5GG5206JsdI5SKmbAvEt3YZFCEYoSIZR3OuOYOb7UHWakmdFka0Jy59SiF3k1xjjWVv9iQIxa62Y6lIJMXcDCSWp5qWJnpR0Ds6N3U5fK9+DApjDO08qeq/QAJtCDIMJxjhloA3De1hy66dLvRdzvZd7ANtvBiESG6sC1oqc50wpD6wzACCDha37l4gbxqOggEgGsIDjaHZc8LiLF0vjio8E2z9t4S5c/NSykeBKmnX1G6kJMywyw9UyH13znFM1YQM78JNgmzXGBTyevHEX60aBKqPAUVY1ppIBQANOQxjMfw== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) 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 DU2PR04CA0266.eurprd04.prod.outlook.com (2603:10a6:10:28e::31) by AS8PR08MB7356.eurprd08.prod.outlook.com (2603:10a6:20b:447::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.11; Thu, 10 Nov 2022 10:38:02 +0000 Received: from DBAEUR03FT006.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:28e:cafe::b3) by DU2PR04CA0266.outlook.office365.com (2603:10a6:10:28e::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Thu, 10 Nov 2022 10:38:02 +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 DBAEUR03FT006.mail.protection.outlook.com (100.127.142.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Thu, 10 Nov 2022 10:38:02 +0000 Received: ("Tessian outbound 2ff13c8f2c05:v130"); Thu, 10 Nov 2022 10:38:02 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0ff9eddfd2dbe5bf X-CR-MTA-TID: 64aa7808 Received: from 007f1274e755.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id CC885946-A710-447B-9B8E-B890A582F4F8.1; Thu, 10 Nov 2022 10:37:55 +0000 Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 007f1274e755.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 10 Nov 2022 10:37:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SdXcEjSbG9yN1eey/SGt8D0a/InDASL6WBdgxC3Qo6PndOcEtFl5I7BHrDZ4QU1ETb1l42fHRo1lHe8RrIl1ZFtN3Kw3vv+j2Z0YzPuPqttyuFloDVBcl+/h24VhmPPysf0d2xCwOhEwIMFwJzuddszrmsTJh5nXdyh2XC8cDIpjsuL+WIveE7mv03aDGv7Q3J8E6rSgc2nFAXuLPktAN1pUuFAfEkyxvxT5o7R8NlaWnq6mBZ4KBQb9coSjTIio/LRCwnim85GTMATnf0JA0YC9yIg0wcsBiOtQ/4wjWhKnoaM0mKiQfaPxXu9Vz4g+M/2RURZrSy74gB802fIQrQ== 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=A+bqlxTRNiOqiUoIigep96ujgALoJ7j18vdcQzZfIag=; b=D+3OOWUkXUVcC1rbyA/U1gDa4bksj+WnzaOeUIlYvmiF8KmiVVc/jGxFrtFlWJRCM0SDL1+bEou7pPqiNY9kkmA3C+cuGaeYFoX0sreU7vvYeXut2qvPiy8/SVJSkSu0xxhJ2yTYopu3zjBhJQYs5s4/YyeTAiRwdpWPeEnlA4JYjS/OFSWKJSi6p9g+Z5CxHsu/zY9Pm3Q59FolBibX/Y3P88XlhwvxIT02HTcHIg6OOftYETw1Xn2mRYJ+QxqCa58H9gStLr7Kx7ZwUkZBCGTB3mFQr+LKECncGhLQ/QVkh1lxdIEHoMctlvSU0kemptt8BaEtNZ+Vj2jCLLngSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=gcc.gnu.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 AM6PR0502CA0042.eurprd05.prod.outlook.com (2603:10a6:20b:56::19) by DB3PR08MB8961.eurprd08.prod.outlook.com (2603:10a6:10:428::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.11; Thu, 10 Nov 2022 10:37:52 +0000 Received: from AM7EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:56:cafe::69) by AM6PR0502CA0042.outlook.office365.com (2603:10a6:20b:56::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Thu, 10 Nov 2022 10:37:52 +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 AM7EUR03FT003.mail.protection.outlook.com (100.127.140.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5813.12 via Frontend Transport; Thu, 10 Nov 2022 10:37:52 +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.12; Thu, 10 Nov 2022 10:37:50 +0000 Received: from e120703.arm.com (10.2.81.20) by mail.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.12 via Frontend Transport; Thu, 10 Nov 2022 10:37:50 +0000 MIME-Version: 1.0 To: CC: , Subject: [PATCH][GCC] arm: Add support for new frame unwinding instruction "0xb5". Date: Thu, 10 Nov 2022 10:37:50 +0000 Message-ID: X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT003:EE_|DB3PR08MB8961:EE_|DBAEUR03FT006:EE_|AS8PR08MB7356:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f0751bb-3bc5-4205-efbb-08dac307a4ad 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: 1T6YXMKO4kLcuwB+HW7kPte7wyFGUrTdTaijQ4TD7uKG26KBlUTXyb9dJFyCnYv0KS/gVcKFRUZ0yzfxGOHLfjOfZ/0si8dZCBz7PIwQY642B3ZXkRKAnQhvEmO2oZVhjMtAi146CLSIpcI1vfYF1ZVsqS1bTiv3Tqu0g/elcWjnh3koD8kbNtDKhkhTJx+ztMsljH0Bd+G6tDfTzT8dN04efOSj1lvsQRBFxsgkJk+9pf1TfhF9jTZv27eLzk0s64GV4GZWLOku3xs25zSP0UAwAz2DoEhjgNA5Lpr5Eh0LRhglJ07hfW37JXIY1Im0GSq4+xm1F9nF0lPJJQO7+nOwHtnq439A6DpEpnhGVr0qrQvVPeJgompmbyuEl2GmWwtgT4+Gx67wpcbV37WgARJTNUuj5AYulkEnCLn+JH94S67dVRHteY+pZOBJsbSGocaaCFz2NY6gykFE5CgEEw7MjFn5Bh4eht4UpZ6AqgN3F8ori156d1BZ3rj1n7WaMW+peAlBbQu2US5PUPQaw1RTuEwmm0Qb6RUnfgQte2I/C9FNNQKCK6SAK7pVojpnGsZeLVZ6/O7WtRo85ULHwNmwWnRBUtngczQebkqnru5bOYIQLom0Un0Wb4YV5ByFtTRWjdDfu/QkfTfh4Pn3kXFmuiBfmdu7jwFiywoPZZMPN3Q1/8THljpoMG0oREtXNZeUj9qJXcwyDBPMY+m+CGfzOAfUgoH7AFob1D/k/xQg2vcAK1bGtKiw1n+pZj7vF4DjfP755ERNghkyB/cE3o6ukfzqoR9L0rj8aNDfwB24UgPpoGx7aBmAwF//qNlwFIEcykTQ1kz0nk/o4Lj0cg== 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:(13230022)(4636009)(39860400002)(346002)(396003)(376002)(136003)(451199015)(40470700004)(46966006)(36840700001)(44832011)(235185007)(4326008)(426003)(5660300002)(8936002)(70206006)(54906003)(8676002)(316002)(6916009)(40480700001)(41300700001)(2906002)(81166007)(966005)(356005)(83380400001)(31696002)(82740400003)(336012)(86362001)(26005)(186003)(31686004)(36860700001)(33964004)(47076005)(478600001)(70586007)(82310400005)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR08MB8961 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 412a97b2-bebc-40b1-dc05-08dac3079f0d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v2BOd1sDpI2qRNSRXIssotgEiFtUSJQ+ZTSEel2jtnaWVcGO4bG+/2QkR4bXy1a8mFomcrDmEhJq71YAsBOCgtG/ymGQKn+SVbPfItFF68IiDn2IfrK0VBvILGOE3AwQ4gUF/hI6tY5uZDrk4bW+PxnPZ/xedC9k4okCpNmAY8DA21jG6PHnl6LZ/zca9g5i2ASRXsWRX7d/HMnhkV9JCXBe7FsZD4IqI2QvyryfT5kPG8EFF8mbiMMfVWOzDpj24wSkdKgooAvERZk30onBC/65WhJ+dC664No4bBTCfUVcyBwWk0zh1FUWYAfDlwoYmmfqG0TVZMBcQrlafamWrNtcAB2QwpnKeOtLMvkjS2xyl2TtpoZmJldzQHCb3pYbdt9WfdQMteNHTyu1SVXT4EF0qLxvqA2iW8ppkUvrjgBEWNKSP8Gv5wtuuV9ubjEN6ClozXrImdsQjmMu0gmI510c5bNpacunwMwb00NMp/roc/g0EVkvg4SDQxfxyJ4V7W4GzNy6tITUyzsd7afCNW23L0jW8L6RAVcmW9a0Gd4k9GJIi67gCpKykjbPb7BO6o4uX1CWJhhOaOhWSLEcez4EVmZIBeGdPYJAJGssX2mw53BhlyV/pDVLgT+p6VcWOmOu62RzBSK9Hz4pW8EfCRsu4ifTAh5y4sq1W53w6889V4+xSo1+VtxqBQsmXeangmHc543TL1BCqjzYNVLRPiT0usc/hLbCkoPz8iHrHUaqvHi48kifV1QUmJ9AYbXeIuPfc8s9yzjkUNmlvIQlKgTwfcJKL8WqUKMACOrBf1GO4NHjGR6SZKBxgr6aEitf 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:(13230022)(4636009)(39860400002)(136003)(346002)(396003)(376002)(451199015)(40470700004)(46966006)(36840700001)(81166007)(478600001)(47076005)(40460700003)(70206006)(6916009)(31696002)(40480700001)(82740400003)(44832011)(2906002)(33964004)(4326008)(70586007)(316002)(8936002)(235185007)(8676002)(5660300002)(41300700001)(82310400005)(54906003)(26005)(36860700001)(86362001)(336012)(966005)(83380400001)(186003)(426003)(31686004); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2022 10:38:02.1396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f0751bb-3bc5-4205-efbb-08dac307a4ad 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: DBAEUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7356 X-Spam-Status: No, score=-13.1 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Srinath Parvathaneni via Gcc-patches From: Srinath Parvathaneni Reply-To: Srinath Parvathaneni Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi, This patch adds support for Arm frame unwinding instruction "0xb5" [1]. When an exception is taken and "0xb5" instruction is encounter during runtime stack-unwinding, we use effective vsp as modifier in pointer authentication. On completion of stack unwinding if "0xb5" instruction is not encountered then CFA will be used as modifier in pointer authentication. [1] https://github.com/ARM-software/abi-aa/releases/download/2022Q3/ehabi32.pdf Regression tested on arm-none-eabi target and found no regressions. Ok for master? Regards, Srinath. gcc/ChangeLog: 2022-11-09 Srinath Parvathaneni * libgcc/config/arm/pr-support.c (__gnu_unwind_execute): Decode opcode "0xb5". ############### Attachment also inlined for ease of reply ############### diff --git a/libgcc/config/arm/pr-support.c b/libgcc/config/arm/pr-support.c index e48854587c667a959aa66ccc4982231f63333ecc..73e4942a39b34a83c2da85def6b13e82ec501552 100644 --- a/libgcc/config/arm/pr-support.c +++ b/libgcc/config/arm/pr-support.c @@ -107,7 +107,9 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws) _uw op; int set_pc; int set_pac = 0; + int set_pac_sp = 0; _uw reg; + _uw sp; set_pc = 0; for (;;) @@ -124,10 +126,11 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws) #if defined(TARGET_HAVE_PACBTI) if (set_pac) { - _uw sp; _uw lr; _uw pac; - _Unwind_VRS_Get (context, _UVRSC_CORE, R_SP, _UVRSD_UINT32, &sp); + if (!set_pac_sp) + _Unwind_VRS_Get (context, _UVRSC_CORE, R_SP, _UVRSD_UINT32, + &sp); _Unwind_VRS_Get (context, _UVRSC_CORE, R_LR, _UVRSD_UINT32, &lr); _Unwind_VRS_Get (context, _UVRSC_PAC, R_IP, _UVRSD_UINT32, &pac); @@ -259,7 +262,19 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws) continue; } - if ((op & 0xfc) == 0xb4) /* Obsolete FPA. */ + /* Use current VSP as modifier in PAC validation. */ + if (op == 0xb5) + { + if (set_pac) + _Unwind_VRS_Get (context, _UVRSC_CORE, R_SP, _UVRSD_UINT32, + &sp); + else + return _URC_FAILURE; + set_pac_sp = 1; + continue; + } + + if ((op & 0xfd) == 0xb6) /* Obsolete FPA. */ return _URC_FAILURE; /* op & 0xf8 == 0xb8. */ diff --git a/libgcc/config/arm/pr-support.c b/libgcc/config/arm/pr-support.c index e48854587c667a959aa66ccc4982231f63333ecc..73e4942a39b34a83c2da85def6b13e82ec501552 100644 --- a/libgcc/config/arm/pr-support.c +++ b/libgcc/config/arm/pr-support.c @@ -107,7 +107,9 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws) _uw op; int set_pc; int set_pac = 0; + int set_pac_sp = 0; _uw reg; + _uw sp; set_pc = 0; for (;;) @@ -124,10 +126,11 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws) #if defined(TARGET_HAVE_PACBTI) if (set_pac) { - _uw sp; _uw lr; _uw pac; - _Unwind_VRS_Get (context, _UVRSC_CORE, R_SP, _UVRSD_UINT32, &sp); + if (!set_pac_sp) + _Unwind_VRS_Get (context, _UVRSC_CORE, R_SP, _UVRSD_UINT32, + &sp); _Unwind_VRS_Get (context, _UVRSC_CORE, R_LR, _UVRSD_UINT32, &lr); _Unwind_VRS_Get (context, _UVRSC_PAC, R_IP, _UVRSD_UINT32, &pac); @@ -259,7 +262,19 @@ __gnu_unwind_execute (_Unwind_Context * context, __gnu_unwind_state * uws) continue; } - if ((op & 0xfc) == 0xb4) /* Obsolete FPA. */ + /* Use current VSP as modifier in PAC validation. */ + if (op == 0xb5) + { + if (set_pac) + _Unwind_VRS_Get (context, _UVRSC_CORE, R_SP, _UVRSD_UINT32, + &sp); + else + return _URC_FAILURE; + set_pac_sp = 1; + continue; + } + + if ((op & 0xfd) == 0xb6) /* Obsolete FPA. */ return _URC_FAILURE; /* op & 0xf8 == 0xb8. */