From patchwork Tue Nov 15 04:31:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 20178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2515626wru; Mon, 14 Nov 2022 20:35:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf7360SA6sQQkrZsPHezs0M2YWrz7awduQTTc2OXPEtEw5UUrFhbdU48Zi0iBpDp5LCYmcyi X-Received: by 2002:a17:906:5fc8:b0:78d:4742:bb62 with SMTP id k8-20020a1709065fc800b0078d4742bb62mr12449788ejv.43.1668486938128; Mon, 14 Nov 2022 20:35:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668486938; cv=none; d=google.com; s=arc-20160816; b=H+gDfIhcOhu4521iWTGmSU3Cjiu8Hpi4v/XwGi2IncCOCYfF6e2K2hJ6nAuGoHg6Sy tP59xutqmFYRm6U/C8uZ4298Zl13ZdJ2JE5onvbkXSvY62IMaLhSuiUF11JcwyYkSrXI cZtyGSk3A9Zrsuo9WwKZsG9+ES3+Dwt7JkRuNh8g4XVH64QFDC6LXx8BfCQ4Yb7h/fN7 ILNknZO3d1fJi0Kxp1vQZPoXANpdcQ6joXFfEwkkonUUn4EIAW/Gihr4FyiO+XwtHnf6 FGo/WezIXj79indMuaG3cY30dPDPiMoI1yxxLdilyvtH9psKpKmb9m4ZfNdd3HQ3FUK3 JegA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=MHB4GLoRErZruZ0dyJAw0QiFwLeh2Agqpglsoc6uwmI=; b=iJFQkAzAfHw+trYWpyjAsdNfVfnmyZuItuz1EMqFV+WUSUi3pCg1yXtsP29rF9xt4I EqN/kTnJSU3Ct1vtvHr/ITzuuKGbG0rBwiQF09su3NHKAW0GoICDMFCTmGYcvZYthxTM gKMfpuIBmF+AgiCaufotBUnU3fgC99Pdzo06QmwPx6Bk804RIPPH8JUJZlf4vy6IbyD5 I9849M4y03zDxLoEV8RXrX8ke8v5FMJ9EvQYqzS52T8nnJLMuZueRSGKkRXbeWB52X/f ntrSDstr6rRmsWv+iOWWQSwAF3h6zzV50epOsgZcRYEJJt6ABUMpagslT1FzR6rsDrsM 5J2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aUVAmdAI; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id e17-20020a17090618f100b00780f0b45416si8704129ejf.622.2022.11.14.20.35.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 20:35:38 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aUVAmdAI; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 5693A3887F78 for ; Tue, 15 Nov 2022 04:34:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5693A3887F78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668486862; bh=MHB4GLoRErZruZ0dyJAw0QiFwLeh2Agqpglsoc6uwmI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=aUVAmdAIxwWFbJ7Y09YsrvYsUiOM7TvKz/Tz69yD1ozlC33d32f0R15Gc5c6frqQm l04CKXiiQy95F6R97KEEaBBrnJuBsN/D23SztghQUTsgl8clsuEF0lfsvBgx7P+n9T KCuSY0AqhvEW2twMjrOUzLuNxiBaEZROuqa8LquA= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id C50F73835797 for ; Tue, 15 Nov 2022 04:32:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C50F73835797 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id DABC4300089; Tue, 15 Nov 2022 04:32:37 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH v3 6/8] RISC-V: Tidying up with fmv.w.x and fmv.x.w Date: Tue, 15 Nov 2022 04:31:27 +0000 Message-Id: <58cfec431ff2535aeb0c3fd9213933cf28864cb9.1668486687.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, UPPERCASE_50_75 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: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747122234783435643?= X-GMAIL-MSGID: =?utf-8?q?1749535359923650202?= This commit renames macros for fmv.w.x and fmv.x.w instructions (formerly called fmv.s.x and fmv.x.s, respectively but renamed in the RISC-V ISA, version 2.2). include/ChangeLog: * opcode/riscv-opc.h (MATCH_FMV_X_S): Rename to MATCH_FMV_X_W. (MASK_FMV_X_S): Rename to MASK_FMV_X_W. (MATCH_FMV_S_X): Rename to MATCH_FMV_W_X. (MASK_FMV_S_X): Rename to MASK_FMV_W_X. Rename corresponding DECLARE_INSN declarations. opcodes/ChangeLog: * riscv-opc.c (riscv_opcodes): Use new (renamed) macros. --- include/opcode/riscv-opc.h | 12 ++++++------ opcodes/riscv-opc.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index 949f04d49e0..eafa652f632 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -355,8 +355,8 @@ #define MASK_FCVT_L_S 0xfff0007f #define MATCH_FCVT_LU_S 0xc0300053 #define MASK_FCVT_LU_S 0xfff0007f -#define MATCH_FMV_X_S 0xe0000053 -#define MASK_FMV_X_S 0xfff0707f +#define MATCH_FMV_X_W 0xe0000053 +#define MASK_FMV_X_W 0xfff0707f #define MATCH_FCLASS_S 0xe0001053 #define MASK_FCLASS_S 0xfff0707f #define MATCH_FCVT_W_D 0xc2000053 @@ -389,8 +389,8 @@ #define MASK_FCVT_S_L 0xfff0007f #define MATCH_FCVT_S_LU 0xd0300053 #define MASK_FCVT_S_LU 0xfff0007f -#define MATCH_FMV_S_X 0xf0000053 -#define MASK_FMV_S_X 0xfff0707f +#define MATCH_FMV_W_X 0xf0000053 +#define MASK_FMV_W_X 0xfff0707f #define MATCH_FCVT_D_W 0xd2000053 #define MASK_FCVT_D_W 0xfff0007f #define MATCH_FCVT_D_WU 0xd2100053 @@ -2875,7 +2875,7 @@ DECLARE_INSN(fcvt_w_s, MATCH_FCVT_W_S, MASK_FCVT_W_S) DECLARE_INSN(fcvt_wu_s, MATCH_FCVT_WU_S, MASK_FCVT_WU_S) DECLARE_INSN(fcvt_l_s, MATCH_FCVT_L_S, MASK_FCVT_L_S) DECLARE_INSN(fcvt_lu_s, MATCH_FCVT_LU_S, MASK_FCVT_LU_S) -DECLARE_INSN(fmv_x_s, MATCH_FMV_X_S, MASK_FMV_X_S) +DECLARE_INSN(fmv_x_w, MATCH_FMV_X_W, MASK_FMV_X_W) DECLARE_INSN(fclass_s, MATCH_FCLASS_S, MASK_FCLASS_S) DECLARE_INSN(fcvt_w_d, MATCH_FCVT_W_D, MASK_FCVT_W_D) DECLARE_INSN(fcvt_wu_d, MATCH_FCVT_WU_D, MASK_FCVT_WU_D) @@ -2892,7 +2892,7 @@ DECLARE_INSN(fcvt_s_w, MATCH_FCVT_S_W, MASK_FCVT_S_W) DECLARE_INSN(fcvt_s_wu, MATCH_FCVT_S_WU, MASK_FCVT_S_WU) DECLARE_INSN(fcvt_s_l, MATCH_FCVT_S_L, MASK_FCVT_S_L) DECLARE_INSN(fcvt_s_lu, MATCH_FCVT_S_LU, MASK_FCVT_S_LU) -DECLARE_INSN(fmv_s_x, MATCH_FMV_S_X, MASK_FMV_S_X) +DECLARE_INSN(fmv_w_x, MATCH_FMV_W_X, MASK_FMV_W_X) DECLARE_INSN(fcvt_d_w, MATCH_FCVT_D_W, MASK_FCVT_D_W) DECLARE_INSN(fcvt_d_wu, MATCH_FCVT_D_WU, MASK_FCVT_D_WU) DECLARE_INSN(fcvt_d_l, MATCH_FCVT_D_L, MASK_FCVT_D_L) diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 9593964f023..2f8bb46ee28 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -708,10 +708,10 @@ const struct riscv_opcode riscv_opcodes[] = {"fsw", 32, INSN_CLASS_F_AND_C, "CD,Ck(Cs)", MATCH_C_FSW, MASK_C_FSW, match_opcode, INSN_ALIAS|INSN_DREF|INSN_4_BYTE }, {"fsw", 0, INSN_CLASS_F, "T,q(s)", MATCH_FSW, MASK_FSW, match_opcode, INSN_DREF|INSN_4_BYTE }, {"fsw", 0, INSN_CLASS_F, "T,A,s", 0, (int) M_FSW, match_never, INSN_MACRO }, -{"fmv.x.w", 0, INSN_CLASS_F, "d,S", MATCH_FMV_X_S, MASK_FMV_X_S, match_opcode, 0 }, -{"fmv.w.x", 0, INSN_CLASS_F, "D,s", MATCH_FMV_S_X, MASK_FMV_S_X, match_opcode, 0 }, -{"fmv.x.s", 0, INSN_CLASS_F, "d,S", MATCH_FMV_X_S, MASK_FMV_X_S, match_opcode, 0 }, -{"fmv.s.x", 0, INSN_CLASS_F, "D,s", MATCH_FMV_S_X, MASK_FMV_S_X, match_opcode, 0 }, +{"fmv.x.w", 0, INSN_CLASS_F, "d,S", MATCH_FMV_X_W, MASK_FMV_X_W, match_opcode, 0 }, +{"fmv.w.x", 0, INSN_CLASS_F, "D,s", MATCH_FMV_W_X, MASK_FMV_W_X, match_opcode, 0 }, +{"fmv.x.s", 0, INSN_CLASS_F, "d,S", MATCH_FMV_X_W, MASK_FMV_X_W, match_opcode, 0 }, +{"fmv.s.x", 0, INSN_CLASS_F, "D,s", MATCH_FMV_W_X, MASK_FMV_W_X, match_opcode, 0 }, {"fmv.s", 0, INSN_CLASS_F_INX, "D,U", MATCH_FSGNJ_S, MASK_FSGNJ_S, match_rs1_eq_rs2, INSN_ALIAS }, {"fneg.s", 0, INSN_CLASS_F_INX, "D,U", MATCH_FSGNJN_S, MASK_FSGNJN_S, match_rs1_eq_rs2, INSN_ALIAS }, {"fabs.s", 0, INSN_CLASS_F_INX, "D,U", MATCH_FSGNJX_S, MASK_FSGNJX_S, match_rs1_eq_rs2, INSN_ALIAS },