From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061.outbound.protection.outlook.com [40.107.22.61]) by sourceware.org (Postfix) with ESMTPS id 99DDA3858C50 for ; Tue, 27 Feb 2024 16:31:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 99DDA3858C50 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 99DDA3858C50 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.22.61 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1709051486; cv=pass; b=Sw2Vg10X8vi/LipEBPSed9qZbiRoX6AnXckNwcks5SlK5YmnXGOPaAmeL5Jh9TKLs8r0x3GNnxBe4to8cWshj/RyhB+Bss4CeVnXVjkeDJXzToTASgHHiQ0AroPGSoAUZE3mWZ50KFYJr+lga05Qtk1uzy6dfymrAdJGIAEHwPo= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1709051486; c=relaxed/simple; bh=RejjDxH3/mM+rths7KUnT05b69tWHY+vLo+DZR8fYRc=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=o7YGmZisn/2+gzQa6ZWkwC7u1j6VHN0IXtwmkCo5xH1rCbvyRE5FX/UmsJboUtAZpBnNrKWrrgA4hkjxn5FMyeCBOvJSfj/qKUMV392w0Ey/5C2AVklPeGA6mHQr9kp/1fZiDxYqD8KMGT1rF2QhAredPXGtITPCDUdd6fOkUx0= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=g2vPkqg8cb6YqD2/N884UtS4K74WhoUhH6RZ6g1/LR8duDXjy40JYZ/VIBThQCVxeMLfauTNS6Dn9A0xCMNxqzZ23+tyg5KzlyCCX2OKMfxNupvz5oTMQ7eaW2mgygHyAtp+F36zC5uH+x7fWlRlJihAddsXXGdcN5VpyKya+CCiz6J7/maO9RQEz+V0Z67B4DD/ZXaK09UxoFg71QvPzpN6tdEScqam22LoPIeHXaycm701+HTlCwQcwzOu2GQBqPE/rgjaS7u5GQGRs9NoNUvfOmA2GDuHDfarieeldYR3gINVhn5VYbw2qpElq8Rg1f3wYQ1I0FtISzyakrFaVw== 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=hL8u8JqJAacALezlxaCC10aegr1ZzMHZwdNUEU4dTWo=; b=mSdrFSxCzqknnN5ltBNaaDI8S7seaVMm+FARtiUpSjDOKB1uzEIvichoJHAK2xPeonfhkXf2sWmjw72N5I95ZNIjSe4zJag7PocZSjotpim2a+/WJb9jjxoJ0HdgniqD4/qtzXRMh7bwhYplyOAAnU4CNeG7WsZa7AyPp6xnu5rai4RbkXfakFN+ADeDp631TP7rBM0iAdjfz1rtoiLzQ+DJaqLnpKPdbwm3+XI+BOaF9bcwi6qgruJA1Ox5QivV8M208OUdWuMZIL9LljJwK7upvKNvY+cXemGYM4Izsacz4GyWX6jL7ltKGP41O/BZJb3DPd0icpxPX8XlIo6m+g== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.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] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=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=hL8u8JqJAacALezlxaCC10aegr1ZzMHZwdNUEU4dTWo=; b=IpHlZFWO1HD5c87h8D2nfV5x5QKi/NdTFSWlQFPOsApRVI3hX56zWrUAYVcBl+iWMnk8I2OngypvYOMM8WnKgp/UyFSM35Zlv1j6mzklW1Ix4OzwMg85MA997N1yRgQk0u0/0CWYIkuziiUou0Zzcp926/XEszMsWyg/mBAroxA= Received: from DU2PR04CA0346.eurprd04.prod.outlook.com (2603:10a6:10:2b4::33) by DU2PR08MB10040.eurprd08.prod.outlook.com (2603:10a6:10:49f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Tue, 27 Feb 2024 16:31:21 +0000 Received: from DU2PEPF00028D0A.eurprd03.prod.outlook.com (2603:10a6:10:2b4:cafe::9) by DU2PR04CA0346.outlook.office365.com (2603:10a6:10:2b4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Tue, 27 Feb 2024 16:31:21 +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 DU2PEPF00028D0A.mail.protection.outlook.com (10.167.242.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Tue, 27 Feb 2024 16:31:21 +0000 Received: ("Tessian outbound a6e56d06a0e4:v228"); Tue, 27 Feb 2024 16:31:21 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 32509670adca59aa X-CR-MTA-TID: 64aa7808 Received: from c7125ef61277.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id AE8E067E-3C74-4B35-A4D9-8F263ABECFB4.1; Tue, 27 Feb 2024 16:31:14 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c7125ef61277.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 27 Feb 2024 16:31:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a8Ye/t9g6Y9cSLwBQIRDem/jLVNK3sxaaZSBgxKKQxF/5rrG4bdUPn+6ghlkV+X1cWgdkSSkA+KD2R0FUq9a/11uRL+DEpikHE22xDl66AcvF29JcKY8EjfwuAPds/RzG7axYeRBqPt4NGpEcRgUNrID98qyetRQws4lDsqgxLOeZupQuWtgNyWv55+FD7PXZBtXI4a3YlFl1elJW+o8umWh/FGAH2zKRjDcsJGGu2ANyeZ3uiY2CAEA23zdu+c8zR+6zqScRhYfUJARpDSsKmxxXxJZsNOMgIaamL7whdYs9qsCkeplPRAAPw3m3KkYyd2qDv0aniuMZCO5KLry3g== 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=hL8u8JqJAacALezlxaCC10aegr1ZzMHZwdNUEU4dTWo=; b=NIUmfTovlHTb3crt6Z1a4ieKUeSkB6eNdiFfes8c7bJVGDXwZ4W3A81ZabxWZ5LGzqwYHsDWkFvwYUfcUkQfP4Ad5oi2E2v+S1pmN1VLV8Z087HeYuh96aA9gjN8KnWrVkcC8kvUQLabXGKuf8KivF/PuuUChWHIqQxesvrDc0wtWqWITlXu6eud2l5xFaXIng2F4qERCRQlLL7mhJ28MWqdyozxDKC96/N8nZEqcURt8FFZfdh7+5IqEP4wgASJgkYK1zbSGNN5aGJB2zrqTP7i0EH5w/RzrdX170dflLR5bRX54uI9T3xV/aDHTWgIGJv8kltn7mcTuIDNuYcSGg== 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 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=hL8u8JqJAacALezlxaCC10aegr1ZzMHZwdNUEU4dTWo=; b=IpHlZFWO1HD5c87h8D2nfV5x5QKi/NdTFSWlQFPOsApRVI3hX56zWrUAYVcBl+iWMnk8I2OngypvYOMM8WnKgp/UyFSM35Zlv1j6mzklW1Ix4OzwMg85MA997N1yRgQk0u0/0CWYIkuziiUou0Zzcp926/XEszMsWyg/mBAroxA= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6678.eurprd08.prod.outlook.com (2603:10a6:20b:398::8) by PA6PR08MB10784.eurprd08.prod.outlook.com (2603:10a6:102:3d6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Tue, 27 Feb 2024 16:31:12 +0000 Received: from AS8PR08MB6678.eurprd08.prod.outlook.com ([fe80::a997:a5ad:3e6:44b6]) by AS8PR08MB6678.eurprd08.prod.outlook.com ([fe80::a997:a5ad:3e6:44b6%4]) with mapi id 15.20.7316.035; Tue, 27 Feb 2024 16:31:12 +0000 Date: Tue, 27 Feb 2024 16:31:09 +0000 From: Andrew Carlotti To: Matthieu Longo Cc: binutils@sourceware.org, Richard Earnshaw , Nick Clifton Subject: Re: [PATCH v1 4/4] aarch64: testsuite: share test utils macros and use them Message-ID: References: <20240227105917.295899-1-matthieu.longo@arm.com> <20240227105917.295899-5-matthieu.longo@arm.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240227105917.295899-5-matthieu.longo@arm.com> X-ClientProxiedBy: LO4P123CA0110.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:192::7) To AS8PR08MB6678.eurprd08.prod.outlook.com (2603:10a6:20b:398::8) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR08MB6678:EE_|PA6PR08MB10784:EE_|DU2PEPF00028D0A:EE_|DU2PR08MB10040:EE_ X-MS-Office365-Filtering-Correlation-Id: aaf83b0c-6b5a-43dd-ca18-08dc37b18853 X-LD-Processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr 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: qftAt2gWj/n2nB3LKZWIGFnGyAeu0J9KkX6bHH9wfbgO21YpptE3V28dcghVDfJ20c1CIzcpDZ7ytBw36Py4n6T1PzR/AMCkU4QhYhsAFgJ3sVuMSykCJWi0SbLqtd6HwI+6wK0DB/k4c76x3I+D+/d7AxWgYET2dQDhDwbGQmI2Wt1iPNKGLrJqrl2kXek55+y2wJjcyxv4GaXM/tSoHOSlsV5iU3q5q2oAkcalyU2BJEM+rR8/ZxVOOdZ/vvfTOFBhoqyvz3WXBMOLmVj4RhsekDEYscQZ/2gbqq3RbAwMyJOs1T6B50HUsPqJ05xTKcEq7Ik03fa5aawFZU4GkkfCnqtHX2yAX/p3amdIph7I6JOxlTfP2XchV/bMcCMKP9UFqluH660ZsJnAQ9SLVXzfyVEaTlLfKomOpXxJ6xLMyxISW8RAiOFFAXVE5CBDI394MCfOWYGgHsbInBXOoSla+REMh0UFZVd0HqCKDe2PH3fsjVL4jH4byEI124EoU8P8L8nFMpzXrDBlUJS6zf8r1aUHoUFUm2vzMCBqFcMyCt702tPuHZzwMeFSgIgGv0BJxOy4zHNquopfScTBymHqVKp+eg+C3tvQdBG1zmJ45xulbK0R7RkacAO6BpS40H0Ckt8odXd+A3SFBDop5g== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB6678.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA6PR08MB10784 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: DU2PEPF00028D0A.eurprd03.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: fe11fdf9-fd3f-49fa-4674-08dc37b1830e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fGPSRzqCKoZceVIFiGk4ONAav32Gdf66swedWm0WqNspexcsXERQzjrYET8A5YDhtR7JSRqUkgwIYHmqufnlrHazA43NjD/HHGAFnKlTkIOQ238lw10Os6Gs0gBIGxaWCJM4FV1ZTtn93Xi5KmTsFOfC8T4/MqV+SJ6hVSd8DkcnSyIfKIglrBGr7OgkynOPphqfEWj2InnLerRb5UCNIMs2v/Ky2RxV4Gl1zXwcKO4/y9iaMkSl/ryAi+Kfv3zUdXaixtpK43dYb4GYECYmodKFSs9Yic6Tf+XnkDoz9SkSFB9imVOQYRvN0SDPrzp7JlCFkxBWD0TJ3KQ3NkKz41zWpXF39h8fbXG3hOooy6JkiA1c+zWAp9PDudrAAYiR3v8aGy6SzkDq1jUY/+ZT79Os4e4IJRGAFqhW6B3HBGkAo9vTfL64SS0JsG4a+RTs9hCq5kI8zQBV77lILUBqJ43RuXEzlMYmbMEE6E9L+jeNSJWSIZknlFTB9IBhafHd0U3AVydivXonTN0NLewZWXd4ILbQTuCW9eKSt67ri/gxLCnfVYx7BWO1aB/yo4BZfUTkOhpLERYqVafnKBvv3du+mdVrYjdOi6t4jqDmszdT0lNm0LaIfQPLn/QivONZ+bP8dqzjgje05Xr6VcQNCKjHYCBhuP5uACM8M7U4QEw0BGp2D3/7jcKEddfM+daFtXt26wk97YDiK6jy+FDcChGqLEqf58IuyMrR2BPg1x77zP8pTXRgaCnmUL2Pl4Nr 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)(36860700004)(82310400014);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 16:31:21.5699 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aaf83b0c-6b5a-43dd-ca18-08dc37b18853 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: DU2PEPF00028D0A.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB10040 X-Spam-Status: No, score=-12.2 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,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 List-Id: On Tue, Feb 27, 2024 at 10:59:17AM +0000, Matthieu Longo wrote: > > This patch rewrites assembly tests to use utils macros declared in > sysreg-test-utils.inc. Some tests were adapted to use the new macro > rw_sys_reg. > --- > .../aarch64/sysreg/armv8_9-a-sysregs-bad.d | 2 +- > .../aarch64/sysreg/armv8_9-a-sysregs-bad.l | 90 ++++- > .../gas/aarch64/sysreg/armv8_9-a-sysregs.d | 3 +- > .../gas/aarch64/sysreg/armv8_9-a-sysregs.s | 139 +++---- > .../gas/aarch64/sysreg/illegal-sysreg-3.d | 2 +- > .../gas/aarch64/sysreg/illegal-sysreg-4.d | 2 +- > gas/testsuite/gas/aarch64/sysreg/sysreg-1.d | 2 + > gas/testsuite/gas/aarch64/sysreg/sysreg-1.s | 223 ++++++------ > gas/testsuite/gas/aarch64/sysreg/sysreg-2.d | 3 +- > gas/testsuite/gas/aarch64/sysreg/sysreg-2.s | 47 ++- > gas/testsuite/gas/aarch64/sysreg/sysreg-3.d | 3 +- > gas/testsuite/gas/aarch64/sysreg/sysreg-3.s | 25 +- > gas/testsuite/gas/aarch64/sysreg/sysreg-6.d | 2 + > gas/testsuite/gas/aarch64/sysreg/sysreg-6.s | 7 +- > gas/testsuite/gas/aarch64/sysreg/sysreg-7.d | 2 + > gas/testsuite/gas/aarch64/sysreg/sysreg-7.s | 32 +- > gas/testsuite/gas/aarch64/sysreg/sysreg-8.d | 2 + > gas/testsuite/gas/aarch64/sysreg/sysreg-8.s | 339 +++++++++--------- > .../gas/aarch64/sysreg/sysreg-test-utils.inc | 32 ++ > gas/testsuite/gas/aarch64/sysreg/sysreg.d | 6 +- > gas/testsuite/gas/aarch64/sysreg/sysreg.s | 63 ++-- > gas/testsuite/gas/aarch64/sysreg/sysreg128.d | 42 +-- > gas/testsuite/gas/aarch64/sysreg/sysreg128.s | 27 +- > 23 files changed, 576 insertions(+), 519 deletions(-) > create mode 100644 gas/testsuite/gas/aarch64/sysreg/sysreg-test-utils.inc > ... > diff --git a/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs.s b/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs.s > index bf9019c9ac8..318d8bb9097 100644 > --- a/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs.s > +++ b/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs.s > @@ -1,32 +1,23 @@ > - msr PMSDSFR_EL1, x3 > - mrs x3, PMSDSFR_EL1 > + .include "sysreg-test-utils.inc" > + > +.text > + rw_sys_reg sys_reg=PMSDSFR_EL1 xreg=x3 r=1 w=1 > > mrs x0, ERXGSR_EL1 > > - msr SCTLR2_EL1, x3 > - mrs x3, SCTLR2_EL1 > - msr SCTLR2_EL12, x3 > - mrs x3, SCTLR2_EL12 > - msr SCTLR2_EL2, x3 > - mrs x3, SCTLR2_EL2 > - msr SCTLR2_EL3, x3 > - mrs x3, SCTLR2_EL3 > - > - msr HDFGRTR2_EL2, x3 > - mrs x3, HDFGRTR2_EL2 > - msr HDFGWTR2_EL2, x3 > - mrs x3, HDFGWTR2_EL2 > - msr HFGRTR2_EL2, x3 > - mrs x3, HFGRTR2_EL2 > - msr HFGWTR2_EL2, x3 > - mrs x3, HFGWTR2_EL2 > - > - msr PFAR_EL1, x0 > - mrs x0, PFAR_EL1 > - msr PFAR_EL2, x0 > - mrs x0, PFAR_EL2 > - msr PFAR_EL12, x0 > - mrs x0, PFAR_EL12 > + rw_sys_reg sys_reg=SCTLR2_EL1 xreg=x3 r=1 w=1 > + rw_sys_reg sys_reg=SCTLR2_EL12 xreg=x3 r=1 w=1 > + rw_sys_reg sys_reg=SCTLR2_EL2 xreg=x3 r=1 w=1 > + rw_sys_reg sys_reg=SCTLR2_EL3 xreg=x3 r=1 w=1 > + > + rw_sys_reg sys_reg=HDFGRTR2_EL2 xreg=x3 r=1 w=1 > + rw_sys_reg sys_reg=HDFGWTR2_EL2 xreg=x3 r=1 w=1 > + rw_sys_reg sys_reg=HFGRTR2_EL2 xreg=x3 r=1 w=1 > + rw_sys_reg sys_reg=HFGWTR2_EL2 xreg=x3 r=1 w=1 > + > + rw_sys_reg sys_reg=PFAR_EL1 xreg=x0 r=1 w=1 > + rw_sys_reg sys_reg=PFAR_EL2 xreg=x0 r=1 w=1 > + rw_sys_reg sys_reg=PFAR_EL12 xreg=x0 r=1 w=1 This may be just my preference, and I know you're just extending existing practice here, but I'm not keen on hiding the actual instructions away behind macros (especially if there's little or no reduction in the size of the assembly file). I think it makes it harder to check that the input assembly matches the output assembly, and I've seen several cases recently where such discrepancies were missed. It also adds lots of macro invocation messages to the error check files. In the case of a large multidimensional cross-product of operand values it might make more sense to use macros, but in that case you'd still need to check and include the full assembly contents in the .d file. You can probably get equally effective test coverage in most cases by just checking each dimension separately anyway.