From patchwork Fri Nov 3 12:57:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 161276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1007388vqu; Fri, 3 Nov 2023 05:57:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbNEimlTPDvq+wTAqlt6Vy78X4hvRq0tugIRybJQFz58c/7ZahRfAE3wTZN25zwSj+jVCQ X-Received: by 2002:a05:622a:11c5:b0:412:191c:ffa with SMTP id n5-20020a05622a11c500b00412191c0ffamr23323803qtk.26.1699016269579; Fri, 03 Nov 2023 05:57:49 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1699016269; cv=pass; d=google.com; s=arc-20160816; b=idFFrP7Y4QDgB4zJjvl2ARfOCzeo/y9UIZSZj8LCNZdu1ACCfGjs614ccuJNGXx20V hehDdN89rsIJ4+xOjCmAfnMXlcPN0V1eM6KOnLhJ0qZotvtjFiYiGFFD1jmPzfwRd/Rg vyCLCrdalMlNZIIc3JASuuipQHKf61r/UkMZdE68PpSoZYY5/fknldhNsXAlffPuaJSR Ez6aENsjpBTHLpb927+ewXzo5udk536EaFkNk1LtCj+KnqTjT2I/23hU4XcvBGx6d5s5 9grMdNIl8wq/+MNMRTnuar0JKLZSIbf2mIQJt7o/10N2G3TlKDzs5UtmgmaWeqROsIFq zumg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version :content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=z2Ntqes/QnDCZrpJpCg2AbQJgSjp4zZ+wOhhoOXu9Pg=; fh=VT6N6QD4amIFxZr9T34bK4bL2a91CdTGSC+SgZliO78=; b=f5jwzBRsXkyC/9IfiPGZEO+QHaWEtSJ/6sZDJ6MhIt7VfwH+TGzXUdLAHn7d5CooHQ JaLOoZ9yBnKX6QW/PsdBXR/byxoPmkS0kNzTcSXSq8WCCZG56Ub+rQR40QGzY58NoaFz 2Zg1kgBYujR7Awr765F+/+5Q7IWBqfWkHWLxK3tuGYSGij+U0lDzVpa6PLcAYEj/R0Av 1EFSsjnkXuajnGZ624I2O8+Vml6/mKRPSTSHmimfVnyvPofhz9+CjCFEFCHlguArr0cP hoiWfRqIZ/2ljsKD+6fa8F1Nhn4Z/QbUzN6i29NGlQjC5IRHGIsPQ9ndtMh08GCnfk21 HsrQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="yV/parna"; arc=pass (i=2); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id c7-20020a05622a058700b00417fa5bd43dsi1363166qtb.314.2023.11.03.05.57.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 05:57:49 -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=@suse.com header.s=selector1 header.b="yV/parna"; arc=pass (i=2); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 21BD73858408 for ; Fri, 3 Nov 2023 12:57:48 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2048.outbound.protection.outlook.com [40.107.13.48]) by sourceware.org (Postfix) with ESMTPS id 729B93857C44 for ; Fri, 3 Nov 2023 12:57:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 729B93857C44 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 729B93857C44 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.13.48 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699016262; cv=pass; b=pQuUq+BYYeXi73z9pD3IQv8Vlgn5bs9hkQEmYB/D4tea6yR33xQjLJ/EsZB3haH3zixGzWh7BmhMFGXcH6OU4NsgHKiKLCAQANMMc4Hj24i/7+Da4IVCLwQr3vty9Tm4/e/yNYCjf5MrryyZDTpNW+pWPscOdocRs9uh0f8n3Ag= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699016262; c=relaxed/simple; bh=HvB34q4GRgU2hRRzb0kAl0YNVjerGDcAkAbSVkMWeLw=; h=DKIM-Signature:Message-ID:Date:Subject:From:To:MIME-Version; b=e0wxq31fNjCCTAzhvzaP1QqMQwR9lCw/YvopijDBZwBQmVs/y/4tP44wuqsjO/+AFV0+uQ9wtHGyCH5hchWapBVHaMSC/F0Y4Vp938aCJ7XtPW3NatzKkqNmBv/uh4F86bxwF14CCSfQqA/FTsIO85BM198TSGSN61eADd3lBWc= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLBl8WQXv3YjCd4uCzf6jqhBkGn7WuMxQfL1kCHAgS3fs9nmBRrxkV9PvWvhr/G9aQDRjhRgS3uS03Tz7h+X40jbwXo06/HHy3QWoOb3UNyRFZ/Yc7IjAAQRy7Q2uQgNnL69mwotUVX65wdOiAW1BbqpLsYTjyEiEWaWdF13vjWXzk1JubQ77MkvW2MeOUpC91Bq1O4Lb8tfgrAaUMIhR8GkeuSSoQwGJ0YiJu0/dEMIYrSgkZ2XqEia/njyDEb17IYLDupPAxGzzfUUmBmYaOy/DTOS6BtKVN8jZEDVLVj12ldF3gdJRfY3OHx0JCaFjI2OS5Ab6KVJg6YjItE/tA== 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=z2Ntqes/QnDCZrpJpCg2AbQJgSjp4zZ+wOhhoOXu9Pg=; b=Zs/adTRHCe7X4nj/Y6cN4cY4h1yMiwS14fbyM3wjNhqJV8LheIK24Ls6RyB3ffUIQBQK83L0W+jLrB2jEqdLW0atpUOxwsaZ0k+zRtBzz015LAeEGy4XG6soxi0bDI1frCQdAHULA1SzSu2Qibamq2rHEYFEzymx8ymCerXmm5GhG167RRTHzRY94aB+RjtGLjJCq7GnFi0+K+DJ2dK7O6BjbPnSd6Aq31zAER6zK0GlWFndgzOeu/PEdF5IQOfSfYiqS5Arm7yPlzYnzte5j8gcivXBu5gcVRd7PusBji6mxm6P5cM+fpoND8YZOXeor/t2jr8zYNBQpa/m9Ajovg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z2Ntqes/QnDCZrpJpCg2AbQJgSjp4zZ+wOhhoOXu9Pg=; b=yV/parnaKXRDEcTDMoERIEew9K2i9f5kpMhVbqJKsCP6XA8ibUz4KGcNpRcoS8pkwezxSOG2f+oD7Kwa2i/GINDzlLTEGiyaWqUInVD1lEWam/6M2Ipgn8s4xsrR4ktpwXzqCM01H3SuawSXSsbvq8iGlSD4Nh+2dHVPzRa0/zqqAu8CrnCGax2OGwO/QdBU6DHj4QfpA+jzkfz4B1et9Q1VI2FPPaH80CYNXGslZHVX30ZbbTitE6KA9soTRQiOEwFeJCuohbW3p6wA5sTrmXBQXp1IQ0CzyT0Flxcmjc+7AWiEK4F0tSRBinTiO2WJODFNsV0gRFZklSffIak+WQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM0PR04MB6802.eurprd04.prod.outlook.com (2603:10a6:208:184::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Fri, 3 Nov 2023 12:57:28 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::d924:b650:a2ad:7b25]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::d924:b650:a2ad:7b25%3]) with mapi id 15.20.6954.019; Fri, 3 Nov 2023 12:57:25 +0000 Message-ID: Date: Fri, 3 Nov 2023 13:57:23 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH 2/2] RISC-V: reduce redundancy in sign/zero extension macro insn handling Content-Language: en-US From: Jan Beulich To: Binutils Cc: Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu References: <8255d3af-23e4-054d-be6c-28fae6a76ea0@suse.com> In-Reply-To: <8255d3af-23e4-054d-be6c-28fae6a76ea0@suse.com> X-ClientProxiedBy: FR4P281CA0238.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e9::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_|AM0PR04MB6802:EE_ X-MS-Office365-Filtering-Correlation-Id: ff6cc160-be89-47c9-2b96-08dbdc6c6d99 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6uTAoEMtW21/8EOl+5AJYdEOrbK4krWFTgQnRVpFIMrpnoP7UFkt1XOShLz4zMk9rwT16k8un78Sp63q8F5Vrun1ks/a0cLRsr5MPzdTsjiBWF+oVO9T0GvnE5hmnJXY/sf+G8W3e5ThYC4v+ED+suW86hQKWhhadGSxxKxl9Czc4CFy2d+kF4li1pdRmnSRWZHTmjDTg70RgDjEMjYbtuER7xzHjafKQNsK+JClP8PEQ1fQhQxd1bc1r9l+uCgzVqCtfJ81dJ1wftwWO2WWud6eHnrVFXld9UZcAihmtJJOYSkybLAni6RCjN8syk3ubDPwXAaff/Agymm2QUIxtx4LR7xU+Yx0B8Jm5k7yoB6CvM/ZvIG0DLfNDfhe7TF26MKHYpmS6RERzerVRoExsTbz9oSFokl+biF4mClswnyZqs5FXt2OHPhxjiZk7lPJ/kr14U86qR3J4kULgXogV3o4961yarHqArP8NoABqvrqf1IplO9z0Dpc19ihStdWtXb8ZQBDhdmccLKdwjraNGJJAduiyKxr4iV+EBfQdrimADkPFe9EVrnW3KEvXSNHctwYvsKfik16wm+3ZkC2bQJcywmqT85RFuSZWIfjzPtcijVj775/kIbS5mdrt7UpdTHsyimGiS2CwyBC4sHtVA== 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:(13230031)(136003)(39860400002)(366004)(396003)(376002)(346002)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(26005)(86362001)(36756003)(31696002)(38100700002)(316002)(8936002)(2906002)(31686004)(5660300002)(66946007)(41300700001)(6506007)(66476007)(2616005)(66556008)(6916009)(54906003)(4326008)(6512007)(8676002)(478600001)(6486002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?yip1ytrIC1behv1sOJz5WP4xdq6S?= =?utf-8?q?PNpzUKsGhPJp/h6i1fyLKYaC1stk5aomMmSSjO4WWCgaTiPMXz3TiKkxA2nP0D0v3?= =?utf-8?q?n7xQnov7sRqf4SxB6oFEUt7SspSwS3s2Z5gfFqyP5ph34W0PlFDgl86f9GWjjoozI?= =?utf-8?q?6B5kNHNT+x7hvB0xqgJwoDSLH1s6P6btHMK4OJE2u5H7u9fGOJmhhbNRT8DvY6e7n?= =?utf-8?q?4dAfl7kGpFMEa9OPLKM/31xZp1Kcou7IPoauhttsmTOb+wvbfQ/Kt9uWxFKib5KMm?= =?utf-8?q?+9dH/1krltycC7GgvFETIrcRLlrXYqDZy7L9oPhfc5SRw6pJu7PMgfOSqBDrOKgxr?= =?utf-8?q?79CmQtqB2DaLT/yFJjWKwX1fMeG4H2cXVzlR3wsEgMoyq+plyJG+tJoxHY5l2PGmT?= =?utf-8?q?5pZFE2JnNpFPbMKIWyhkWo7jrmGKl39RL/Tu4ITi3aQ5hxM94bLRfXrfQUU3BaSZh?= =?utf-8?q?RZSyxCaVMmIW9trCf+yb3Rn+zKi1GGYrxa8y3ux+TH5rK92qNFlWN9qz1D+MzNWeW?= =?utf-8?q?Hb/tfkjESlC/Y391ZII2K/sLgIgs07rigp+cAi5zhS7ytGekxkgehfUtPepBbBo+q?= =?utf-8?q?556/+uj+2DTHzFoXBKiN5GI6ka0GImmEV2KVDqwmjfGJHdKwYnDkDJ1XFua7RlgW7?= =?utf-8?q?D0E9x9zhEpQLFzidXytvIkp6t4ugEgELrsSjngWUVLMN3hvxDvTczqY3dwg6VwOpj?= =?utf-8?q?1rbxEIip0u8uSf1A7yHzCdNebwVfHRZeTPeQR3j5iwcR4WN/N4HoCJ45lO4WnDHZ1?= =?utf-8?q?0qZFQ2m1TcKJY0rlWyt/+CRNRvgryHsgH5ZhwYfsk1X+nSgEkGRj79w40B/f1hXBX?= =?utf-8?q?ZTztRMlBLlQZ4hxYvvdqaqXTMtSvuqWDSus6h89cGe8YG3tdHA4g8NAs+LVocaVLg?= =?utf-8?q?32ERpcf44lulTJ8edgrYQ0Jsz397J27iUtvbJTL7sjZRrKp1D9T+Y/UnEVuGqrB5Z?= =?utf-8?q?RNbzX/Rw8Fl8MienkVhJLcWO8VWIcmPzJ5WfPnc9GM1H1rDzvbDbtFtl/WETqH8iH?= =?utf-8?q?JIp6RFpMoBOSZOpPK7CusdgikZl0s5bTRunS1XMWcFn5b1/qYR8YOQk5E5jWvKj6X?= =?utf-8?q?WmA3eTB+gTFSSyJ91GLNLsbqLM+JLxyvas/W2g8+oOuy0OT0VdB4pmycXKawx6VL8?= =?utf-8?q?xDtjeGpMcYiXAIVNpyOz5imy2UixuwdmsusgJ2sdo16ZxFsxcx5KXvji38UzZhbWT?= =?utf-8?q?+v+33uIkUOqn/aYoZAZ+ae2uED5V1XoAl2qszVIuxtaaQhQdttDpDUNdTyJtQxcLh?= =?utf-8?q?Jx6IqJiaCu8ggNIw9MfUBxpXmKAzscQ19kS7+nM+pIieGYdirtxVo4rvldojXJqee?= =?utf-8?q?XsmqlPG5j2SuTFZfEE4+RCgvX6XJk62e8MnLlObSPgYIkY4IDb9DLo6dSTfElDaJ9?= =?utf-8?q?1HjYMj8NRua7/Vr09HWwOUtSnS9/fFhcuRAmvjeb4MglhS08mkF/uc4IGWZwqVToQ?= =?utf-8?q?zWInvZ6tJs6gmpXmHSyWPOwyYx9bMQQeAumcq+pDUgdK0E+S2twFbF7djDuphIRI/?= =?utf-8?q?jaF6ULEhF7Ae?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff6cc160-be89-47c9-2b96-08dbdc6c6d99 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 12:57:25.7503 (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: co5AX9Z1bTNZx8fqE1KFooWRMCd1zzfLxVknTC2/e92VVp7Xv/SkES1l5NNe7/Bze8sTYDMUxmtF3mnfOpZPZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6802 X-Spam-Status: No, score=-3026.6 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, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781547683948260108 X-GMAIL-MSGID: 1781547683948260108 Fold M_{S,Z}EXTH, deriving signed-ness from the incoming mnemonic. Fold riscv_ext()'s calls md_assemblef(), the first of which were entirely identical, while the other pair differed in just a single character. --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -1942,16 +1942,9 @@ load_const (int reg, expressionS *ep) static void riscv_ext (int destreg, int srcreg, unsigned shift, bool sign) { - if (sign) - { - md_assemblef ("slli x%d, x%d, 0x%x", destreg, srcreg, shift); - md_assemblef ("srai x%d, x%d, 0x%x", destreg, destreg, shift); - } - else - { - md_assemblef ("slli x%d, x%d, 0x%x", destreg, srcreg, shift); - md_assemblef ("srli x%d, x%d, 0x%x", destreg, destreg, shift); - } + md_assemblef ("slli x%d, x%d, %#x", destreg, srcreg, shift); + md_assemblef ("sr%ci x%d, x%d, %#x", + sign ? 'a' : 'l', destreg, destreg, shift); } /* Expand RISC-V Vector macros into one or more instructions. */ @@ -2075,8 +2068,8 @@ macro (struct riscv_cl_insn *ip, express riscv_call (rd, rs1, imm_expr, *imm_reloc); break; - case M_ZEXTH: - riscv_ext (rd, rs1, xlen - 16, false); + case M_EXTH: + riscv_ext (rd, rs1, xlen - 16, *ip->insn_mo->name == 's'); break; case M_ZEXTW: @@ -2087,10 +2080,6 @@ macro (struct riscv_cl_insn *ip, express riscv_ext (rd, rs1, xlen - 8, true); break; - case M_SEXTH: - riscv_ext (rd, rs1, xlen - 16, true); - break; - case M_VMSGE: vector_macro (ip); break; --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -544,10 +544,9 @@ enum M_CALL, M_J, M_LI, - M_ZEXTH, + M_EXTH, M_ZEXTW, M_SEXTB, - M_SEXTH, M_VMSGE, M_NUM_MACROS }; --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -1042,11 +1042,11 @@ const struct riscv_opcode riscv_opcodes[ {"sext.b", 0, INSN_CLASS_I, "d,s", 0, (int) M_SEXTB, NULL, INSN_MACRO }, {"sext.h", 0, INSN_CLASS_ZCB_AND_ZBB, "Cs,Cw", MATCH_C_SEXT_H, MASK_C_SEXT_H, match_opcode, INSN_ALIAS }, {"sext.h", 0, INSN_CLASS_ZBB, "d,s", MATCH_SEXT_H, MASK_SEXT_H, match_opcode, 0 }, -{"sext.h", 0, INSN_CLASS_I, "d,s", 0, (int) M_SEXTH, NULL, INSN_MACRO }, +{"sext.h", 0, INSN_CLASS_I, "d,s", 0, (int) M_EXTH, NULL, INSN_MACRO }, {"zext.h", 0, INSN_CLASS_ZCB_AND_ZBB, "Cs,Cw", MATCH_C_ZEXT_H, MASK_C_ZEXT_H, match_opcode, INSN_ALIAS }, {"zext.h", 32, INSN_CLASS_ZBB, "d,s", MATCH_PACK, MASK_PACK | MASK_RS2, match_opcode, 0 }, {"zext.h", 64, INSN_CLASS_ZBB, "d,s", MATCH_PACKW, MASK_PACKW | MASK_RS2, match_opcode, 0 }, -{"zext.h", 0, INSN_CLASS_I, "d,s", 0, (int) M_ZEXTH, NULL, INSN_MACRO }, +{"zext.h", 0, INSN_CLASS_I, "d,s", 0, (int) M_EXTH, NULL, INSN_MACRO }, {"orc.b", 0, INSN_CLASS_ZBB, "d,s", MATCH_GORCI | MATCH_SHAMT_ORC_B, MASK_GORCI | MASK_SHAMT, match_opcode, 0 }, {"clzw", 64, INSN_CLASS_ZBB, "d,s", MATCH_CLZW, MASK_CLZW, match_opcode, 0 }, {"ctzw", 64, INSN_CLASS_ZBB, "d,s", MATCH_CTZW, MASK_CTZW, match_opcode, 0 },