From patchwork Fri Nov 12 18:02:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinath Parvathaneni X-Patchwork-Id: 47560 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 A6F923858430 for ; Fri, 12 Nov 2021 18:04:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6F923858430 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636740278; bh=uEVrpDqw0tI6rf+GqOH4FT7kPC7euU1ihCiKuA63Czk=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=LyoGcrtveh9TFywoqd5tZGAIBN+QfXmVKS5WyL0NTp4b/1tXhgsg4RRheDs6fBApu iCLN5sJXu955pKadDxgncjoJ8k5BJIcAJaCqClJ2+9da86UizxUle03pwZK6B469WJ Sq3IFfGaWqMfpQhKEdSMgAYr4nZv6cj6C/NSfVro= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60064.outbound.protection.outlook.com [40.107.6.64]) by sourceware.org (Postfix) with ESMTPS id 01340385840B for ; Fri, 12 Nov 2021 18:04:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 01340385840B Received: from AS9PR06CA0135.eurprd06.prod.outlook.com (2603:10a6:20b:467::22) by DB6PR08MB2664.eurprd08.prod.outlook.com (2603:10a6:6:20::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.22; Fri, 12 Nov 2021 18:04:00 +0000 Received: from VE1EUR03FT031.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:467:cafe::f2) by AS9PR06CA0135.outlook.office365.com (2603:10a6:20b:467::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.18 via Frontend Transport; Fri, 12 Nov 2021 18:04:00 +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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT031.mail.protection.outlook.com (10.152.18.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.20 via Frontend Transport; Fri, 12 Nov 2021 18:04:00 +0000 Received: ("Tessian outbound f7440cb8a4c6:v109"); Fri, 12 Nov 2021 18:04:00 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8cf924bf6b9371e5 X-CR-MTA-TID: 64aa7808 Received: from cc17e88f125a.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 63732B2A-5EC7-467D-91E2-9624F2EFCA23.1; Fri, 12 Nov 2021 18:03:52 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id cc17e88f125a.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Nov 2021 18:03:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iFEtw6911U+51Sv5+mr95q9wJBH7gCawzZ0sJ+0mX2fiX9QlkXlfv/r/vcjYGbFLcz2psJGgb75Q5xe0fKBw+kTk2p3wHRy6VE/2jG+gzwlxzSDcrAjdhOjdM0ttnouacYyDAQqS66Io4u9W/zETjF2DADZRXW9U5y4FA+i8PCVFqFpvtaUdeblMDhQWe130p+tm9qBKawhdI5xJy8gaIC3UlU8vg9OHDSE8cURnYSJoKyNkbtiZiI4vTLfD6CzCn8atDdh7sMwPgUmH0AFifLtuO7BITPJ03yXb13cTe0ZXDOWYke6hJUwJ0ZarQZ4KoGiVuYKPgDN646OTyNAZDQ== 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=uEVrpDqw0tI6rf+GqOH4FT7kPC7euU1ihCiKuA63Czk=; b=LFl8f3YmCakZU+OMF7Gm6tgiNHz48xEPz7MSJzKMPuYyE3kyY4YH9upbQAVxc4yN1yqoqpARwa0vAynBHfv/iXvH34ES+oA1XfWsOSUqeSYUmS1UiNpirNwFRT2jO2lHhQxFC8QqWzh+ZvK7y1Q+hamtxO9zDuqTqFthR3mCxJ122FQcTpTAGBZ9b7pvbDQNV3v8GMooJbcz9WF4l2KVZCuZWJgo78CW6AKdz71pr++criz2ZkrNeWwFQYZ0ZxN3EY89JEu78aKOzyXdFq+fXiRGYIpOXKU6oE//TCY24FDTgKIj3iMVngT/c8Rx/f1rCR+tAqS4UxnWNTeubqSsXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VE1PR08MB4893.eurprd08.prod.outlook.com (2603:10a6:802:aa::13) by VI1PR08MB4368.eurprd08.prod.outlook.com (2603:10a6:803:fe::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.22; Fri, 12 Nov 2021 18:03:49 +0000 Received: from VE1PR08MB4893.eurprd08.prod.outlook.com ([fe80::b5b1:c314:715e:db3f]) by VE1PR08MB4893.eurprd08.prod.outlook.com ([fe80::b5b1:c314:715e:db3f%6]) with mapi id 15.20.4669.016; Fri, 12 Nov 2021 18:03:49 +0000 Date: Fri, 12 Nov 2021 18:02:53 +0000 To: gcc-patches@gcc.gnu.org Subject: [PATCH v2][GCC] arm: Add support for dwarf debug directives and pseudo hard-register for PAC feature. X-ClientProxiedBy: LO2P265CA0061.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::25) To VE1PR08MB4893.eurprd08.prod.outlook.com (2603:10a6:802:aa::13) Message-ID: MIME-Version: 1.0 Received: from e120703-lin.cambridge.arm.com (217.140.106.53) by LO2P265CA0061.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Fri, 12 Nov 2021 18:03:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1514901b-946e-453e-31bd-08d9a606cde8 X-MS-TrafficTypeDiagnostic: VI1PR08MB4368:|DB6PR08MB2664: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: hH6rg9x+X2/KN1u1ZmeLsU40cK3zTkH7QJb6k2HxIK1nftPBn8igrCcxdMHzPQZAj3veCbdXYdBfkBLxNQHby3Af8AWZMaH/IWOP2YvDGWXQthYE9s5hcqTPMqf8ISxGCV0yAGqr7oe/74JR2xM30ZSk0+pqM/6txs+BjE1VTfqy/iydXQ2zUqS+24BM95WsOFmLBJebW5rZC+f1EI7On3j+fw01+N60R6QF9Ix94MHGDGyIGNSutBgUNPn4A0aRd+Qrf5Joh+WF0H9Iym4ItYvppWB6tcUQBKmoUs65ypdJxYiM9bY9fh88uoVmRN6aden8UnRnhTj9bqWMf0k1wragVFhT8LdhFuz7j8zzsYpE/bCFNqJvk0nFVqZiz/gGHxEprucgCnVwEvn3mBMxHZSkXYrfA0S/1wJqqeUFZdDYLCYKRop4vsO3bzWzdia6eMuKqVhvlefemx7Nbrh6M53IwVs00pjXAIPpBfca2rLtlb9BFQLo0l0E6BfqO+sxeB1w2IwZSM2tTxKFpX2cQmmqk+TqR849WxgljKuU0hwdx6c75RlvTEBOUpNiiuS4OgXv+tgrxHFLtK77bo+juYFpBwsofZReRpw20w4z16zUT9Jd8qufiNfd28lPrFVSfCM9q/VovpMYQnlCv03+JEuMlugNk7iP09Ag9+VGfyMUEUFC7RE3bEuhhxwSwLmtncIKTq58MNuCEVkvxvP8Bc6PkblqaScFWVwZx24qKr6GHtxw9dyiswUZkAw6GJ1dkWM/ExDSZOCOSKI8m5dXkQChJi3TLfTCf09nH+XvkwE= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR08MB4893.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6666004)(2906002)(66556008)(66946007)(8936002)(66476007)(5660300002)(52116002)(6916009)(86362001)(26005)(33964004)(508600001)(966005)(186003)(4001150100001)(9686003)(52536014)(6512007)(33656002)(4326008)(83380400001)(8676002)(235185007)(316002)(38350700002)(38100700002)(956004)(6486002)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4368 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT031.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 8d47e32d-301a-421d-6c9d-08d9a606c602 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ubByOu2tDWDKcVjCe7Uq8kyD3kEABwLaecS13PqlM0eW/aqSXipnjy6xYsZ8yXtwZuki8ChG266rlKKw5K1UYQYGNmY9TIN/cY2XplkxQlHqVU5tZBYjRwhhoVfUJPtUyNElc8vBRcxOJ+eFPC6EsBjuYHq/BoGtkbQ7tXbvBLzoGrEtX0OXQDP9/sXyBAGeLNkM8wj7PpcwGm3Oj9naBY5h2b1iD8sRPPM+7JHfUBWnS4qkXZIzpadxs/ezpIhGxJh7SeUja/7dvyviB9/m2eK6TXzCZhNhBDWbM3M67w/+TqSQr+BO6VUvdeem7I2MD/KFTG4etW3LjoUJufgHVIE29slwaDwgNuRa5qiBCOFge0y37K44vSC5eEhBKRLlyvVe5l+RY4+N3ie9hTzLDk/tSe6zXqg+UQps7zm7in2v1SZsA7GJv9uyvJXLDjsb4AUtsgtlwwgzorwpOy8wT1gOGDovwTInPsCZ06sGF/R5aHekbrhTvSSBKz/uXqtZyOFGmAIpaKCt2zXhJMCgk3bwdlOGPxs9Upf/HHNlY1dkmj8F4ZO5w6KfcSk/e1ziRc2XKcJV8AkiVBe2nPG3VZ31jEXiS+2KCySaK2OP7IelS5QAKbkjLA9GsjI/A9vYj0W4R7ombPy8Xb/9Lw/eIatowaaizziccZq735WIEuwGlom3dNxgBUMpdyDSqB+904e0J59izyyH2QyxGkeSHG7naZLLiVO0OXtYP0b3UI+4zynnVK0ThcwD/eOEhjOu+JHmmFsX13tnGrRUHQV9TJ4pwINbIXKSzp2OCGwLlcg= 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:(4636009)(36840700001)(46966006)(316002)(6666004)(5660300002)(9686003)(6512007)(6486002)(336012)(33656002)(186003)(70586007)(52536014)(2906002)(4326008)(4001150100001)(6916009)(8936002)(8676002)(956004)(36860700001)(81166007)(70206006)(82310400003)(44832011)(235185007)(33964004)(47076005)(86362001)(83380400001)(966005)(508600001)(26005)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 18:04:00.2867 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1514901b-946e-453e-31bd-08d9a606cde8 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: VE1EUR03FT031.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2664 X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_SHORT, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 Cc: Tejas.Belagod@arm.com, Richard.Earnshaw@arm.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hello, This patch teaches the DWARF support in gcc about RA_AUTH_CODE pseudo hard-register and also .save {ra_auth_code} and .cfi_offset ra_auth_code dwarf directives for the PAC feature in Armv8.1-M architecture. RA_AUTH_CODE register number is 107 and it's dwarf register number is 143. When compiled with "arm-none-eabi-gcc -O2 -mthumb -march=armv8.1-m.main+pacbti -S -fasynchronous-unwind-tables -g" command line options, the directives supported in this patch looks like below: ... push {ip} .save {ra_auth_code} .cfi_def_cfa_offset 8 .cfi_offset 143, -8 ... This patch can be committed after the patch at https://gcc.gnu.org/pipermail/gcc-patches/2021-November/583407.html is committed. Regression tested on arm-none-eabi target and found no regressions. Ok for master? Regards, Srinath. gcc/ChangeLog: 2021-11-12 Srinath Parvathaneni * config/arm/aout.h (ra_auth_code): Add to enum. * config/arm/arm.c (emit_multi_reg_push): Add RA_AUTH_CODE register to dwarf frame expression instead of IP_REGNUM. (arm_expand_prologue): Mark as frame related insn. (arm_regno_class): Check for pac pseudo reigster. (arm_dbx_register_number): Assign ra_auth_code register number in dwarf. (arm_unwind_emit_sequence): Print .save directive with ra_auth_code register. (arm_conditional_register_usage): Mark ra_auth_code in fixed reigsters. * config/arm/arm.h (FIRST_PSEUDO_REGISTER): Modify. (IS_PAC_Pseudo_REGNUM): Define. (enum reg_class): Add PAC_REG entry. * config/arm/arm.md (RA_AUTH_CODE): Define. gcc/testsuite/ChangeLog: 2021-11-12 Srinath Parvathaneni * g++.target/arm/pac-1.C: New test. ############### Attachment also inlined for ease of reply ############### diff --git a/gcc/config/arm/aout.h b/gcc/config/arm/aout.h index 25a2812a663742893b928398b0d3948e97f1905b..c69e299e012f46c8d0711830125dbf2f6b2e93d7 100644 --- a/gcc/config/arm/aout.h +++ b/gcc/config/arm/aout.h @@ -74,7 +74,8 @@ "wr8", "wr9", "wr10", "wr11", \ "wr12", "wr13", "wr14", "wr15", \ "wcgr0", "wcgr1", "wcgr2", "wcgr3", \ - "cc", "vfpcc", "sfp", "afp", "apsrq", "apsrge", "p0" \ + "cc", "vfpcc", "sfp", "afp", "apsrq", "apsrge", "p0", \ + "ra_auth_code" \ } #endif diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 8e6ef41f6b065217d1af3f4f1cb85b2d8fbd0dc0..f31944e85c9ab83501f156d138e2aea1bcb5b79d 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -815,7 +815,8 @@ extern const int arm_arch_cde_coproc_bits[]; s16-s31 S VFP variable (aka d8-d15). vfpcc Not a real register. Represents the VFP condition code flags. - vpr Used to represent MVE VPR predication. */ + vpr Used to represent MVE VPR predication. + ra_auth_code Pseudo register to save PAC. */ /* The stack backtrace structure is as follows: fp points to here: | save code pointer | [fp] @@ -856,7 +857,7 @@ extern const int arm_arch_cde_coproc_bits[]; 1,1,1,1,1,1,1,1, \ 1,1,1,1, \ /* Specials. */ \ - 1,1,1,1,1,1,1 \ + 1,1,1,1,1,1,1,1 \ } /* 1 for registers not available across function calls. @@ -886,7 +887,7 @@ extern const int arm_arch_cde_coproc_bits[]; 1,1,1,1,1,1,1,1, \ 1,1,1,1, \ /* Specials. */ \ - 1,1,1,1,1,1,1 \ + 1,1,1,1,1,1,1,1 \ } #ifndef SUBTARGET_CONDITIONAL_REGISTER_USAGE @@ -1062,10 +1063,10 @@ extern const int arm_arch_cde_coproc_bits[]; && (LAST_VFP_REGNUM - (REGNUM) >= 2 * (N) - 1)) /* The number of hard registers is 16 ARM + 1 CC + 1 SFP + 1 AFP - + 1 APSRQ + 1 APSRGE + 1 VPR. */ + + 1 APSRQ + 1 APSRGE + 1 VPR + 1 Pseudo register to save PAC. */ /* Intel Wireless MMX Technology registers add 16 + 4 more. */ /* VFP (VFP3) adds 32 (64) + 1 VFPCC. */ -#define FIRST_PSEUDO_REGISTER 107 +#define FIRST_PSEUDO_REGISTER 108 #define DBX_REGISTER_NUMBER(REGNO) arm_dbx_register_number (REGNO) @@ -1248,12 +1249,15 @@ extern int arm_regs_in_sequence[]; CC_REGNUM, VFPCC_REGNUM, \ FRAME_POINTER_REGNUM, ARG_POINTER_REGNUM, \ SP_REGNUM, PC_REGNUM, APSRQ_REGNUM, \ - APSRGE_REGNUM, VPR_REGNUM \ + APSRGE_REGNUM, VPR_REGNUM, RA_AUTH_CODE \ } #define IS_VPR_REGNUM(REGNUM) \ ((REGNUM) == VPR_REGNUM) +#define IS_PAC_Pseudo_REGNUM(REGNUM) \ + ((REGNUM) == RA_AUTH_CODE) + /* Use different register alloc ordering for Thumb. */ #define ADJUST_REG_ALLOC_ORDER arm_order_regs_for_local_alloc () @@ -1292,6 +1296,7 @@ enum reg_class SFP_REG, AFP_REG, VPR_REG, + PAC_REG, ALL_REGS, LIM_REG_CLASSES }; @@ -1321,6 +1326,7 @@ enum reg_class "SFP_REG", \ "AFP_REG", \ "VPR_REG", \ + "PAC_REG", \ "ALL_REGS" \ } @@ -1349,6 +1355,7 @@ enum reg_class { 0x00000000, 0x00000000, 0x00000000, 0x00000040 }, /* SFP_REG */ \ { 0x00000000, 0x00000000, 0x00000000, 0x00000080 }, /* AFP_REG */ \ { 0x00000000, 0x00000000, 0x00000000, 0x00000400 }, /* VPR_REG. */ \ + { 0x00000000, 0x00000000, 0x00000000, 0x00000800 }, /* PAC_REG. */ \ { 0xFFFF7FFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000000F } /* ALL_REGS. */ \ } diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index a3e34747ba52840bd82f76df4a3f05704bd42ec1..966c49a3bf21de909dbab5abcac5d1d3b2af4262 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -22000,7 +22000,9 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) { if (mask & (1 << i)) { - reg = gen_rtx_REG (SImode, i); + rtx reg1 = reg = gen_rtx_REG (SImode, i); + if (arm_pac_enabled_for_curr_function_p () && i == IP_REGNUM) + reg1 = gen_rtx_REG (SImode, RA_AUTH_CODE); XVECEXP (par, 0, 0) = gen_rtx_SET (gen_frame_mem @@ -22018,7 +22020,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) if (dwarf_regs_mask & (1 << i)) { tmp = gen_rtx_SET (gen_frame_mem (SImode, stack_pointer_rtx), - reg); + reg1); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_par_index++) = tmp; } @@ -23505,7 +23507,10 @@ arm_expand_prologue (void) saved_regs += arm_save_coproc_regs (); if (arm_pac_enabled_for_curr_function_p ()) - emit_multi_reg_push (1 << IP_REGNUM, 1 << IP_REGNUM); + { + insn = emit_multi_reg_push (1 << IP_REGNUM, 1 << IP_REGNUM); + RTX_FRAME_RELATED_P (insn) = 1; + } if (frame_pointer_needed && TARGET_ARM) { @@ -25435,6 +25440,9 @@ arm_regno_class (int regno) if (IS_VPR_REGNUM (regno)) return VPR_REG; + if (IS_PAC_Pseudo_REGNUM (regno)) + return PAC_REG; + if (TARGET_THUMB1) { if (regno == STACK_POINTER_REGNUM) @@ -29429,6 +29437,9 @@ arm_dbx_register_number (unsigned int regno) if (IS_IWMMXT_REGNUM (regno)) return 112 + regno - FIRST_IWMMXT_REGNUM; + if (IS_PAC_Pseudo_REGNUM (regno)) + return 143; + return DWARF_FRAME_REGISTERS; } @@ -29550,6 +29561,11 @@ arm_unwind_emit_sequence (FILE * out_file, rtx p) reg_size = 8; fprintf (out_file, "\t.vsave {"); } + else if (IS_PAC_Pseudo_REGNUM (reg)) + { + reg_size = 4; + fprintf (out_file, "\t.save {"); + } else /* Unknown register type. */ gcc_unreachable (); @@ -29579,6 +29595,8 @@ arm_unwind_emit_sequence (FILE * out_file, rtx p) double precision register names. */ if (IS_VFP_REGNUM (reg)) asm_fprintf (out_file, "d%d", (reg - FIRST_VFP_REGNUM) / 2); + else if (IS_PAC_Pseudo_REGNUM (reg)) + asm_fprintf (asm_out_file, "ra_auth_code"); else asm_fprintf (out_file, "%r", reg); @@ -30447,7 +30465,10 @@ arm_conditional_register_usage (void) } if (TARGET_HAVE_PACBTI) - call_used_regs[IP_REGNUM] = 1; + { + call_used_regs[IP_REGNUM] = 1; + fixed_regs[RA_AUTH_CODE] = 0; + } /* The Q and GE bits are only accessed via special ACLE patterns. */ CLEAR_HARD_REG_BIT (operand_reg_set, APSRQ_REGNUM); diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index 564170dc4500c2c5d961c9a19dd86a31416dc965..f27dc3f9041d8b32e7ad750c39143a6764156fe9 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -42,6 +42,7 @@ (APSRQ_REGNUM 104) ; Q bit pseudo register (APSRGE_REGNUM 105) ; GE bits pseudo register (VPR_REGNUM 106) ; Vector Predication Register - MVE register. + (RA_AUTH_CODE 107) ; Pseudo register to save PAC. ] ) ;; 3rd operand to select_dominance_cc_mode diff --git a/gcc/testsuite/g++.target/arm/pac-1.C b/gcc/testsuite/g++.target/arm/pac-1.C new file mode 100644 index 0000000000000000000000000000000000000000..d33c860f1e368581dd9c3552a7201c7932b8560f --- /dev/null +++ b/gcc/testsuite/g++.target/arm/pac-1.C @@ -0,0 +1,32 @@ +/* Check that GCC does .save and .cfi_offset directives with RA_AUTH_CODE pseudo hard-register. */ +/* { dg-do compile } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ +/* { dg-options "-O2 -march=armv8.1-m.main -mbranch-protection=pac-ret+leaf+bti -mthumb -mfloat-abi=soft --save-temps -g" } */ + +__attribute__((noinline)) void +fn1 (int a, int b, int c) +{ + if (a != b + c) + __builtin_abort (); + else + throw b+c; +} + +int main () +{ + int a = 120; + try + { + fn1 (a, 40, 80); + } + catch (int x) + { + if (x != a) + __builtin_abort (); + else + return 0; + } +} + +/* { dg-final { scan-assembler "\.save \{ra_auth_code\}" } } */ +/* { dg-final { scan-assembler "\.cfi_offset 143, \-8" } } */ diff --git a/gcc/config/arm/aout.h b/gcc/config/arm/aout.h index 25a2812a663742893b928398b0d3948e97f1905b..c69e299e012f46c8d0711830125dbf2f6b2e93d7 100644 --- a/gcc/config/arm/aout.h +++ b/gcc/config/arm/aout.h @@ -74,7 +74,8 @@ "wr8", "wr9", "wr10", "wr11", \ "wr12", "wr13", "wr14", "wr15", \ "wcgr0", "wcgr1", "wcgr2", "wcgr3", \ - "cc", "vfpcc", "sfp", "afp", "apsrq", "apsrge", "p0" \ + "cc", "vfpcc", "sfp", "afp", "apsrq", "apsrge", "p0", \ + "ra_auth_code" \ } #endif diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 8e6ef41f6b065217d1af3f4f1cb85b2d8fbd0dc0..f31944e85c9ab83501f156d138e2aea1bcb5b79d 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -815,7 +815,8 @@ extern const int arm_arch_cde_coproc_bits[]; s16-s31 S VFP variable (aka d8-d15). vfpcc Not a real register. Represents the VFP condition code flags. - vpr Used to represent MVE VPR predication. */ + vpr Used to represent MVE VPR predication. + ra_auth_code Pseudo register to save PAC. */ /* The stack backtrace structure is as follows: fp points to here: | save code pointer | [fp] @@ -856,7 +857,7 @@ extern const int arm_arch_cde_coproc_bits[]; 1,1,1,1,1,1,1,1, \ 1,1,1,1, \ /* Specials. */ \ - 1,1,1,1,1,1,1 \ + 1,1,1,1,1,1,1,1 \ } /* 1 for registers not available across function calls. @@ -886,7 +887,7 @@ extern const int arm_arch_cde_coproc_bits[]; 1,1,1,1,1,1,1,1, \ 1,1,1,1, \ /* Specials. */ \ - 1,1,1,1,1,1,1 \ + 1,1,1,1,1,1,1,1 \ } #ifndef SUBTARGET_CONDITIONAL_REGISTER_USAGE @@ -1062,10 +1063,10 @@ extern const int arm_arch_cde_coproc_bits[]; && (LAST_VFP_REGNUM - (REGNUM) >= 2 * (N) - 1)) /* The number of hard registers is 16 ARM + 1 CC + 1 SFP + 1 AFP - + 1 APSRQ + 1 APSRGE + 1 VPR. */ + + 1 APSRQ + 1 APSRGE + 1 VPR + 1 Pseudo register to save PAC. */ /* Intel Wireless MMX Technology registers add 16 + 4 more. */ /* VFP (VFP3) adds 32 (64) + 1 VFPCC. */ -#define FIRST_PSEUDO_REGISTER 107 +#define FIRST_PSEUDO_REGISTER 108 #define DBX_REGISTER_NUMBER(REGNO) arm_dbx_register_number (REGNO) @@ -1248,12 +1249,15 @@ extern int arm_regs_in_sequence[]; CC_REGNUM, VFPCC_REGNUM, \ FRAME_POINTER_REGNUM, ARG_POINTER_REGNUM, \ SP_REGNUM, PC_REGNUM, APSRQ_REGNUM, \ - APSRGE_REGNUM, VPR_REGNUM \ + APSRGE_REGNUM, VPR_REGNUM, RA_AUTH_CODE \ } #define IS_VPR_REGNUM(REGNUM) \ ((REGNUM) == VPR_REGNUM) +#define IS_PAC_Pseudo_REGNUM(REGNUM) \ + ((REGNUM) == RA_AUTH_CODE) + /* Use different register alloc ordering for Thumb. */ #define ADJUST_REG_ALLOC_ORDER arm_order_regs_for_local_alloc () @@ -1292,6 +1296,7 @@ enum reg_class SFP_REG, AFP_REG, VPR_REG, + PAC_REG, ALL_REGS, LIM_REG_CLASSES }; @@ -1321,6 +1326,7 @@ enum reg_class "SFP_REG", \ "AFP_REG", \ "VPR_REG", \ + "PAC_REG", \ "ALL_REGS" \ } @@ -1349,6 +1355,7 @@ enum reg_class { 0x00000000, 0x00000000, 0x00000000, 0x00000040 }, /* SFP_REG */ \ { 0x00000000, 0x00000000, 0x00000000, 0x00000080 }, /* AFP_REG */ \ { 0x00000000, 0x00000000, 0x00000000, 0x00000400 }, /* VPR_REG. */ \ + { 0x00000000, 0x00000000, 0x00000000, 0x00000800 }, /* PAC_REG. */ \ { 0xFFFF7FFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000000F } /* ALL_REGS. */ \ } diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index a3e34747ba52840bd82f76df4a3f05704bd42ec1..966c49a3bf21de909dbab5abcac5d1d3b2af4262 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -22000,7 +22000,9 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) { if (mask & (1 << i)) { - reg = gen_rtx_REG (SImode, i); + rtx reg1 = reg = gen_rtx_REG (SImode, i); + if (arm_pac_enabled_for_curr_function_p () && i == IP_REGNUM) + reg1 = gen_rtx_REG (SImode, RA_AUTH_CODE); XVECEXP (par, 0, 0) = gen_rtx_SET (gen_frame_mem @@ -22018,7 +22020,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) if (dwarf_regs_mask & (1 << i)) { tmp = gen_rtx_SET (gen_frame_mem (SImode, stack_pointer_rtx), - reg); + reg1); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, dwarf_par_index++) = tmp; } @@ -23505,7 +23507,10 @@ arm_expand_prologue (void) saved_regs += arm_save_coproc_regs (); if (arm_pac_enabled_for_curr_function_p ()) - emit_multi_reg_push (1 << IP_REGNUM, 1 << IP_REGNUM); + { + insn = emit_multi_reg_push (1 << IP_REGNUM, 1 << IP_REGNUM); + RTX_FRAME_RELATED_P (insn) = 1; + } if (frame_pointer_needed && TARGET_ARM) { @@ -25435,6 +25440,9 @@ arm_regno_class (int regno) if (IS_VPR_REGNUM (regno)) return VPR_REG; + if (IS_PAC_Pseudo_REGNUM (regno)) + return PAC_REG; + if (TARGET_THUMB1) { if (regno == STACK_POINTER_REGNUM) @@ -29429,6 +29437,9 @@ arm_dbx_register_number (unsigned int regno) if (IS_IWMMXT_REGNUM (regno)) return 112 + regno - FIRST_IWMMXT_REGNUM; + if (IS_PAC_Pseudo_REGNUM (regno)) + return 143; + return DWARF_FRAME_REGISTERS; } @@ -29550,6 +29561,11 @@ arm_unwind_emit_sequence (FILE * out_file, rtx p) reg_size = 8; fprintf (out_file, "\t.vsave {"); } + else if (IS_PAC_Pseudo_REGNUM (reg)) + { + reg_size = 4; + fprintf (out_file, "\t.save {"); + } else /* Unknown register type. */ gcc_unreachable (); @@ -29579,6 +29595,8 @@ arm_unwind_emit_sequence (FILE * out_file, rtx p) double precision register names. */ if (IS_VFP_REGNUM (reg)) asm_fprintf (out_file, "d%d", (reg - FIRST_VFP_REGNUM) / 2); + else if (IS_PAC_Pseudo_REGNUM (reg)) + asm_fprintf (asm_out_file, "ra_auth_code"); else asm_fprintf (out_file, "%r", reg); @@ -30447,7 +30465,10 @@ arm_conditional_register_usage (void) } if (TARGET_HAVE_PACBTI) - call_used_regs[IP_REGNUM] = 1; + { + call_used_regs[IP_REGNUM] = 1; + fixed_regs[RA_AUTH_CODE] = 0; + } /* The Q and GE bits are only accessed via special ACLE patterns. */ CLEAR_HARD_REG_BIT (operand_reg_set, APSRQ_REGNUM); diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index 564170dc4500c2c5d961c9a19dd86a31416dc965..f27dc3f9041d8b32e7ad750c39143a6764156fe9 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -42,6 +42,7 @@ (APSRQ_REGNUM 104) ; Q bit pseudo register (APSRGE_REGNUM 105) ; GE bits pseudo register (VPR_REGNUM 106) ; Vector Predication Register - MVE register. + (RA_AUTH_CODE 107) ; Pseudo register to save PAC. ] ) ;; 3rd operand to select_dominance_cc_mode diff --git a/gcc/testsuite/g++.target/arm/pac-1.C b/gcc/testsuite/g++.target/arm/pac-1.C new file mode 100644 index 0000000000000000000000000000000000000000..d33c860f1e368581dd9c3552a7201c7932b8560f --- /dev/null +++ b/gcc/testsuite/g++.target/arm/pac-1.C @@ -0,0 +1,32 @@ +/* Check that GCC does .save and .cfi_offset directives with RA_AUTH_CODE pseudo hard-register. */ +/* { dg-do compile } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ +/* { dg-options "-O2 -march=armv8.1-m.main -mbranch-protection=pac-ret+leaf+bti -mthumb -mfloat-abi=soft --save-temps -g" } */ + +__attribute__((noinline)) void +fn1 (int a, int b, int c) +{ + if (a != b + c) + __builtin_abort (); + else + throw b+c; +} + +int main () +{ + int a = 120; + try + { + fn1 (a, 40, 80); + } + catch (int x) + { + if (x != a) + __builtin_abort (); + else + return 0; + } +} + +/* { dg-final { scan-assembler "\.save \{ra_auth_code\}" } } */ +/* { dg-final { scan-assembler "\.cfi_offset 143, \-8" } } */