From patchwork Fri Aug 4 12:00:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 131128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp208839vqb; Fri, 4 Aug 2023 05:01:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF9vIhQF5hLn8fRdrdSGPlUzrw/tlQoD1W9tKhyY24GXYsFv+3nyYc1I+9DZPkNy1+ekXWN X-Received: by 2002:a19:4f5e:0:b0:4fb:9105:58b0 with SMTP id a30-20020a194f5e000000b004fb910558b0mr1112991lfk.20.1691150499133; Fri, 04 Aug 2023 05:01:39 -0700 (PDT) Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id t26-20020aa7d4da000000b0052315fc2ee2si1504687edr.538.2023.08.04.05.01.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 05:01:39 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Biou+8Fq; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7B22A3857006 for ; Fri, 4 Aug 2023 12:01:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B22A3857006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1691150486; bh=Jak6G7zGNf42AudG1H4mLP98GIiSMw/O5IlvecMEWxk=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Biou+8Fq6aq7SYN4mFYDabxm8flGiGKbXw/91+XQ+RbAKeIt1KMRHZ0Mcq0J1PhLH Y1A0H3rWVxvw7g60bdd1i+ogR7IKPzEfhWoqDhyqQQK0eelYgDFErpWaN2+qYMNqyJ H5I7SmzQvCDZhs0mpeE1hzo6eIgXK/kK7bttEh/I= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2079.outbound.protection.outlook.com [40.107.13.79]) by sourceware.org (Postfix) with ESMTPS id A9A34385773C for ; Fri, 4 Aug 2023 12:01:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A9A34385773C ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xkdn+tKhf2hUM1Q6v3c0bkS7B3l5Mcqm/uz5R9nf9exRsWJWPq/s977KMGXnCBvQF36XwgQnvJHRs4pR3Z+0JinKO7L0WfqAxSK9kG1LxpddUI/Pbx61j8925lUMUNv9W4ECW+p7R5hjhbs53b9K7dkX1D0cUMdRa+Wn6gZHqIYTITun11ZCHYXaFKYDpgNKFQ7uuBaH0dDDdyl3IsdYyiZNSdCDY+1wmWnp66ErW3GBPao07rf9IivohBLB+579KX2otBaDKF4gB+fH7RtMbOMJqxGdum8vMrjWWrUEiAiglL1hk7nHrVcn9TsDO0z5tvB8X8jeGZD1S34Ch/nr/g== 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=Jak6G7zGNf42AudG1H4mLP98GIiSMw/O5IlvecMEWxk=; b=LjQ1RhAW35UI1oa0rVcQ3Wh6V+LiD/CYR+N2xYLTBq+E0CXpiv32iz99L/hq5fPE5zYdyp6z0bl3SBIraL8RDZNT5Fb2dVnJUqcmJEsBuVJDAS0mMN3mcZPoR5iwalj0njK9vdLWlf6XKKZXlGwmiuHdIYlzjLeOKimHQH2j8hxytFzmUc6Jcl1o16/7y0n8KL46KSoPLkRsGDFhGX+4KF/Cw4L2eR1ltcpsszbdoAxCV+Ox1Dqv8IdVThcMgC6qIU+xaBKYetWAbA/nmhBYWgRoghT6I7Uj7gjPZHvdzC+mEJk53l653+ePsqx0qSde9kdTyaqAPINdo3rI6oinoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by PAXPR04MB8489.eurprd04.prod.outlook.com (2603:10a6:102:1dd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.21; Fri, 4 Aug 2023 12:01:00 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6631.046; Fri, 4 Aug 2023 12:00:59 +0000 Message-ID: Date: Fri, 4 Aug 2023 14:00:57 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Content-Language: en-US To: Binutils Cc: Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , Fangrui Song Subject: [PATCH] RISC-V: move various alias entries X-ClientProxiedBy: FR0P281CA0202.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::17) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|PAXPR04MB8489:EE_ X-MS-Office365-Filtering-Correlation-Id: a06f984f-6e20-47c5-d3e9-08db94e277e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yYYnYkL419qvR1EIFQDdYsT5U0d3gv2zuHfOQx6+AFxFkxTJOxmlCjfIHFa0zN23/o1lzRpjCgeeqh+mz3XKwanExo5mS/t2fefwNWL7gvYXY3D9KJQ+EPj0xKvx1YQt1juQ5FdGew6wNMuNv08nUpeQnAx0g9kdY/784yBIefUt2PqAJ8u1VGzJHo4gNyh1AFPEeUyjFbzF1qciD4+5jiuyejrQnhw862vuiwMTrUHYHvKWlfUSn5pHjZyZIHy3c2HfPxpLZCZQJaNIgLjA1b1Fnb6h/6afQayBam/eItfjx+Yu+ivJ2ny6teo/96ixktXotPSzbR5WWWF6oIZ/+xE5DLAwB/hVa/EKUg2zLP5ujYEqvW9/ZWlD3/jlCNE4eRNf+ndsjhkWzEqgs1UHMi2S41oUyL3XSRzjFuGn3VoYWl9Jc0s1N0mujXgRukf7qSEGPGdwmoqwNEy9zZxI5dT9sL72fdXcUhrFORHYzuiBeVDMCg/Vt/pNPv9LiOunH/+NORDRnNLcFM1dH5SUVdO2tuSezDywDZq9YYqqhyaU2WKHOrKF0BGuEVFEqzWpTQHQrMpuKlUAOMJjitOeuvDEPczHkMDf4woajTFJ6HUEKKhBue9jlbyXSpn2pcNVFRIHztXmT1VPHXymL6Jsp8AAWen7jwUu5kQVQF2lZKw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8790.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(396003)(136003)(376002)(346002)(366004)(39860400002)(1800799003)(186006)(451199021)(2906002)(30864003)(36756003)(2616005)(26005)(6506007)(31696002)(86362001)(66476007)(6916009)(66556008)(66946007)(4326008)(38100700002)(41300700001)(316002)(6486002)(6512007)(54906003)(478600001)(31686004)(8676002)(8936002)(5660300002)(45980500001)(43740500002)(559001)(579004)(473944003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?w3tpOMAh79P7Nfv5c12wmOr2I0Td?= =?utf-8?q?w1mvljxAStlUwopwDmadmKN45ZpMmRcUxcmJ6oUGe7Ahs8KqHU0HPKHmlk2wg0KXK?= =?utf-8?q?gZaxBdNmIqQE1a2Loo6ZVy8gEikG9GrqVnkwPp8Jne3O0dw9u7r9dFTkaDYvye5Qe?= =?utf-8?q?fjmIQgFQeUyBYZuQeJPpFokdGFIx6nwmcUu1+HdTCYEf1aDIt8WdWuWTQLkUBPDKo?= =?utf-8?q?O6oNfKqv2qPxhemY4OC8Hd0JeiBf5qjfHBnglmmAybzf9G4eA0jQa2b9moQObi+5Y?= =?utf-8?q?MgDLJyQ+1C85noep2yPegffGRCo0HcQa9LpvWqFoQK8rA22u+by1KNR6QfuwAKjk5?= =?utf-8?q?YkzGUkDXQaKk38KTVmAyv9eSWqaQEcqLnHOSmXSKstd6pd02uD5AYCZnvyGRHmblx?= =?utf-8?q?B+FNltqTcSk3TNbboAoe7xPHC9HUlNHtjN6IHFK6Ecz5ZDexM5Sp4JH0biJoxwcCa?= =?utf-8?q?aRmWnKjaIyLP5KfJfXAMAzlGyEubN06QgyTDyfsN5/Ezz9qcrlPrOpdM5NVSKZKjS?= =?utf-8?q?P11enyYkFp2K2fvTHRFJp42oCyrcYgkvLe+YxfHwHNVwSGDVQZk0wwfV53kMQNbr0?= =?utf-8?q?DwJPDp3lqazE1QUdzvPwbRFNkY3lzHPexIR/xRJOUYzpImVtWNKayvIPqILaSN4J2?= =?utf-8?q?1nJN5nuiomoxyZcaP5U1avz5ZB3fdLU86Jan93qYjuC547us0N7NPlj7ZOHayzS2P?= =?utf-8?q?TJWmdmhamuM+BivaAw7OIXoHKNMcR4NneKNzu9Lo2fxr7ljlootSZz7PxutV15hDb?= =?utf-8?q?hBv/3WEEtqyVOfLdfwUvKyfSXtdV97m1tzZlZ4x7N69plSdISCfijR2HfxWdiTsPm?= =?utf-8?q?NlDyuAW3EnLycUokb2RUek0FxMW9Rh4cq+1gNtQ+jeKjaK6mn4PzFU2wKBVuQoili?= =?utf-8?q?uBidCoV0OlngV7uLpNulgHwHGvUIPzQ27W3D2wjm9T2lwC7UNYYrrQm7U1ScWCC3I?= =?utf-8?q?W69R3OZbzuG+BxzCxDZsCD1JN+moPFO3x8ZkXKphUG+6o3az0z8HZ1eETXPhe4gRI?= =?utf-8?q?7YCLQSwXlDD99Cy3PgokN+1Ke52g7JJtyZrQM+WOKpTYaxDCKJase4GYapmeZvuKa?= =?utf-8?q?3Id1xs83PxjolHwee2pZOZoGbmap8nOLi0kaaAR8ob2ZBJVN1p7yb7XrehkpEUDqr?= =?utf-8?q?PAAv6LfIKMRTWKqpqAeub3ew3jCDCQCDLmdBEPNm9mnckA2AbEL0DtIerj0wvZrlV?= =?utf-8?q?2RhqVVL46eAPp7Bq40CE30u6eCqvZ8YrPLwwdMwNuqIAp8h6berhkRKvqQzzjDvBD?= =?utf-8?q?QuZ7C+zrDp2SJbMhWTIMqwbEMwfR/NhlikLoiWP6pYVQ4pPUG+WIw40jcKy4zudpN?= =?utf-8?q?n0UtWQlfaUAEEWgqHRoEcF4N5YEyf3u1PUihR6q5YAO25UGmYGxWhU2p7ncIwUx+l?= =?utf-8?q?/MxYMpFNAzjLxoAKGg1NdQ5KVSyjJiC9gKQjZjQSQF1d8ZlBfYsiFuZ/8bQ6cd4R3?= =?utf-8?q?0NVpmPhnJLUHZkjCurkL82jUtxlrg8HchLhlIiaejK9a34ztIdq0jjCEZrO9+o1Xc?= =?utf-8?q?lxHFca0sCYKE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a06f984f-6e20-47c5-d3e9-08db94e277e7 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2023 12:00:59.9429 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JVyjKkdntLQ4XU+4Tb+LD+H4bZaAq/dtK04XNuK/02yE0Q7nctksyEfx5Rqt4eNzWFvyTg4Buc0jC/xLP8xPTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8489 X-Spam-Status: No, score=-3027.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773299825827457839 X-GMAIL-MSGID: 1773299825827457839 For disassembly to only use spec-mandated aliases, respective non-alias entries need to come ahead of their alias ones. Since identical mnemonics need to stay together, whole groups are moved up where necessary. This partly reverts 839189bc932e ("RISC-V: re-arrange opcode table for consistent alias handling"), but then also goes beyond a plain revert. Reviewed-by: Tsukasa OI Reviewed-by: Palmer Dabbelt --- I did not adjust JAL back, to continue to match JALR. The spec doesn't spell out how operands are to be specified, and hence it also doesn't mention how many explicit ones there are supposed to be. What about NEG, NEGW, and RET (and perhaps more)? The spec doesn't know of those afaics. --- a/gas/testsuite/gas/riscv/b-ext.d +++ b/gas/testsuite/gas/riscv/b-ext.d @@ -23,8 +23,8 @@ Disassembly of section .text: [ ]+30:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 [ ]+34:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 [ ]+38:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 -[ ]+3c:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 -[ ]+40:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+3c:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+40:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 [ ]+44:[ ]+69855513[ ]+rev8[ ]+a0,a0 [ ]+48:[ ]+28755513[ ]+orc.b[ ]+a0,a0 [ ]+4c:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 @@ -33,19 +33,19 @@ Disassembly of section .text: [ ]+58:[ ]+0ac59533[ ]+clmul[ ]+a0,a1,a2 [ ]+5c:[ ]+0ac5b533[ ]+clmulh[ ]+a0,a1,a2 [ ]+60:[ ]+0ac5a533[ ]+clmulr[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclr[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+28059513[ ]+bset[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+68059513[ ]+binv[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bext[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f [ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f --- a/gas/testsuite/gas/riscv/b-ext-64.d +++ b/gas/testsuite/gas/riscv/b-ext-64.d @@ -23,8 +23,8 @@ Disassembly of section .text: [ ]+30:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 [ ]+34:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 [ ]+38:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 -[ ]+3c:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 -[ ]+40:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+3c:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+40:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 [ ]+44:[ ]+6b855513[ ]+rev8[ ]+a0,a0 [ ]+48:[ ]+28755513[ ]+orc.b[ ]+a0,a0 [ ]+4c:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 @@ -38,35 +38,35 @@ Disassembly of section .text: [ ]+6c:[ ]+6025151b[ ]+cpopw[ ]+a0,a0 [ ]+70:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 [ ]+74:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 -[ ]+78:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 -[ ]+7c:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 +[ ]+78:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 +[ ]+7c:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 [ ]+80:[ ]+20c5a53b[ ]+sh1add.uw[ ]+a0,a1,a2 [ ]+84:[ ]+20c5c53b[ ]+sh2add.uw[ ]+a0,a1,a2 [ ]+88:[ ]+20c5e53b[ ]+sh3add.uw[ ]+a0,a1,a2 [ ]+8c:[ ]+08c5853b[ ]+add.uw[ ]+a0,a1,a2 [ ]+90:[ ]+0805853b[ ]+zext.w[ ]+a0,a1 [ ]+94:[ ]+0825951b[ ]+slli.uw[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclr[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+28059513[ ]+bset[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+68059513[ ]+binv[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bext[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclr[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bset[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binv[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bext[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f [ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclr[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bset[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binv[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bext[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f --- a/gas/testsuite/gas/riscv/b-ext-64-na.d +++ /dev/null @@ -1,72 +0,0 @@ -#as: -march=rv64i_zba_zbb_zbc_zbs -#source: b-ext-64.s -#objdump: -d -Mno-aliases - -.*:[ ]+file format .* - - -Disassembly of section .text: - -0+000 : -[ ]+[0-9a-f]+:[ ]+60051513[ ]+clz[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60151513[ ]+ctz[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60251513[ ]+cpop[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+0ac5c533[ ]+min[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5d533[ ]+minu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5e533[ ]+max[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5f533[ ]+maxu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60451513[ ]+sext\.b[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60551513[ ]+sext\.h[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+0805453b[ ]+zext\.h[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+6b855513[ ]+rev8[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+28755513[ ]+orc\.b[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+20c5c533[ ]+sh2add[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+20c5e533[ ]+sh3add[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac59533[ ]+clmul[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5b533[ ]+clmulh[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5a533[ ]+clmulr[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6005151b[ ]+clzw[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+6015151b[ ]+ctzw[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+6025151b[ ]+cpopw[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+20c5a53b[ ]+sh1add\.uw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+20c5c53b[ ]+sh2add\.uw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+20c5e53b[ ]+sh3add\.uw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+08c5853b[ ]+add\.uw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0805853b[ ]+add\.uw[ ]+a0,a1,zero -[ ]+[0-9a-f]+:[ ]+0825951b[ ]+slli\.uw[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f --- a/gas/testsuite/gas/riscv/b-ext-na.d +++ /dev/null @@ -1,51 +0,0 @@ -#as: -march=rv32i_zba_zbb_zbc_zbs -#source: b-ext.s -#objdump: -d -Mno-aliases - -.*:[ ]+file format .* - - -Disassembly of section .text: - -0+000 : -[ ]+[0-9a-f]+:[ ]+60051513[ ]+clz[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60151513[ ]+ctz[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60251513[ ]+cpop[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+0ac5c533[ ]+min[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5d533[ ]+minu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5e533[ ]+max[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5f533[ ]+maxu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60451513[ ]+sext\.b[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+60551513[ ]+sext\.h[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+08054533[ ]+zext\.h[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+69855513[ ]+rev8[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+28755513[ ]+orc\.b[ ]+a0,a0 -[ ]+[0-9a-f]+:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+20c5c533[ ]+sh2add[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+20c5e533[ ]+sh3add[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac59533[ ]+clmul[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5b533[ ]+clmulh[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+0ac5a533[ ]+clmulr[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f --- a/gas/testsuite/gas/riscv/c-zero-imm.d +++ b/gas/testsuite/gas/riscv/c-zero-imm.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+000 <.text>: [ ]+0:[ ]+4501[ ]+li[ ]+a0,0 [ ]+2:[ ]+4581[ ]+li[ ]+a1,0 -[ ]+4:[ ]+8a01[ ]+and[ ]+a2,a2,0 -[ ]+6:[ ]+8a81[ ]+and[ ]+a3,a3,0 +[ ]+4:[ ]+8a01[ ]+andi[ ]+a2,a2,0 +[ ]+6:[ ]+8a81[ ]+andi[ ]+a3,a3,0 [ ]+8:[ ]+0001[ ]+nop [ ]+a:[ ]+873a[ ]+mv[ ]+a4,a4 -[ ]+c:[ ]+0781[ ]+add[ ]+a5,a5,0 -[ ]+e:[ ]+00051513[ ]+sll[ ]+a0,a0,0x0 -[ ]+12:[ ]+0005d593[ ]+srl[ ]+a1,a1,0x0 -[ ]+16:[ ]+40065613[ ]+sra[ ]+a2,a2,0x0 +[ ]+c:[ ]+0781[ ]+addi[ ]+a5,a5,0 +[ ]+e:[ ]+00051513[ ]+slli[ ]+a0,a0,0x0 +[ ]+12:[ ]+0005d593[ ]+srli[ ]+a1,a1,0x0 +[ ]+16:[ ]+40065613[ ]+srai[ ]+a2,a2,0x0 [ ]+1a:[ ]+0682[ ]+c.slli64[ ]+a3 [ ]+1c:[ ]+8301[ ]+c.srli64[ ]+a4 [ ]+1e:[ ]+8781[ ]+c.srai64[ ]+a5 --- a/gas/testsuite/gas/riscv/c-zero-imm-na.d +++ /dev/null @@ -1,24 +0,0 @@ -#as: -#source: c-zero-imm.s -#objdump: -dr -Mno-aliases - -.*:[ ]+file format .* - - -Disassembly of section .text: - -0+000 <.text>: -[ ]+[0-9a-f]+:[ ]+4501[ ]+c\.li[ ]+a0,0 -[ ]+[0-9a-f]+:[ ]+4581[ ]+c\.li[ ]+a1,0 -[ ]+[0-9a-f]+:[ ]+8a01[ ]+c\.andi[ ]+a2,0 -[ ]+[0-9a-f]+:[ ]+8a81[ ]+c\.andi[ ]+a3,0 -[ ]+[0-9a-f]+:[ ]+0001[ ]+c\.addi[ ]+zero,0 -[ ]+[0-9a-f]+:[ ]+873a[ ]+c\.mv[ ]+a4,a4 -[ ]+[0-9a-f]+:[ ]+0781[ ]+c\.addi[ ]+a5,0 -[ ]+[0-9a-f]+:[ ]+00051513[ ]+slli[ ]+a0,a0,0x0 -[ ]+[0-9a-f]+:[ ]+0005d593[ ]+srli[ ]+a1,a1,0x0 -[ ]+[0-9a-f]+:[ ]+40065613[ ]+srai[ ]+a2,a2,0x0 -[ ]+[0-9a-f]+:[ ]+0682[ ]+c\.slli64[ ]+a3 -[ ]+[0-9a-f]+:[ ]+8301[ ]+c\.srli64[ ]+a4 -[ ]+[0-9a-f]+:[ ]+8781[ ]+c\.srai64[ ]+a5 -#... --- a/gas/testsuite/gas/riscv/c-zero-reg.d +++ b/gas/testsuite/gas/riscv/c-zero-reg.d @@ -14,7 +14,7 @@ Disassembly of section .text: [ ]+8:[ ]+9006[ ]+c.add[ ]+zero,ra [ ]+a:[ ]+00500013[ ]+li[ ]+zero,5 [ ]+e:[ ]+00006037[ ]+lui[ ]+zero,0x6 -[ ]+12:[ ]+00701013[ ]+sll[ ]+zero,zero,0x7 +[ ]+12:[ ]+00701013[ ]+slli[ ]+zero,zero,0x7 [ ]+16:[ ]+00008013[ ]+mv[ ]+zero,ra [ ]+1a:[ ]+00100033[ ]+add[ ]+zero,zero,ra #... --- a/gas/testsuite/gas/riscv/csr-insns-pseudo.d +++ b/gas/testsuite/gas/riscv/csr-insns-pseudo.d @@ -12,9 +12,9 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+00029073[ ]+csrw[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002a073[ ]+csrs[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002b073[ ]+csrc[ ]+ustatus,t0 -[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrw[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrs[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrc[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrwi[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrsi[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrci[ ]+ustatus,31 [ ]+[0-9a-f]+:[ ]+c00022f3[ ]+rdcycle[ ]+t0 [ ]+[0-9a-f]+:[ ]+c01022f3[ ]+rdtime[ ]+t0 [ ]+[0-9a-f]+:[ ]+c02022f3[ ]+rdinstret[ ]+t0 --- a/gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d +++ b/gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d @@ -12,9 +12,9 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+00029073[ ]+csrw[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002a073[ ]+csrs[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002b073[ ]+csrc[ ]+ustatus,t0 -[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrw[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrs[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrc[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrwi[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrsi[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrci[ ]+ustatus,31 [ ]+[0-9a-f]+:[ ]+c00022f3[ ]+rdcycle[ ]+t0 [ ]+[0-9a-f]+:[ ]+c01022f3[ ]+rdtime[ ]+t0 [ ]+[0-9a-f]+:[ ]+c02022f3[ ]+rdinstret[ ]+t0 --- a/gas/testsuite/gas/riscv/dis-addr-addiw-a.d +++ b/gas/testsuite/gas/riscv/dis-addr-addiw-a.d @@ -9,10 +9,10 @@ Disassembly of section .text: 0+ffffffe0 <_start>: [ ]+ffffffe0:[ ]+00000297[ ]+auipc[ ]+t0,0x0 -[ ]+ffffffe4:[ ]+0182831b[ ]+addw[ ]+t1,t0,24 # fffffffffffffff8 +[ ]+ffffffe4:[ ]+0182831b[ ]+addiw[ ]+t1,t0,24 # fffffffffffffff8 [ ]+ffffffe8:[ ]+00000397[ ]+auipc[ ]+t2,0x0 -[ ]+ffffffec:[ ]+01c38e1b[ ]+addw[ ]+t3,t2,28 # 4 +[ ]+ffffffec:[ ]+01c38e1b[ ]+addiw[ ]+t3,t2,28 # 4 [ ]+fffffff0:[ ]+00000e97[ ]+auipc[ ]+t4,0x0 -[ ]+fffffff4:[ ]+2eb1[ ]+addw[ ]+t4,t4,12 # fffffffffffffffc +[ ]+fffffff4:[ ]+2eb1[ ]+addiw[ ]+t4,t4,12 # fffffffffffffffc [ ]+fffffff6:[ ]+00000f17[ ]+auipc[ ]+t5,0x0 -[ ]+fffffffa:[ ]+2f49[ ]+addw[ ]+t5,t5,18 # 8 +[ ]+fffffffa:[ ]+2f49[ ]+addiw[ ]+t5,t5,18 # 8 --- a/gas/testsuite/gas/riscv/dis-addr-addiw-b.d +++ b/gas/testsuite/gas/riscv/dis-addr-addiw-b.d @@ -9,10 +9,10 @@ Disassembly of section .text: 0+7fffffe0 <_start>: [ ]+7fffffe0:[ ]+00000297[ ]+auipc[ ]+t0,0x0 -[ ]+7fffffe4:[ ]+0182831b[ ]+addw[ ]+t1,t0,24 # 7ffffff8 +[ ]+7fffffe4:[ ]+0182831b[ ]+addiw[ ]+t1,t0,24 # 7ffffff8 [ ]+7fffffe8:[ ]+00000397[ ]+auipc[ ]+t2,0x0 -[ ]+7fffffec:[ ]+01c38e1b[ ]+addw[ ]+t3,t2,28 # ffffffff80000004 +[ ]+7fffffec:[ ]+01c38e1b[ ]+addiw[ ]+t3,t2,28 # ffffffff80000004 [ ]+7ffffff0:[ ]+00000e97[ ]+auipc[ ]+t4,0x0 -[ ]+7ffffff4:[ ]+2eb1[ ]+addw[ ]+t4,t4,12 # 7ffffffc +[ ]+7ffffff4:[ ]+2eb1[ ]+addiw[ ]+t4,t4,12 # 7ffffffc [ ]+7ffffff6:[ ]+00000f17[ ]+auipc[ ]+t5,0x0 -[ ]+7ffffffa:[ ]+2f49[ ]+addw[ ]+t5,t5,18 # ffffffff80000008 +[ ]+7ffffffa:[ ]+2f49[ ]+addiw[ ]+t5,t5,18 # ffffffff80000008 --- a/gas/testsuite/gas/riscv/dis-addr-overflow-32.d +++ b/gas/testsuite/gas/riscv/dis-addr-overflow-32.d @@ -19,9 +19,9 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+ffffbeb7[ ]+lui[ ]+t4,0xffffb [ ]+[0-9a-f]+:[ ]+000e8a67[ ]+jalr[ ]+s4,t4 # ffffb000 [ ]+[0-9a-f]+:[ ]+ffffaf37[ ]+lui[ ]+t5,0xffffa -[ ]+[0-9a-f]+:[ ]+ff0f0a93[ ]+add[ ]+s5,t5,-16 # ffff9ff0 +[ ]+[0-9a-f]+:[ ]+ff0f0a93[ ]+addi[ ]+s5,t5,-16 # ffff9ff0 [ ]+[0-9a-f]+:[ ]+ffff9fb7[ ]+lui[ ]+t6,0xffff9 -[ ]+[0-9a-f]+:[ ]+1fb1[ ]+add[ ]+t6,t6,-20 # ffff8fec +[ ]+[0-9a-f]+:[ ]+1fb1[ ]+addi[ ]+t6,t6,-20 # ffff8fec [ ]+[0-9a-f]+:[ ]+4001a283[ ]+lw[ ]+t0,1024\(gp\) # 600 [ ]+[0-9a-f]+:[ ]+c001a303[ ]+lw[ ]+t1,-1024\(gp\) # fffffe00 [ ]+[0-9a-f]+:[ ]+10002383[ ]+lw[ ]+t2,256\(zero\) # 100 --- a/gas/testsuite/gas/riscv/dis-addr-overflow-64.d +++ b/gas/testsuite/gas/riscv/dis-addr-overflow-64.d @@ -19,13 +19,13 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+ffffbeb7[ ]+lui[ ]+t4,0xffffb [ ]+[0-9a-f]+:[ ]+000e8a67[ ]+jalr[ ]+s4,t4 # ffffffffffffb000 [ ]+[0-9a-f]+:[ ]+ffffaf37[ ]+lui[ ]+t5,0xffffa -[ ]+[0-9a-f]+:[ ]+ff0f0a93[ ]+add[ ]+s5,t5,-16 # ffffffffffff9ff0 +[ ]+[0-9a-f]+:[ ]+ff0f0a93[ ]+addi[ ]+s5,t5,-16 # ffffffffffff9ff0 [ ]+[0-9a-f]+:[ ]+ffff9fb7[ ]+lui[ ]+t6,0xffff9 -[ ]+[0-9a-f]+:[ ]+1fb1[ ]+add[ ]+t6,t6,-20 # ffffffffffff8fec +[ ]+[0-9a-f]+:[ ]+1fb1[ ]+addi[ ]+t6,t6,-20 # ffffffffffff8fec [ ]+[0-9a-f]+:[ ]+ffff8b37[ ]+lui[ ]+s6,0xffff8 -[ ]+[0-9a-f]+:[ ]+fe8b0b9b[ ]+addw[ ]+s7,s6,-24 # ffffffffffff7fe8 +[ ]+[0-9a-f]+:[ ]+fe8b0b9b[ ]+addiw[ ]+s7,s6,-24 # ffffffffffff7fe8 [ ]+[0-9a-f]+:[ ]+ffff7c37[ ]+lui[ ]+s8,0xffff7 -[ ]+[0-9a-f]+:[ ]+3c11[ ]+addw[ ]+s8,s8,-28 # ffffffffffff6fe4 +[ ]+[0-9a-f]+:[ ]+3c11[ ]+addiw[ ]+s8,s8,-28 # ffffffffffff6fe4 [ ]+[0-9a-f]+:[ ]+4001a283[ ]+lw[ ]+t0,1024\(gp\) # 600 [ ]+[0-9a-f]+:[ ]+c001a303[ ]+lw[ ]+t1,-1024\(gp\) # fffffffffffffe00 [ ]+[0-9a-f]+:[ ]+10002383[ ]+lw[ ]+t2,256\(zero\) # 100 --- a/gas/testsuite/gas/riscv/ext-32.d +++ b/gas/testsuite/gas/riscv/ext-32.d @@ -9,31 +9,31 @@ Disassembly of section .text: 0+000 : [ ]+0:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+4:[ ]+01051513[ ]+sll[ ]+a0,a0,0x10 -[ ]+8:[ ]+01055513[ ]+srl[ ]+a0,a0,0x10 -[ ]+c:[ ]+01851513[ ]+sll[ ]+a0,a0,0x18 -[ ]+10:[ ]+41855513[ ]+sra[ ]+a0,a0,0x18 -[ ]+14:[ ]+01051513[ ]+sll[ ]+a0,a0,0x10 -[ ]+18:[ ]+41055513[ ]+sra[ ]+a0,a0,0x10 +[ ]+4:[ ]+01051513[ ]+slli[ ]+a0,a0,0x10 +[ ]+8:[ ]+01055513[ ]+srli[ ]+a0,a0,0x10 +[ ]+c:[ ]+01851513[ ]+slli[ ]+a0,a0,0x18 +[ ]+10:[ ]+41855513[ ]+srai[ ]+a0,a0,0x18 +[ ]+14:[ ]+01051513[ ]+slli[ ]+a0,a0,0x10 +[ ]+18:[ ]+41055513[ ]+srai[ ]+a0,a0,0x10 [ ]+1c:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+20:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 -[ ]+24:[ ]+0105d593[ ]+srl[ ]+a1,a1,0x10 -[ ]+28:[ ]+01861593[ ]+sll[ ]+a1,a2,0x18 -[ ]+2c:[ ]+4185d593[ ]+sra[ ]+a1,a1,0x18 -[ ]+30:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 -[ ]+34:[ ]+4105d593[ ]+sra[ ]+a1,a1,0x10 +[ ]+20:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 +[ ]+24:[ ]+0105d593[ ]+srli[ ]+a1,a1,0x10 +[ ]+28:[ ]+01861593[ ]+slli[ ]+a1,a2,0x18 +[ ]+2c:[ ]+4185d593[ ]+srai[ ]+a1,a1,0x18 +[ ]+30:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 +[ ]+34:[ ]+4105d593[ ]+srai[ ]+a1,a1,0x10 [ ]+38:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+3c:[ ]+0542[ ]+sll[ ]+a0,a0,0x10 -[ ]+3e:[ ]+8141[ ]+srl[ ]+a0,a0,0x10 -[ ]+40:[ ]+0562[ ]+sll[ ]+a0,a0,0x18 -[ ]+42:[ ]+8561[ ]+sra[ ]+a0,a0,0x18 -[ ]+44:[ ]+0542[ ]+sll[ ]+a0,a0,0x10 -[ ]+46:[ ]+8541[ ]+sra[ ]+a0,a0,0x10 +[ ]+3c:[ ]+0542[ ]+slli[ ]+a0,a0,0x10 +[ ]+3e:[ ]+8141[ ]+srli[ ]+a0,a0,0x10 +[ ]+40:[ ]+0562[ ]+slli[ ]+a0,a0,0x18 +[ ]+42:[ ]+8561[ ]+srai[ ]+a0,a0,0x18 +[ ]+44:[ ]+0542[ ]+slli[ ]+a0,a0,0x10 +[ ]+46:[ ]+8541[ ]+srai[ ]+a0,a0,0x10 [ ]+48:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+4c:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 -[ ]+50:[ ]+81c1[ ]+srl[ ]+a1,a1,0x10 -[ ]+52:[ ]+01861593[ ]+sll[ ]+a1,a2,0x18 -[ ]+56:[ ]+85e1[ ]+sra[ ]+a1,a1,0x18 -[ ]+58:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 -[ ]+5c:[ ]+85c1[ ]+sra[ ]+a1,a1,0x10 +[ ]+4c:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 +[ ]+50:[ ]+81c1[ ]+srli[ ]+a1,a1,0x10 +[ ]+52:[ ]+01861593[ ]+slli[ ]+a1,a2,0x18 +[ ]+56:[ ]+85e1[ ]+srai[ ]+a1,a1,0x18 +[ ]+58:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 +[ ]+5c:[ ]+85c1[ ]+srai[ ]+a1,a1,0x10 #... --- a/gas/testsuite/gas/riscv/ext-64.d +++ b/gas/testsuite/gas/riscv/ext-64.d @@ -9,43 +9,43 @@ Disassembly of section .text: 0+000 : [ ]+0:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+4:[ ]+03051513[ ]+sll[ ]+a0,a0,0x30 -[ ]+8:[ ]+03055513[ ]+srl[ ]+a0,a0,0x30 -[ ]+c:[ ]+03851513[ ]+sll[ ]+a0,a0,0x38 -[ ]+10:[ ]+43855513[ ]+sra[ ]+a0,a0,0x38 -[ ]+14:[ ]+03051513[ ]+sll[ ]+a0,a0,0x30 -[ ]+18:[ ]+43055513[ ]+sra[ ]+a0,a0,0x30 +[ ]+4:[ ]+03051513[ ]+slli[ ]+a0,a0,0x30 +[ ]+8:[ ]+03055513[ ]+srli[ ]+a0,a0,0x30 +[ ]+c:[ ]+03851513[ ]+slli[ ]+a0,a0,0x38 +[ ]+10:[ ]+43855513[ ]+srai[ ]+a0,a0,0x38 +[ ]+14:[ ]+03051513[ ]+slli[ ]+a0,a0,0x30 +[ ]+18:[ ]+43055513[ ]+srai[ ]+a0,a0,0x30 [ ]+1c:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+20:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 -[ ]+24:[ ]+0305d593[ ]+srl[ ]+a1,a1,0x30 -[ ]+28:[ ]+03861593[ ]+sll[ ]+a1,a2,0x38 -[ ]+2c:[ ]+4385d593[ ]+sra[ ]+a1,a1,0x38 -[ ]+30:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 -[ ]+34:[ ]+4305d593[ ]+sra[ ]+a1,a1,0x30 -[ ]+38:[ ]+02051513[ ]+sll[ ]+a0,a0,0x20 -[ ]+3c:[ ]+02055513[ ]+srl[ ]+a0,a0,0x20 +[ ]+20:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 +[ ]+24:[ ]+0305d593[ ]+srli[ ]+a1,a1,0x30 +[ ]+28:[ ]+03861593[ ]+slli[ ]+a1,a2,0x38 +[ ]+2c:[ ]+4385d593[ ]+srai[ ]+a1,a1,0x38 +[ ]+30:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 +[ ]+34:[ ]+4305d593[ ]+srai[ ]+a1,a1,0x30 +[ ]+38:[ ]+02051513[ ]+slli[ ]+a0,a0,0x20 +[ ]+3c:[ ]+02055513[ ]+srli[ ]+a0,a0,0x20 [ ]+40:[ ]+0005051b[ ]+sext.w[ ]+a0,a0 -[ ]+44:[ ]+02061593[ ]+sll[ ]+a1,a2,0x20 -[ ]+48:[ ]+0205d593[ ]+srl[ ]+a1,a1,0x20 +[ ]+44:[ ]+02061593[ ]+slli[ ]+a1,a2,0x20 +[ ]+48:[ ]+0205d593[ ]+srli[ ]+a1,a1,0x20 [ ]+4c:[ ]+0006059b[ ]+sext.w[ ]+a1,a2 [ ]+50:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+54:[ ]+1542[ ]+sll[ ]+a0,a0,0x30 -[ ]+56:[ ]+9141[ ]+srl[ ]+a0,a0,0x30 -[ ]+58:[ ]+1562[ ]+sll[ ]+a0,a0,0x38 -[ ]+5a:[ ]+9561[ ]+sra[ ]+a0,a0,0x38 -[ ]+5c:[ ]+1542[ ]+sll[ ]+a0,a0,0x30 -[ ]+5e:[ ]+9541[ ]+sra[ ]+a0,a0,0x30 +[ ]+54:[ ]+1542[ ]+slli[ ]+a0,a0,0x30 +[ ]+56:[ ]+9141[ ]+srli[ ]+a0,a0,0x30 +[ ]+58:[ ]+1562[ ]+slli[ ]+a0,a0,0x38 +[ ]+5a:[ ]+9561[ ]+srai[ ]+a0,a0,0x38 +[ ]+5c:[ ]+1542[ ]+slli[ ]+a0,a0,0x30 +[ ]+5e:[ ]+9541[ ]+srai[ ]+a0,a0,0x30 [ ]+60:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+64:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 -[ ]+68:[ ]+91c1[ ]+srl[ ]+a1,a1,0x30 -[ ]+6a:[ ]+03861593[ ]+sll[ ]+a1,a2,0x38 -[ ]+6e:[ ]+95e1[ ]+sra[ ]+a1,a1,0x38 -[ ]+70:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 -[ ]+74:[ ]+95c1[ ]+sra[ ]+a1,a1,0x30 -[ ]+76:[ ]+1502[ ]+sll[ ]+a0,a0,0x20 -[ ]+78:[ ]+9101[ ]+srl[ ]+a0,a0,0x20 +[ ]+64:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 +[ ]+68:[ ]+91c1[ ]+srli[ ]+a1,a1,0x30 +[ ]+6a:[ ]+03861593[ ]+slli[ ]+a1,a2,0x38 +[ ]+6e:[ ]+95e1[ ]+srai[ ]+a1,a1,0x38 +[ ]+70:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 +[ ]+74:[ ]+95c1[ ]+srai[ ]+a1,a1,0x30 +[ ]+76:[ ]+1502[ ]+slli[ ]+a0,a0,0x20 +[ ]+78:[ ]+9101[ ]+srli[ ]+a0,a0,0x20 [ ]+7a:[ ]+2501[ ]+sext.w[ ]+a0,a0 -[ ]+7c:[ ]+02061593[ ]+sll[ ]+a1,a2,0x20 -[ ]+80:[ ]+9181[ ]+srl[ ]+a1,a1,0x20 +[ ]+7c:[ ]+02061593[ ]+slli[ ]+a1,a2,0x20 +[ ]+80:[ ]+9181[ ]+srli[ ]+a1,a1,0x20 [ ]+82:[ ]+0006059b[ ]+sext.w[ ]+a1,a2 #... --- a/gas/testsuite/gas/riscv/insn.d +++ b/gas/testsuite/gas/riscv/insn.d @@ -8,7 +8,7 @@ Disassembly of section .text: 0+000 : [^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 -[^:]+:[ ]+00d58513[ ]+add[ ]+a0,a1,13 +[^:]+:[ ]+00d58513[ ]+addi[ ]+a0,a1,13 [^:]+:[ ]+00a58567[ ]+jalr[ ]+a0,10\(a1\) [^:]+:[ ]+00458503[ ]+lb[ ]+a0,4\(a1\) [^:]+:[ ]+feb508e3[ ]+beq[ ]+a0,a1,0 \ @@ -22,8 +22,8 @@ Disassembly of section .text: [^:]+:[ ]+fddff56f[ ]+jal[ ]+a0,0 \ [^:]+: R_RISCV_JAL[ ]+target [^:]+:[ ]+852e[ ]+mv[ ]+a0,a1 -[^:]+:[ ]+0511[ ]+add[ ]+a0,a0,4 # .* -[^:]+:[ ]+002c[ ]+add[ ]+a1,sp,8 +[^:]+:[ ]+0511[ ]+addi[ ]+a0,a0,4 # .* +[^:]+:[ ]+002c[ ]+addi[ ]+a1,sp,8 [^:]+:[ ]+c0aa[ ]+sw[ ]+a0,64\(sp\) [^:]+:[ ]+41a8[ ]+lw[ ]+a0,64\(a1\) [^:]+:[ ]+c1a8[ ]+sw[ ]+a0,64\(a1\) @@ -32,7 +32,7 @@ Disassembly of section .text: [^:]+:[ ]+b7e9[ ]+j[ ]+0 \ [^:]+: R_RISCV_RVC_JUMP[ ]+target [^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 -[^:]+:[ ]+00d58513[ ]+add[ ]+a0,a1,13 +[^:]+:[ ]+00d58513[ ]+addi[ ]+a0,a1,13 [^:]+:[ ]+00a58567[ ]+jalr[ ]+a0,10\(a1\) [^:]+:[ ]+00458503[ ]+lb[ ]+a0,4\(a1\) [^:]+:[ ]+fab50ce3[ ]+beq[ ]+a0,a1,0 \ @@ -46,8 +46,8 @@ Disassembly of section .text: [^:]+:[ ]+fa5ff56f[ ]+jal[ ]+a0,0 \ [^:]+: R_RISCV_JAL[ ]+target [^:]+:[ ]+852e[ ]+mv[ ]+a0,a1 -[^:]+:[ ]+0511[ ]+add[ ]+a0,a0,4 # .* -[^:]+:[ ]+002c[ ]+add[ ]+a1,sp,8 +[^:]+:[ ]+0511[ ]+addi[ ]+a0,a0,4 # .* +[^:]+:[ ]+002c[ ]+addi[ ]+a1,sp,8 [^:]+:[ ]+c0aa[ ]+sw[ ]+a0,64\(sp\) [^:]+:[ ]+41a8[ ]+lw[ ]+a0,64\(a1\) [^:]+:[ ]+c1a8[ ]+sw[ ]+a0,64\(a1\) --- a/gas/testsuite/gas/riscv/k-ext-64.d +++ b/gas/testsuite/gas/riscv/k-ext-64.d @@ -10,10 +10,10 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 --- a/gas/testsuite/gas/riscv/k-ext.d +++ b/gas/testsuite/gas/riscv/k-ext.d @@ -10,7 +10,7 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 --- a/gas/testsuite/gas/riscv/li32.d +++ b/gas/testsuite/gas/riscv/li32.d @@ -8,10 +8,10 @@ Disassembly of section .text: 0+000 : [^:]+:[ ]+6521[ ]+lui[ ]+a0,0x8 -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 # .* +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 # .* [^:]+:[ ]+6509[ ]+lui[ ]+a0,0x2 -[^:]+:[ ]+f0150513[ ]+add[ ]+a0,a0,-255 # .* +[^:]+:[ ]+f0150513[ ]+addi[ ]+a0,a0,-255 # .* [^:]+:[ ]+12345537[ ]+lui[ ]+a0,0x12345 -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 # .* +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 # .* [^:]+:[ ]+f2345537[ ]+lui[ ]+a0,0xf2345 -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 # .* +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 # .* --- a/gas/testsuite/gas/riscv/li64.d +++ b/gas/testsuite/gas/riscv/li64.d @@ -8,37 +8,37 @@ Disassembly of section .text: 0000000000000000 : [^:]+:[ ]+6521[ ]+lui[ ]+a0,0x8 -[^:]+:[ ]+2505[ ]+addw[ ]+a0,a0,1 # .* +[^:]+:[ ]+2505[ ]+addiw[ ]+a0,a0,1 # .* [^:]+:[ ]+6509[ ]+lui[ ]+a0,0x2 -[^:]+:[ ]+f015051b[ ]+addw[ ]+a0,a0,-255 # .* +[^:]+:[ ]+f015051b[ ]+addiw[ ]+a0,a0,-255 # .* [^:]+:[ ]+12345537[ ]+lui[ ]+a0,0x12345 -[^:]+:[ ]+2505[ ]+addw[ ]+a0,a0,1 # .* +[^:]+:[ ]+2505[ ]+addiw[ ]+a0,a0,1 # .* [^:]+:[ ]+000f2537[ ]+lui[ ]+a0,0xf2 -[^:]+:[ ]+3455051b[ ]+addw[ ]+a0,a0,837 # .* -[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 +[^:]+:[ ]+3455051b[ ]+addiw[ ]+a0,a0,837 # .* +[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 [^:]+:[ ]+00f12537[ ]+lui[ ]+a0,0xf12 -[^:]+:[ ]+3455051b[ ]+addw[ ]+a0,a0,837 # .* -[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 +[^:]+:[ ]+3455051b[ ]+addiw[ ]+a0,a0,837 # .* +[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 [^:]+:[ ]+ff010537[ ]+lui[ ]+a0,0xff010 -[^:]+:[ ]+f015051b[ ]+addw[ ]+a0,a0,-255 # .* -[^:]+:[ ]+054e[ ]+sll[ ]+a0,a0,0x13 -[^:]+:[ ]+80150513[ ]+add[ ]+a0,a0,-2047 -[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd -[^:]+:[ ]+f0150513[ ]+add[ ]+a0,a0,-255 -[^:]+:[ ]+0010051b[ ]+addw[ ]+a0,zero,1 -[^:]+:[ ]+151a[ ]+sll[ ]+a0,a0,0x26 -[^:]+:[ ]+1565[ ]+add[ ]+a0,a0,-7 -[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd -[^:]+:[ ]+34550513[ ]+add[ ]+a0,a0,837 -[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 +[^:]+:[ ]+f015051b[ ]+addiw[ ]+a0,a0,-255 # .* +[^:]+:[ ]+054e[ ]+slli[ ]+a0,a0,0x13 +[^:]+:[ ]+80150513[ ]+addi[ ]+a0,a0,-2047 +[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd +[^:]+:[ ]+f0150513[ ]+addi[ ]+a0,a0,-255 +[^:]+:[ ]+0010051b[ ]+addiw[ ]+a0,zero,1 +[^:]+:[ ]+151a[ ]+slli[ ]+a0,a0,0x26 +[^:]+:[ ]+1565[ ]+addi[ ]+a0,a0,-7 +[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd +[^:]+:[ ]+34550513[ ]+addi[ ]+a0,a0,837 +[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 [^:]+:[ ]+01fc4537[ ]+lui[ ]+a0,0x1fc4 -[^:]+:[ ]+c915051b[ ]+addw[ ]+a0,a0,-879 # .* -[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd -[^:]+:[ ]+1565[ ]+add[ ]+a0,a0,-7 -[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd -[^:]+:[ ]+34550513[ ]+add[ ]+a0,a0,837 -[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 +[^:]+:[ ]+c915051b[ ]+addiw[ ]+a0,a0,-879 # .* +[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd +[^:]+:[ ]+1565[ ]+addi[ ]+a0,a0,-7 +[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd +[^:]+:[ ]+34550513[ ]+addi[ ]+a0,a0,837 +[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 --- a/gas/testsuite/gas/riscv/lla32.d +++ b/gas/testsuite/gas/riscv/lla32.d @@ -10,10 +10,10 @@ Disassembly of section .text: 0: 00100513 li a0,1 4: 00001537 lui a0,0x1 8: 00001537 lui a0,0x1 - c: 00150513 add a0,a0,1 # 1001 + c: 00150513 addi a0,a0,1 # 1001 10: 00001537 lui a0,0x1 - 14: fff50513 add a0,a0,-1 # fff + 14: fff50513 addi a0,a0,-1 # fff 18: 80000537 lui a0,0x80000 - 1c: fff50513 add a0,a0,-1 # 7fffffff + 1c: fff50513 addi a0,a0,-1 # 7fffffff 20: 00000513 li a0,0 24: fff00513 li a0,-1 --- a/gas/testsuite/gas/riscv/lla64.d +++ b/gas/testsuite/gas/riscv/lla64.d @@ -7,14 +7,14 @@ Disassembly of section .text: 0+000 <.text>: - 0: 0010051b addw a0,zero,1 + 0: 0010051b addiw a0,zero,1 4: 00001537 lui a0,0x1 8: 00001537 lui a0,0x1 - c: 0015051b addw a0,a0,1 # .* + c: 0015051b addiw a0,a0,1 # .* 10: 00001537 lui a0,0x1 - 14: fff5051b addw a0,a0,-1 # .* + 14: fff5051b addiw a0,a0,-1 # .* 18: 80000537 lui a0,0x80000 - 1c: fff5051b addw a0,a0,-1 # .* + 1c: fff5051b addiw a0,a0,-1 # .* 20: 0000051b sext.w a0,zero - 24: fff0051b addw a0,zero,-1 + 24: fff0051b addiw a0,zero,-1 28: 80000537 lui a0,0x80000 --- a/gas/testsuite/gas/riscv/zbkb-32.d +++ b/gas/testsuite/gas/riscv/zbkb-32.d @@ -10,7 +10,7 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 --- a/gas/testsuite/gas/riscv/zbkb-64.d +++ b/gas/testsuite/gas/riscv/zbkb-64.d @@ -10,10 +10,10 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 --- a/ld/testsuite/ld-riscv-elf/ifunc-plt-01.d +++ b/ld/testsuite/ld-riscv-elf/ifunc-plt-01.d @@ -11,7 +11,7 @@ Disassembly of section .text: .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* .*:[ ]+[0-9a-f]+[ ]+(lw|ld)[ ]+.*<(_GLOBAL_OFFSET_TABLE_.*|__DATA_BEGIN__.*|.*)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* -.*:[ ]+[0-9a-f]+[ ]+addi?[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> +.*:[ ]+[0-9a-f]+[ ]+addi[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* .*:[ ]+[0-9a-f]+[ ]+jalr[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* --- a/ld/testsuite/ld-riscv-elf/ifunc-plt-02.d +++ b/ld/testsuite/ld-riscv-elf/ifunc-plt-02.d @@ -13,7 +13,7 @@ Disassembly of section .text: .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* .*:[ ]+[0-9a-f]+[ ]+(lw|ld)[ ]+.*<(__DATA_BEGIN__.*|.*)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* -.*:[ ]+[0-9a-f]+[ ]+addi?[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> +.*:[ ]+[0-9a-f]+[ ]+addi[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* .*:[ ]+[0-9a-f]+[ ]+jalr[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* --- a/ld/testsuite/ld-riscv-elf/ifunc-reloc-pcrel.d +++ b/ld/testsuite/ld-riscv-elf/ifunc-reloc-pcrel.d @@ -9,7 +9,7 @@ Disassembly of section .text: #... 0+[0-9a-f]+ : .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* -.*:[ ]+[0-9a-f]+[ ]+addi?[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> +.*:[ ]+[0-9a-f]+[ ]+addi[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+.* .*:[ ]+[0-9a-f]+[ ]+(lw|ld)[ ]+.*<(\*ABS\*\+0x[0-9a-f]+@plt|foo@plt|.plt)> #... --- a/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d +++ b/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d @@ -10,6 +10,6 @@ Disassembly of section .text: [0-9a-f]+ <_start>: .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+a1.* -.*:[ ]+[0-9a-f]+[ ]+addi?[ ]+a0,gp.* -.*:[ ]+[0-9a-f]+[ ]+addi?[ ]+a1,a1.* +.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,gp.* +.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a1,a1.* #pass --- a/ld/testsuite/ld-riscv-elf/relax-max-align-gp.d +++ b/ld/testsuite/ld-riscv-elf/relax-max-align-gp.d @@ -8,7 +8,7 @@ Disassembly of section .text: 0+[0-9a-f]+ <_start>: -.*:[ ]+[0-9a-f]+[ ]+add[ ]+.* +.*:[ ]+[0-9a-f]+[ ]+addi[ ]+.* .*:[ ]+[0-9a-f]+[ ]+jal[ ]+.* .*:[ ]+[0-9a-f]+[ ]+j[ ]+.* .*:[ ]+[0-9a-f]+[ ]+nop --- a/ld/testsuite/ld-riscv-elf/weakref32.d +++ b/ld/testsuite/ld-riscv-elf/weakref32.d @@ -9,12 +9,12 @@ Disassembly of section \.text: 90000004: 02078663 beqz a5,90000030 <_start\+0x30> 90000008: 00000793 li a5,0 9000000c: 02078263 beqz a5,90000030 <_start\+0x30> -90000010: ff010113 addi? sp,sp,-16 +90000010: ff010113 addi sp,sp,-16 90000014: 00112623 sw ra,12\(sp\) 90000018: 00000097 auipc ra,0x0 9000001c: 000000e7 jalr zero # 0 <_start\-0x90000000> 90000020: 00c12083 lw ra,12\(sp\) -90000024: 01010113 addi? sp,sp,16 +90000024: 01010113 addi sp,sp,16 90000028: 00000317 auipc t1,0x0 9000002c: 00000067 jr zero # 0 <_start\-0x90000000> 90000030: 00008067 ret --- a/ld/testsuite/ld-riscv-elf/weakref64.d +++ b/ld/testsuite/ld-riscv-elf/weakref64.d @@ -9,12 +9,12 @@ Disassembly of section \.text: 90000004: 02078663 beqz a5,90000030 <_start\+0x30> 90000008: 00000793 li a5,0 9000000c: 02078263 beqz a5,90000030 <_start\+0x30> - 90000010: ff010113 addi? sp,sp,-16 + 90000010: ff010113 addi sp,sp,-16 90000014: 00113423 sd ra,8\(sp\) 90000018: 00000097 auipc ra,0x0 9000001c: 000000e7 jalr zero # 0 <_start\-0x90000000> 90000020: 00813083 ld ra,8\(sp\) - 90000024: 01010113 addi? sp,sp,16 + 90000024: 01010113 addi sp,sp,16 90000028: 00000317 auipc t1,0x0 9000002c: 00000067 jr zero # 0 <_start\-0x90000000> 90000030: 00008067 ret --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -382,14 +382,14 @@ const struct riscv_opcode riscv_opcodes[ {"move", 0, INSN_CLASS_I, "d,s", MATCH_ADDI, MASK_ADDI|MASK_IMM, match_opcode, INSN_ALIAS }, {"zext.b", 0, INSN_CLASS_ZCB, "Cs,Cw", MATCH_C_ZEXT_B, MASK_C_ZEXT_B, match_opcode, INSN_ALIAS }, {"zext.b", 0, INSN_CLASS_I, "d,s", MATCH_ANDI|ENCODE_ITYPE_IMM (255), MASK_ANDI | MASK_IMM, match_opcode, INSN_ALIAS }, +{"andi", 0, INSN_CLASS_ZCB, "Cs,Cw,Wcf",MATCH_C_ZEXT_B, MASK_C_ZEXT_B, match_opcode, INSN_ALIAS }, +{"andi", 0, INSN_CLASS_C, "Cs,Cw,Co", MATCH_C_ANDI, MASK_C_ANDI, match_opcode, INSN_ALIAS }, +{"andi", 0, INSN_CLASS_I, "d,s,j", MATCH_ANDI, MASK_ANDI, match_opcode, 0 }, {"and", 0, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_AND, MASK_C_AND, match_opcode, INSN_ALIAS }, {"and", 0, INSN_CLASS_C, "Cs,Ct,Cw", MATCH_C_AND, MASK_C_AND, match_opcode, INSN_ALIAS }, {"and", 0, INSN_CLASS_C, "Cs,Cw,Co", MATCH_C_ANDI, MASK_C_ANDI, match_opcode, INSN_ALIAS }, {"and", 0, INSN_CLASS_I, "d,s,t", MATCH_AND, MASK_AND, match_opcode, 0 }, {"and", 0, INSN_CLASS_I, "d,s,j", MATCH_ANDI, MASK_ANDI, match_opcode, INSN_ALIAS }, -{"andi", 0, INSN_CLASS_ZCB, "Cs,Cw,Wcf",MATCH_C_ZEXT_B, MASK_C_ZEXT_B, match_opcode, INSN_ALIAS }, -{"andi", 0, INSN_CLASS_C, "Cs,Cw,Co", MATCH_C_ANDI, MASK_C_ANDI, match_opcode, INSN_ALIAS }, -{"andi", 0, INSN_CLASS_I, "d,s,j", MATCH_ANDI, MASK_ANDI, match_opcode, 0 }, {"beqz", 0, INSN_CLASS_C, "Cs,Cp", MATCH_C_BEQZ, MASK_C_BEQZ, match_opcode, INSN_ALIAS|INSN_CONDBRANCH }, {"beqz", 0, INSN_CLASS_I, "s,p", MATCH_BEQ, MASK_BEQ|MASK_RS2, match_opcode, INSN_ALIAS|INSN_CONDBRANCH }, {"beq", 0, INSN_CLASS_C, "Cs,Cz,Cp", MATCH_C_BEQZ, MASK_C_BEQZ, match_opcode, INSN_ALIAS|INSN_CONDBRANCH }, @@ -410,6 +410,13 @@ const struct riscv_opcode riscv_opcodes[ {"bnez", 0, INSN_CLASS_I, "s,p", MATCH_BNE, MASK_BNE|MASK_RS2, match_opcode, INSN_ALIAS|INSN_CONDBRANCH }, {"bne", 0, INSN_CLASS_C, "Cs,Cz,Cp", MATCH_C_BNEZ, MASK_C_BNEZ, match_opcode, INSN_ALIAS|INSN_CONDBRANCH }, {"bne", 0, INSN_CLASS_I, "s,t,p", MATCH_BNE, MASK_BNE, match_opcode, INSN_CONDBRANCH }, +{"addi", 0, INSN_CLASS_C, "Ct,Cc,CK", MATCH_C_ADDI4SPN, MASK_C_ADDI4SPN, match_c_addi4spn, INSN_ALIAS }, +{"addi", 0, INSN_CLASS_C, "d,CU,Cj", MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, INSN_ALIAS }, +{"addi", 0, INSN_CLASS_C, "d,CU,z", MATCH_C_NOP, MASK_C_ADDI|MASK_RVC_IMM, match_c_nop, INSN_ALIAS }, +{"addi", 0, INSN_CLASS_C, "Cc,Cc,CL", MATCH_C_ADDI16SP, MASK_C_ADDI16SP, match_c_addi16sp, INSN_ALIAS }, +{"addi", 0, INSN_CLASS_C, "d,Cz,Co", MATCH_C_LI, MASK_C_LI, match_rd_nonzero, INSN_ALIAS }, +{"addi", 0, INSN_CLASS_C, "d,CV,z", MATCH_C_MV, MASK_C_MV, match_c_add, INSN_ALIAS }, +{"addi", 0, INSN_CLASS_I, "d,s,j", MATCH_ADDI, MASK_ADDI, match_opcode, 0 }, {"add", 0, INSN_CLASS_C, "d,CU,CV", MATCH_C_ADD, MASK_C_ADD, match_c_add, INSN_ALIAS }, {"add", 0, INSN_CLASS_C, "d,CV,CU", MATCH_C_ADD, MASK_C_ADD, match_c_add, INSN_ALIAS }, {"add", 0, INSN_CLASS_C, "d,CU,Co", MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, INSN_ALIAS }, @@ -419,34 +426,27 @@ const struct riscv_opcode riscv_opcodes[ {"add", 0, INSN_CLASS_I, "d,s,t", MATCH_ADD, MASK_ADD, match_opcode, 0 }, {"add", 0, INSN_CLASS_I, "d,s,t,1", MATCH_ADD, MASK_ADD, match_opcode, 0 }, {"add", 0, INSN_CLASS_I, "d,s,j", MATCH_ADDI, MASK_ADDI, match_opcode, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_C, "Ct,Cc,CK", MATCH_C_ADDI4SPN, MASK_C_ADDI4SPN, match_c_addi4spn, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_C, "d,CU,Cj", MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_C, "d,CU,z", MATCH_C_NOP, MASK_C_ADDI|MASK_RVC_IMM, match_c_nop, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_C, "Cc,Cc,CL", MATCH_C_ADDI16SP, MASK_C_ADDI16SP, match_c_addi16sp, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_C, "d,Cz,Co", MATCH_C_LI, MASK_C_LI, match_rd_nonzero, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_C, "d,CV,z", MATCH_C_MV, MASK_C_MV, match_c_add, INSN_ALIAS }, -{"addi", 0, INSN_CLASS_I, "d,s,j", MATCH_ADDI, MASK_ADDI, match_opcode, 0 }, {"la", 0, INSN_CLASS_I, "d,B", 0, (int) M_LA, match_never, INSN_MACRO }, {"lla", 0, INSN_CLASS_I, "d,B", 0, (int) M_LLA, match_never, INSN_MACRO }, {"lga", 0, INSN_CLASS_I, "d,B", 0, (int) M_LGA, match_never, INSN_MACRO }, {"la.tls.gd", 0, INSN_CLASS_I, "d,A", 0, (int) M_LA_TLS_GD, match_never, INSN_MACRO }, {"la.tls.ie", 0, INSN_CLASS_I, "d,A", 0, (int) M_LA_TLS_IE, match_never, INSN_MACRO }, {"neg", 0, INSN_CLASS_I, "d,t", MATCH_SUB, MASK_SUB|MASK_RS1, match_opcode, INSN_ALIAS }, /* sub 0 */ +{"slli", 0, INSN_CLASS_C, "d,CU,C>", MATCH_C_SLLI, MASK_C_SLLI, match_slli_as_c_slli, INSN_ALIAS }, +{"slli", 0, INSN_CLASS_I, "d,s,>", MATCH_SLLI, MASK_SLLI, match_opcode, 0 }, {"sll", 0, INSN_CLASS_C, "d,CU,C>", MATCH_C_SLLI, MASK_C_SLLI, match_slli_as_c_slli, INSN_ALIAS }, {"sll", 0, INSN_CLASS_I, "d,s,t", MATCH_SLL, MASK_SLL, match_opcode, 0 }, {"sll", 0, INSN_CLASS_I, "d,s,>", MATCH_SLLI, MASK_SLLI, match_opcode, INSN_ALIAS }, -{"slli", 0, INSN_CLASS_C, "d,CU,C>", MATCH_C_SLLI, MASK_C_SLLI, match_slli_as_c_slli, INSN_ALIAS }, -{"slli", 0, INSN_CLASS_I, "d,s,>", MATCH_SLLI, MASK_SLLI, match_opcode, 0 }, +{"srli", 0, INSN_CLASS_C, "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_srxi_as_c_srxi, INSN_ALIAS }, +{"srli", 0, INSN_CLASS_I, "d,s,>", MATCH_SRLI, MASK_SRLI, match_opcode, 0 }, {"srl", 0, INSN_CLASS_C, "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_srxi_as_c_srxi, INSN_ALIAS }, {"srl", 0, INSN_CLASS_I, "d,s,t", MATCH_SRL, MASK_SRL, match_opcode, 0 }, {"srl", 0, INSN_CLASS_I, "d,s,>", MATCH_SRLI, MASK_SRLI, match_opcode, INSN_ALIAS }, -{"srli", 0, INSN_CLASS_C, "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_srxi_as_c_srxi, INSN_ALIAS }, -{"srli", 0, INSN_CLASS_I, "d,s,>", MATCH_SRLI, MASK_SRLI, match_opcode, 0 }, +{"srai", 0, INSN_CLASS_C, "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_srxi_as_c_srxi, INSN_ALIAS }, +{"srai", 0, INSN_CLASS_I, "d,s,>", MATCH_SRAI, MASK_SRAI, match_opcode, 0 }, {"sra", 0, INSN_CLASS_C, "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_srxi_as_c_srxi, INSN_ALIAS }, {"sra", 0, INSN_CLASS_I, "d,s,t", MATCH_SRA, MASK_SRA, match_opcode, 0 }, {"sra", 0, INSN_CLASS_I, "d,s,>", MATCH_SRAI, MASK_SRAI, match_opcode, INSN_ALIAS }, -{"srai", 0, INSN_CLASS_C, "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_srxi_as_c_srxi, INSN_ALIAS }, -{"srai", 0, INSN_CLASS_I, "d,s,>", MATCH_SRAI, MASK_SRAI, match_opcode, 0 }, {"sub", 0, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_SUB, MASK_C_SUB, match_opcode, INSN_ALIAS }, {"sub", 0, INSN_CLASS_I, "d,s,t", MATCH_SUB, MASK_SUB, match_opcode, 0 }, {"lb", 0, INSN_CLASS_I, "d,o(s)", MATCH_LB, MASK_LB, match_opcode, INSN_DREF|INSN_1_BYTE }, @@ -466,11 +466,11 @@ const struct riscv_opcode riscv_opcodes[ {"lw", 0, INSN_CLASS_I, "d,A", 0, (int) M_LW, match_never, INSN_MACRO }, {"not", 0, INSN_CLASS_ZCB, "Cs,Cw", MATCH_C_NOT, MASK_C_NOT, match_opcode, INSN_ALIAS }, {"not", 0, INSN_CLASS_I, "d,s", MATCH_XORI|MASK_IMM, MASK_XORI|MASK_IMM, match_opcode, INSN_ALIAS }, +{"ori", 0, INSN_CLASS_I, "d,s,j", MATCH_ORI, MASK_ORI, match_opcode, 0 }, {"or", 0, INSN_CLASS_I, "d,s,j", MATCH_ORI, MASK_ORI, match_opcode, INSN_ALIAS }, {"or", 0, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_OR, MASK_C_OR, match_opcode, INSN_ALIAS }, {"or", 0, INSN_CLASS_C, "Cs,Ct,Cw", MATCH_C_OR, MASK_C_OR, match_opcode, INSN_ALIAS }, {"or", 0, INSN_CLASS_I, "d,s,t", MATCH_OR, MASK_OR, match_opcode, 0 }, -{"ori", 0, INSN_CLASS_I, "d,s,j", MATCH_ORI, MASK_ORI, match_opcode, 0 }, {"auipc", 0, INSN_CLASS_I, "d,u", MATCH_AUIPC, MASK_AUIPC, match_opcode, 0 }, {"seqz", 0, INSN_CLASS_I, "d,s", MATCH_SLTIU|ENCODE_ITYPE_IMM (1), MASK_SLTIU | MASK_IMM, match_opcode, INSN_ALIAS }, {"snez", 0, INSN_CLASS_I, "d,t", MATCH_SLTU, MASK_SLTU|MASK_RS1, match_opcode, INSN_ALIAS }, @@ -506,11 +506,11 @@ const struct riscv_opcode riscv_opcodes[ {"rdtimeh", 32, INSN_CLASS_I, "d", MATCH_RDTIMEH, MASK_RDTIMEH, match_opcode, INSN_ALIAS }, {"ecall", 0, INSN_CLASS_I, "", MATCH_SCALL, MASK_SCALL, match_opcode, 0 }, {"scall", 0, INSN_CLASS_I, "", MATCH_SCALL, MASK_SCALL, match_opcode, 0 }, +{"xori", 0, INSN_CLASS_I, "d,s,j", MATCH_XORI, MASK_XORI, match_opcode, 0 }, {"xor", 0, INSN_CLASS_I, "d,s,j", MATCH_XORI, MASK_XORI, match_opcode, INSN_ALIAS }, {"xor", 0, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_XOR, MASK_C_XOR, match_opcode, INSN_ALIAS }, {"xor", 0, INSN_CLASS_C, "Cs,Ct,Cw", MATCH_C_XOR, MASK_C_XOR, match_opcode, INSN_ALIAS }, {"xor", 0, INSN_CLASS_I, "d,s,t", MATCH_XOR, MASK_XOR, match_opcode, 0 }, -{"xori", 0, INSN_CLASS_I, "d,s,j", MATCH_XORI, MASK_XORI, match_opcode, 0 }, {"lwu", 64, INSN_CLASS_I, "d,o(s)", MATCH_LWU, MASK_LWU, match_opcode, INSN_DREF|INSN_4_BYTE }, {"lwu", 64, INSN_CLASS_I, "d,A", 0, (int) M_LWU, match_never, INSN_MACRO }, {"ld", 64, INSN_CLASS_C, "d,Cn(Cc)", MATCH_C_LDSP, MASK_C_LDSP, match_rd_nonzero, INSN_ALIAS|INSN_DREF|INSN_8_BYTE }, @@ -523,23 +523,23 @@ const struct riscv_opcode riscv_opcodes[ {"sd", 64, INSN_CLASS_I, "t,A,s", 0, (int) M_SD, match_never, INSN_MACRO }, {"sext.w", 64, INSN_CLASS_C, "d,CU", MATCH_C_ADDIW, MASK_C_ADDIW|MASK_RVC_IMM, match_rd_nonzero, INSN_ALIAS }, {"sext.w", 64, INSN_CLASS_I, "d,s", MATCH_ADDIW, MASK_ADDIW|MASK_IMM, match_opcode, INSN_ALIAS }, +{"addiw", 64, INSN_CLASS_C, "d,CU,Co", MATCH_C_ADDIW, MASK_C_ADDIW, match_rd_nonzero, INSN_ALIAS }, +{"addiw", 64, INSN_CLASS_I, "d,s,j", MATCH_ADDIW, MASK_ADDIW, match_opcode, 0 }, {"addw", 64, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_ADDW, MASK_C_ADDW, match_opcode, INSN_ALIAS }, {"addw", 64, INSN_CLASS_C, "Cs,Ct,Cw", MATCH_C_ADDW, MASK_C_ADDW, match_opcode, INSN_ALIAS }, {"addw", 64, INSN_CLASS_C, "d,CU,Co", MATCH_C_ADDIW, MASK_C_ADDIW, match_rd_nonzero, INSN_ALIAS }, {"addw", 64, INSN_CLASS_I, "d,s,t", MATCH_ADDW, MASK_ADDW, match_opcode, 0 }, {"addw", 64, INSN_CLASS_I, "d,s,j", MATCH_ADDIW, MASK_ADDIW, match_opcode, INSN_ALIAS }, -{"addiw", 64, INSN_CLASS_C, "d,CU,Co", MATCH_C_ADDIW, MASK_C_ADDIW, match_rd_nonzero, INSN_ALIAS }, -{"addiw", 64, INSN_CLASS_I, "d,s,j", MATCH_ADDIW, MASK_ADDIW, match_opcode, 0 }, {"negw", 64, INSN_CLASS_I, "d,t", MATCH_SUBW, MASK_SUBW|MASK_RS1, match_opcode, INSN_ALIAS }, /* sub 0 */ +{"slliw", 64, INSN_CLASS_I, "d,s,<", MATCH_SLLIW, MASK_SLLIW, match_opcode, 0 }, {"sllw", 64, INSN_CLASS_I, "d,s,t", MATCH_SLLW, MASK_SLLW, match_opcode, 0 }, {"sllw", 64, INSN_CLASS_I, "d,s,<", MATCH_SLLIW, MASK_SLLIW, match_opcode, INSN_ALIAS }, -{"slliw", 64, INSN_CLASS_I, "d,s,<", MATCH_SLLIW, MASK_SLLIW, match_opcode, 0 }, +{"srliw", 64, INSN_CLASS_I, "d,s,<", MATCH_SRLIW, MASK_SRLIW, match_opcode, 0 }, {"srlw", 64, INSN_CLASS_I, "d,s,t", MATCH_SRLW, MASK_SRLW, match_opcode, 0 }, {"srlw", 64, INSN_CLASS_I, "d,s,<", MATCH_SRLIW, MASK_SRLIW, match_opcode, INSN_ALIAS }, -{"srliw", 64, INSN_CLASS_I, "d,s,<", MATCH_SRLIW, MASK_SRLIW, match_opcode, 0 }, +{"sraiw", 64, INSN_CLASS_I, "d,s,<", MATCH_SRAIW, MASK_SRAIW, match_opcode, 0 }, {"sraw", 64, INSN_CLASS_I, "d,s,t", MATCH_SRAW, MASK_SRAW, match_opcode, 0 }, {"sraw", 64, INSN_CLASS_I, "d,s,<", MATCH_SRAIW, MASK_SRAIW, match_opcode, INSN_ALIAS }, -{"sraiw", 64, INSN_CLASS_I, "d,s,<", MATCH_SRAIW, MASK_SRAIW, match_opcode, 0 }, {"subw", 64, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_SUBW, MASK_C_SUBW, match_opcode, INSN_ALIAS }, {"subw", 64, INSN_CLASS_I, "d,s,t", MATCH_SUBW, MASK_SUBW, match_opcode, 0 }, @@ -1050,15 +1050,15 @@ const struct riscv_opcode riscv_opcodes[ {"orn", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,t", MATCH_ORN, MASK_ORN, match_opcode, 0 }, {"xnor", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,t", MATCH_XNOR, MASK_XNOR, match_opcode, 0 }, {"rol", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,t", MATCH_ROL, MASK_ROL, match_opcode, 0 }, +{"rori", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,>", MATCH_RORI, MASK_RORI, match_opcode, 0 }, {"ror", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,t", MATCH_ROR, MASK_ROR, match_opcode, 0 }, {"ror", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,>", MATCH_RORI, MASK_RORI, match_opcode, INSN_ALIAS }, -{"rori", 0, INSN_CLASS_ZBB_OR_ZBKB, "d,s,>", MATCH_RORI, MASK_RORI, match_opcode, 0 }, {"rev8", 32, INSN_CLASS_ZBB_OR_ZBKB, "d,s", MATCH_GREVI | MATCH_SHAMT_REV8_32, MASK_GREVI | MASK_SHAMT, match_opcode, 0 }, {"rev8", 64, INSN_CLASS_ZBB_OR_ZBKB, "d,s", MATCH_GREVI | MATCH_SHAMT_REV8_64, MASK_GREVI | MASK_SHAMT, match_opcode, 0 }, {"rolw", 64, INSN_CLASS_ZBB_OR_ZBKB, "d,s,t", MATCH_ROLW, MASK_ROLW, match_opcode, 0 }, +{"roriw", 64, INSN_CLASS_ZBB_OR_ZBKB, "d,s,<", MATCH_RORIW, MASK_RORIW, match_opcode, 0 }, {"rorw", 64, INSN_CLASS_ZBB_OR_ZBKB, "d,s,t", MATCH_RORW, MASK_RORW, match_opcode, 0 }, {"rorw", 64, INSN_CLASS_ZBB_OR_ZBKB, "d,s,<", MATCH_RORIW, MASK_RORIW, match_opcode, INSN_ALIAS }, -{"roriw", 64, INSN_CLASS_ZBB_OR_ZBKB, "d,s,<", MATCH_RORIW, MASK_RORIW, match_opcode, 0 }, /* Zba instructions. */ {"sh1add", 0, INSN_CLASS_ZBA, "d,s,t", MATCH_SH1ADD, MASK_SH1ADD, match_opcode, 0 }, @@ -1079,18 +1079,18 @@ const struct riscv_opcode riscv_opcodes[ {"clmulr", 0, INSN_CLASS_ZBC, "d,s,t", MATCH_CLMULR, MASK_CLMULR, match_opcode, 0 }, /* Zbs instructions. */ +{"bclri", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BCLRI, MASK_BCLRI, match_opcode, 0 }, {"bclr", 0, INSN_CLASS_ZBS, "d,s,t", MATCH_BCLR, MASK_BCLR, match_opcode, 0 }, {"bclr", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BCLRI, MASK_BCLRI, match_opcode, INSN_ALIAS }, -{"bclri", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BCLRI, MASK_BCLRI, match_opcode, 0 }, +{"bseti", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BSETI, MASK_BSETI, match_opcode, 0 }, {"bset", 0, INSN_CLASS_ZBS, "d,s,t", MATCH_BSET, MASK_BSET, match_opcode, 0 }, {"bset", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BSETI, MASK_BSETI, match_opcode, INSN_ALIAS }, -{"bseti", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BSETI, MASK_BSETI, match_opcode, 0 }, +{"binvi", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BINVI, MASK_BINVI, match_opcode, 0 }, {"binv", 0, INSN_CLASS_ZBS, "d,s,t", MATCH_BINV, MASK_BINV, match_opcode, 0 }, {"binv", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BINVI, MASK_BINVI, match_opcode, INSN_ALIAS }, -{"binvi", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BINVI, MASK_BINVI, match_opcode, 0 }, +{"bexti", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BEXTI, MASK_BEXTI, match_opcode, 0 }, {"bext", 0, INSN_CLASS_ZBS, "d,s,t", MATCH_BEXT, MASK_BEXT, match_opcode, 0 }, {"bext", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BEXTI, MASK_BEXTI, match_opcode, INSN_ALIAS }, -{"bexti", 0, INSN_CLASS_ZBS, "d,s,>", MATCH_BEXTI, MASK_BEXTI, match_opcode, 0 }, /* Zbkx instructions. */ {"xperm4", 0, INSN_CLASS_ZBKX, "d,s,t", MATCH_XPERM4, MASK_XPERM4, match_opcode, 0 }, @@ -1969,24 +1969,24 @@ const struct riscv_opcode riscv_opcodes[ /* Supervisor instructions. */ {"csrr", 0, INSN_CLASS_ZICSR, "d,E", MATCH_CSRRS, MASK_CSRRS|MASK_RS1, match_opcode, INSN_ALIAS }, +{"csrwi", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRWI, MASK_CSRRWI|MASK_RD, match_opcode, INSN_ALIAS }, {"csrw", 0, INSN_CLASS_ZICSR, "E,s", MATCH_CSRRW, MASK_CSRRW|MASK_RD, match_opcode, INSN_ALIAS }, {"csrw", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRWI, MASK_CSRRWI|MASK_RD, match_opcode, INSN_ALIAS }, -{"csrwi", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRWI, MASK_CSRRWI|MASK_RD, match_opcode, INSN_ALIAS }, +{"csrsi", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRSI, MASK_CSRRSI|MASK_RD, match_opcode, INSN_ALIAS }, {"csrs", 0, INSN_CLASS_ZICSR, "E,s", MATCH_CSRRS, MASK_CSRRS|MASK_RD, match_opcode, INSN_ALIAS }, {"csrs", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRSI, MASK_CSRRSI|MASK_RD, match_opcode, INSN_ALIAS }, -{"csrsi", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRSI, MASK_CSRRSI|MASK_RD, match_opcode, INSN_ALIAS }, +{"csrci", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRCI, MASK_CSRRCI|MASK_RD, match_opcode, INSN_ALIAS }, {"csrc", 0, INSN_CLASS_ZICSR, "E,s", MATCH_CSRRC, MASK_CSRRC|MASK_RD, match_opcode, INSN_ALIAS }, {"csrc", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRCI, MASK_CSRRCI|MASK_RD, match_opcode, INSN_ALIAS }, -{"csrci", 0, INSN_CLASS_ZICSR, "E,Z", MATCH_CSRRCI, MASK_CSRRCI|MASK_RD, match_opcode, INSN_ALIAS }, +{"csrrwi", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRWI, MASK_CSRRWI, match_opcode, 0 }, {"csrrw", 0, INSN_CLASS_ZICSR, "d,E,s", MATCH_CSRRW, MASK_CSRRW, match_opcode, 0 }, {"csrrw", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRWI, MASK_CSRRWI, match_opcode, INSN_ALIAS }, -{"csrrwi", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRWI, MASK_CSRRWI, match_opcode, 0 }, +{"csrrsi", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRSI, MASK_CSRRSI, match_opcode, 0 }, {"csrrs", 0, INSN_CLASS_ZICSR, "d,E,s", MATCH_CSRRS, MASK_CSRRS, match_opcode, 0 }, {"csrrs", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRSI, MASK_CSRRSI, match_opcode, INSN_ALIAS }, -{"csrrsi", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRSI, MASK_CSRRSI, match_opcode, 0 }, +{"csrrci", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRCI, MASK_CSRRCI, match_opcode, 0 }, {"csrrc", 0, INSN_CLASS_ZICSR, "d,E,s", MATCH_CSRRC, MASK_CSRRC, match_opcode, 0 }, {"csrrc", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRCI, MASK_CSRRCI, match_opcode, INSN_ALIAS }, -{"csrrci", 0, INSN_CLASS_ZICSR, "d,E,Z", MATCH_CSRRCI, MASK_CSRRCI, match_opcode, 0 }, {"uret", 0, INSN_CLASS_I, "", MATCH_URET, MASK_URET, match_opcode, 0 }, {"sret", 0, INSN_CLASS_I, "", MATCH_SRET, MASK_SRET, match_opcode, 0 }, {"hret", 0, INSN_CLASS_I, "", MATCH_HRET, MASK_HRET, match_opcode, 0 },