From patchwork Fri Oct 28 16:40:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Corallo X-Patchwork-Id: 59589 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 CAAD93864C6A for ; Fri, 28 Oct 2022 16:42:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CAAD93864C6A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666975373; bh=2g7yJoJDAGbsOy5AgenIa/D/P+aor+6ge5/k1RUVn/M=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=M2TWm8m9YUMjgMnvZ5AnVubTO9uWYxExZYKoPJ2Z7pIDv0wV6LTq9sfW/bsCoEbpg 7AUtI5Wjkd7mJuzy7j0yIFNOxCb1cjTWLCdd4JCeP+949Fcux9z3FDb0pWy4GgEko3 XQ+d9XqcoZGzO70r27bXw1bNMeoFDQh2xfKaNpVA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2085.outbound.protection.outlook.com [40.107.247.85]) by sourceware.org (Postfix) with ESMTPS id 16A88382DE32 for ; Fri, 28 Oct 2022 16:40:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 16A88382DE32 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=MdhdstjxmANKiZm+8y00PuGjDjKIL8p1/DwR4B+aOLtXNLOoh/jqHO6lsYWyQmTYMI/HYNxKCbbmbrOSiNNqTHeHx/cxx+2VSLYW1/1btYo3HGBOhKg3i+VJKlctKJXmAhSki9YENCnkl63Ak5Gtfy1eBZ8ajfGeFFZSkYDfFTA7gCZqrbAdkn7AdkfH3rgqEZYf47aSu05iIJ92W87jjraFHVLLd8FoXQj5SSaG4iR6O/PmXBlXyK7jJv6i9zn9J3tTCDm3n/pWECv4m+1vR8qzDaoNSN6cxZgL+59Wvg4ntvAfe8HjXD25yYTkOl15ZBkes+Iu6Q3SXHjMgruZXQ== 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=2g7yJoJDAGbsOy5AgenIa/D/P+aor+6ge5/k1RUVn/M=; b=Od48I8cE1t+JtNAZaHzyCW/wUfjieBdEF8udMsYnq18W6mMYDO+FW7yxr6e27JShk4kTffeOpI5MB/TPT6Q5tGlTmC8+kwtAPEy5gYqlNFLbtw+lwU88UzR9IvOdnbwm90jO25mW7yDGZwOT9C4Q/HmDGDwwUOyfCQwNs5SW2wddoE8mMYV6VSVeyCIeeCoYwWnyW1MOi027LfoFYwp8dLih6bp9cElAvKprs6Fq9dyumLkiumQVb2/I+NAxrsilkz8sfs+wyTHjazSNyRRdbUTgwbRuOqZVAkHV/vdnvswT7WDUYx5JXAH+nz4YYMWVz50PgtxTomwKErnOwOuu1A== 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 DUZPR01CA0038.eurprd01.prod.exchangelabs.com (2603:10a6:10:468::12) by PAWPR08MB9518.eurprd08.prod.outlook.com (2603:10a6:102:2ed::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 16:40:29 +0000 Received: from DBAEUR03FT011.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:468:cafe::5e) by DUZPR01CA0038.outlook.office365.com (2603:10a6:10:468::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.22 via Frontend Transport; Fri, 28 Oct 2022 16:40:29 +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 DBAEUR03FT011.mail.protection.outlook.com (100.127.142.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20 via Frontend Transport; Fri, 28 Oct 2022 16:40:29 +0000 Received: ("Tessian outbound f394866f3f2b:v130"); Fri, 28 Oct 2022 16:40:29 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e12dc1c438dd7836 X-CR-MTA-TID: 64aa7808 Received: from 6ac6cbfe99d8.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F0578602-9844-45D4-9188-8FF586725865.1; Fri, 28 Oct 2022 16:40:21 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 6ac6cbfe99d8.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 28 Oct 2022 16:40:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E6zCQOv/3R8wg0o6IAgaNFkS9i+VcKDqZVCOezCzAaOz+zonHb444n9IqK58wMuQjYCMX9FSrSP3YaOm0Nufyg+lSFUwxf836iEKVIz8tuAunA8EQpW+IRZHg/5rM9TVPup99VseyzwiHuIyjijlPS/t9wOs/EbaSUpow8VB4lOK9C45EBIrsEWFYmkYXxbuCBueDuYRukJIMUx/MdY8h7NEid5Rqel+lYsMYaxLV+N5aaSEqbZSBTEn0y4ULLNo+91uyU4yQK0XIGbe07Yh0Kkzu83hhOLstw0v+XdSZAcDGcuBAISUwGlH4W9uSffZWk1THU8f33oNSvEKEKiviQ== 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=2g7yJoJDAGbsOy5AgenIa/D/P+aor+6ge5/k1RUVn/M=; b=P8AvczuOqoOqnwIW4OELTnXhN3CYpmRplyA7IxlYonToi32mvLur1kVMzGAmEQvWoIiGX950SGy8XDixh/h3lFTexNL4bDuawlxzQExlWgmUrqdx1sdO4i5ircZrpjvMC962J3yl6yrhcrHF4SfEKAbGO9Nkyjp+XZerOwXeL+i798Bgbd00vhNgA1jZ5vUDmDOI9osaj9N2ZIWTzTAR9CuXjN6zU+AylQgi/ImtazBAJvaavmPm1dOBCmD0S7EE4yA78irsK/6iUMlypWotX9b6t2WJOI11J40K8aeGuNrguH7yWsA4DjYowGeb2bXAx6GFBMeJW9V0nIJP+s71ng== 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 AS9PR06CA0087.eurprd06.prod.outlook.com (2603:10a6:20b:464::8) by DB3PR08MB8820.eurprd08.prod.outlook.com (2603:10a6:10:438::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Fri, 28 Oct 2022 16:40:19 +0000 Received: from AM7EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:464:cafe::94) by AS9PR06CA0087.outlook.office365.com (2603:10a6:20b:464::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15 via Frontend Transport; Fri, 28 Oct 2022 16:40:19 +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 AM7EUR03FT008.mail.protection.outlook.com (100.127.141.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Fri, 28 Oct 2022 16:40:18 +0000 Received: from AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) 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.2507.12; Fri, 28 Oct 2022 16:40:18 +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.12; Fri, 28 Oct 2022 16:40:18 +0000 Received: from e124257 (10.34.105.24) 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; Fri, 28 Oct 2022 16:40:17 +0000 To: Kyrylo Tkachov Subject: [PATCH 12/15 V3] arm: implement bti injection In-Reply-To: (Kyrylo Tkachov's message of "Thu, 20 Oct 2022 14:56:41 +0000") References: Date: Fri, 28 Oct 2022 18:40:17 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT008:EE_|DB3PR08MB8820:EE_|DBAEUR03FT011:EE_|PAWPR08MB9518:EE_ X-MS-Office365-Filtering-Correlation-Id: 5609b328-c98b-42b0-a95b-08dab9031f9b 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: dWQPg8ntP5o9u1IyXVQBmrMWC+5h8bmlu13DIry0S8QOerwDfaZgrbNKHv2aZHt/9AxQLYQ3Da1CgwUUtcvF1siP/8ev7ewPJ9Byb/r9nVzTkPGFwa2bAcBgsLsu+lEhhZNpcZcnxte2SsTxHzk3+NIClZBvOe/6FgDEcYtS8pHzHLA1hDYHlVq5n42tnyjr4KrrtiDqpsJDQJ046DQGhqcpTaOA2cyhWIqPOIMqlXk9ML87kyir25j7DY6ZkNF5DE5G7hkPMva4Vt4x4jm2NBh0Wp6fsFBw60x7Ya+8/3coN8Hh57UYYzLLbR0cA5lb4SZJ4poYHegNuH7Eya6FnAIPMwXxJhjez66rQSqRnLyU6VBQW0sa4axYsF+eqzmigcD2+INkTIUicxrUCGF8d4fY2iLc0da3kGJ8x0J51+f8L6Xzq8fRsTI79p+QfWuDuCSci1aRHWmJ+LzwHO95GkvPabgD9YbN5rCaMXoISk05KYwzc2j9U+vkzLgZ5vMpWbX71MOcgJGfFQl03nQDTsDh/lcIWe5mCcI5r9PJafpB7Jkx5FypjGIonzNt32NAmUR++Dm8uCWXr0RMKKxwM2wXMMgwzaIPWV9c+obJbvWvczqp8IVQxUyuDGWbqPAX9K/w06Xc8TX8ErQJFymi6YA9amhE5K/lFveJHz4yNunK7i1LLOzmOwF7JNQQvQiMn5xDildgGx3raehRtrkz3eFfjfwzihmMS369+3w7kz1fgWUywnHsV9+3Eb0xYLFcIK4BT5QahsbKL6IPkJTC3Jc1EpHG7nW8kbfwEhvWyDYmfzdVONr6AE0ToYsx5ZLv 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)(396003)(346002)(136003)(376002)(451199015)(36840700001)(46966006)(40470700004)(54906003)(356005)(6862004)(5660300002)(41300700001)(8936002)(44832011)(235185007)(2906002)(82740400003)(316002)(8676002)(37006003)(36756003)(70586007)(86362001)(4326008)(70206006)(6636002)(564344004)(40460700003)(40480700001)(478600001)(186003)(81166007)(336012)(2616005)(36860700001)(47076005)(82310400005)(26005)(33964004)(426003)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR08MB8820 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT011.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6b2e6a52-dad2-49f6-37d2-08dab903197f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SvPAr+j+Ri9MDgTKCl0LgT+6ag9XY8TO618JLVRR//eEUzgeMfmxpA2rZQnCRRFssW60bDvBEMorIQkp5Iwuu8QPg48d8f7Xm/Lpn1BjjOor7GJuVxpYoERbWCDDa31ssXqgHd38xQFpcNdU2X/QiJ7bq2rY/c+WgmzzdejfvH9AGauS7pIr0aXOc6sKAXbPgbvT2GAbRm0krhKpbRsaRCx+3/kxUkjFUw3mqZpfrWh2aEvEWK0iN2ZKFrDQcVEqHA4Mwv/iusxNgU2DUgCn4XhHAIRxLsdidE4oOvIt/vyVhIczFOMCL1lJGw3H+UXZ5QAHyN9YgkNgS8eLICLNGR4TOgCarrQExBcBDBijc+ZGoJGXYfqSFcgbWSyFe0iz2GpBcm3IYC6/jxsOs5vZv66e6hnFQMJvQ2yNCHi8G/BrZWHycC6eoBiGU+I5seD/owG1D8G77VczK0TXPAxw5DH+O63+O+0A73IcRpJKoj9mP7IM7tCQlfhX3L+Kcelr6UFcnhhjXFJ2EYuxjj7JGPfj8MF0VWTK0gJVjWfO06b5pCqNKdPWF97rvNxFXTR5JRiYBdm85YDQpCIFVQfxo8letr1Ka3oaKis0y5P63SqbPrrvds0i0GVuqsLJaTakCEFICaWMpJVmGn0CaV/q0rzdharqapyJOpFqecd+enK8PSZ+Bf/at07vZK9GbGnO+sni03VrItU+1TY+x5i3NHmyetBU8b5hdIC+tcfBWLp8MevLuc7yLq/vaiHs/p7qmAvsYtzNcigxQ9W4Z13MBw== 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)(376002)(39860400002)(136003)(346002)(396003)(451199015)(40470700004)(46966006)(36840700001)(33964004)(70586007)(4326008)(70206006)(8676002)(336012)(47076005)(426003)(44832011)(564344004)(235185007)(5660300002)(2616005)(2906002)(186003)(36756003)(82310400005)(81166007)(40480700001)(41300700001)(26005)(6862004)(8936002)(36860700001)(86362001)(40460700003)(478600001)(6636002)(37006003)(82740400003)(316002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 16:40:29.2525 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5609b328-c98b-42b0-a95b-08dab9031f9b 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: DBAEUR03FT011.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9518 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, 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: Andrea Corallo via Gcc-patches From: Andrea Corallo Reply-To: Andrea Corallo Cc: Richard Earnshaw , nd , Andrea Corallo via Gcc-patches Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi all, please find attached the third iteration of this patch addresing review comments. Thanks Andrea From e3001bd662b84dafeca200b52fc644b7bf81c4af Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Thu, 7 Apr 2022 11:51:56 +0200 Subject: [PATCH] [PATCH 12/15] arm: implement bti injection Hi all, this patch enables Branch Target Identification Armv8.1-M Mechanism [1]. This is achieved by using the bti pass made common with Aarch64. The pass iterates through the instructions and adds the necessary BTI instructions at the beginning of every function and at every landing pads targeted by indirect jumps. Best Regards Andrea [1] gcc/ChangeLog 2022-04-07 Andrea Corallo * config.gcc (arm*-*-*): Add 'aarch-bti-insert.o' object. * config/arm/arm-protos.h: Update. * config/arm/arm.cc (aarch_bti_enabled, aarch_bti_j_insn_p) (aarch_pac_insn_p, aarch_gen_bti_c, aarch_gen_bti_j): New functions. * config/arm/arm.md (bti_nop): New insn. * config/arm/t-arm (PASSES_EXTRA): Add 'arm-passes.def'. (aarch-bti-insert.o): New target. * config/arm/unspecs.md (UNSPEC_BTI_NOP): New unspec. * config/arm/aarch-bti-insert.cc (rest_of_insert_bti): Update to verify arch compatibility. * config/arm/arm-passes.def: New file. gcc/testsuite/ChangeLog 2022-04-07 Andrea Corallo * gcc.target/arm/bti-1.c: New testcase. * gcc.target/arm/bti-2.c: Likewise. --- gcc/config.gcc | 2 +- gcc/config/arm/arm-passes.def | 21 ++++++++++ gcc/config/arm/arm-protos.h | 2 + gcc/config/arm/arm.cc | 61 +++++++++++++++++++++++++--- gcc/config/arm/arm.md | 7 ++++ gcc/config/arm/t-arm | 10 +++++ gcc/config/arm/unspecs.md | 1 + gcc/testsuite/gcc.target/arm/bti-1.c | 12 ++++++ gcc/testsuite/gcc.target/arm/bti-2.c | 58 ++++++++++++++++++++++++++ 9 files changed, 167 insertions(+), 7 deletions(-) create mode 100644 gcc/config/arm/arm-passes.def create mode 100644 gcc/testsuite/gcc.target/arm/bti-1.c create mode 100644 gcc/testsuite/gcc.target/arm/bti-2.c diff --git a/gcc/config.gcc b/gcc/config.gcc index 2021bdf9d2f..004e1dfa8d8 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -353,7 +353,7 @@ arc*-*-*) ;; arm*-*-*) cpu_type=arm - extra_objs="arm-builtins.o arm-mve-builtins.o aarch-common.o" + extra_objs="arm-builtins.o arm-mve-builtins.o aarch-common.o aarch-bti-insert.o" extra_headers="mmintrin.h arm_neon.h arm_acle.h arm_fp16.h arm_cmse.h arm_bf16.h arm_mve_types.h arm_mve.h arm_cde.h" target_type_format_char='%' c_target_objs="arm-c.o" diff --git a/gcc/config/arm/arm-passes.def b/gcc/config/arm/arm-passes.def new file mode 100644 index 00000000000..71d6b563640 --- /dev/null +++ b/gcc/config/arm/arm-passes.def @@ -0,0 +1,21 @@ +/* Arm-specific passes declarations. + Copyright (C) 2022 Free Software Foundation, Inc. + Contributed by Arm Ltd. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + GCC is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING3. If not see + . */ + +INSERT_PASS_BEFORE (pass_shorten_branches, 1, pass_insert_bti); diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 84764bf27ce..6befb6c4445 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -24,6 +24,8 @@ #include "sbitmap.h" +rtl_opt_pass *make_pass_insert_bti (gcc::context *ctxt); + extern enum unwind_info_type arm_except_unwind_info (struct gcc_options *); extern int use_return_insn (int, rtx); extern bool use_simple_return_p (void); diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index fa0f9a61498..26d4c1502f2 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -23374,12 +23374,6 @@ output_probe_stack_range (rtx reg1, rtx reg2) return ""; } -static bool -aarch_bti_enabled () -{ - return false; -} - /* Generate the prologue instructions for entry into an ARM or Thumb-2 function. */ void @@ -32992,6 +32986,61 @@ arm_current_function_pac_enabled_p (void) && !crtl->is_leaf)); } +/* Return TRUE if Branch Target Identification Mechanism is enabled. */ +bool +aarch_bti_enabled (void) +{ + return aarch_enable_bti == 1; +} + +/* Check if INSN is a BTI J insn. */ +bool +aarch_bti_j_insn_p (rtx_insn *insn) +{ + if (!insn || !INSN_P (insn)) + return false; + + rtx pat = PATTERN (insn); + return GET_CODE (pat) == UNSPEC_VOLATILE && XINT (pat, 1) == UNSPEC_BTI_NOP; +} + +/* Check if X (or any sub-rtx of X) is a PACIASP/PACIBSP instruction. */ +bool +aarch_pac_insn_p (rtx x) +{ + if (!x || !INSN_P (x)) + return false; + + rtx pat = PATTERN (x); + + if (GET_CODE (pat) == SET) + { + rtx tmp = XEXP (pat, 1); + if (tmp + && GET_CODE (tmp) == UNSPEC + && (XINT (tmp, 1) == UNSPEC_PAC_NOP + || XINT (tmp, 1) == UNSPEC_PACBTI_NOP)) + return true; + } + + return false; +} + +/* The following two functions are for code compatibility with aarch64 + code, this even if in arm we have only one bti instruction. */ + +rtx +aarch_gen_bti_c (void) +{ + return gen_bti_nop (); +} + +rtx +aarch_gen_bti_j (void) +{ + return gen_bti_nop (); +} + /* Implement TARGET_SCHED_CAN_SPECULATE_INSN. Return true if INSN can be scheduled for speculative execution. Reject the long-running division and square-root instructions. */ diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index 7255fa98f5d..6e86811ee05 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -12913,6 +12913,13 @@ (define_insn "aut_nop" "aut\t%|ip, %|lr, %|sp" [(set_attr "conds" "unconditional")]) +(define_insn "bti_nop" + [(unspec_volatile [(const_int 0)] UNSPEC_BTI_NOP)] + "arm_arch8m_main" + "bti" + [(set_attr "conds" "unconditional") + (set_attr "type" "nop")]) + ;; Vector bits common to IWMMXT, Neon and MVE (include "vec-common.md") ;; Load the Intel Wireless Multimedia Extension patterns diff --git a/gcc/config/arm/t-arm b/gcc/config/arm/t-arm index 041cc6ec045..683342cb528 100644 --- a/gcc/config/arm/t-arm +++ b/gcc/config/arm/t-arm @@ -175,3 +175,13 @@ arm-d.o: $(srcdir)/config/arm/arm-d.cc arm-common.o: arm-cpu-cdata.h driver-arm.o: arm-native.h + +PASSES_EXTRA += $(srcdir)/config/arm/arm-passes.def + +aarch-bti-insert.o: $(srcdir)/config/arm/aarch-bti-insert.cc \ + $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(REGS_H) insn-config.h $(RTL_BASE_H) \ + dominance.h cfg.h cfganal.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(RECOG_H) \ + output.h hash-map.h $(DF_H) $(OBSTACK_H) $(TARGET_H) $(RTL_H) \ + $(CONTEXT_H) $(TREE_PASS_H) regrename.h + $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + $(srcdir)/config/arm/aarch-bti-insert.cc diff --git a/gcc/config/arm/unspecs.md b/gcc/config/arm/unspecs.md index dbe243a03f6..78e723a4b3c 100644 --- a/gcc/config/arm/unspecs.md +++ b/gcc/config/arm/unspecs.md @@ -162,6 +162,7 @@ (define_c_enum "unspec" [ UNSPEC_PAC_NOP ; Represents PAC signing LR UNSPEC_PACBTI_NOP ; Represents PAC signing LR + valid landing pad UNSPEC_AUT_NOP ; Represents PAC verifying LR + UNSPEC_BTI_NOP ; Represent BTI ]) diff --git a/gcc/testsuite/gcc.target/arm/bti-1.c b/gcc/testsuite/gcc.target/arm/bti-1.c new file mode 100644 index 00000000000..79dd8010d2d --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/bti-1.c @@ -0,0 +1,12 @@ +/* Check that GCC does bti instruction. */ +/* { dg-do compile } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ +/* { dg-options "-march=armv8.1-m.main -mthumb -mfloat-abi=softfp -mbranch-protection=bti --save-temps" } */ + +int +main (void) +{ + return 0; +} + +/* { dg-final { scan-assembler "bti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/bti-2.c b/gcc/testsuite/gcc.target/arm/bti-2.c new file mode 100644 index 00000000000..33910563849 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/bti-2.c @@ -0,0 +1,58 @@ +/* { dg-do compile } */ +/* -Os to create jump table. */ +/* { dg-options "-Os" } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ +/* { dg-options "-march=armv8.1-m.main -mthumb -mfloat-abi=softfp -mbranch-protection=bti --save-temps" } */ + +extern int f1 (void); +extern int f2 (void); +extern int f3 (void); +extern int f4 (void); +extern int f5 (void); +extern int f6 (void); +extern int f7 (void); +extern int f8 (void); +extern int f9 (void); +extern int f10 (void); + +int (*ptr) (void); + +int +f_jump_table (int y, int n) +{ + int i; + for (i = 0; i < n ;i ++) + { + switch (y) + { + case 0 : ptr = f1; break; + case 1 : ptr = f2; break; + case 2 : ptr = f3; break; + case 3 : ptr = f4; break; + case 4 : ptr = f5; break; + case 5 : ptr = f6; break; + case 6 : ptr = f7; break; + case 7 : ptr = f8; break; + case 8 : ptr = f9; break; + case 9 : ptr = f10; break; + default: break; + } + y += ptr (); + } + return (y == 0)? y+1:4; +} + +int +f_label_address () +{ + static void * addr = &&lab1; + goto *addr; +lab1: + addr = &&lab2; + return 1; +lab2: + addr = &&lab1; + return 2; +} + +/* { dg-final { scan-assembler-times "bti" 15 } } */