From patchwork Sat Oct 1 04:45:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp101272wrs; Fri, 30 Sep 2022 21:46:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7lIOH/2H5QVjejVU8IXIYpFVjVLn1h9YGPwRVeFSdFiiZyhYm8yQ5MnxWFCGqXxsnNhZLD X-Received: by 2002:a17:907:2d09:b0:781:d793:f51e with SMTP id gs9-20020a1709072d0900b00781d793f51emr8565755ejc.628.1664599583713; Fri, 30 Sep 2022 21:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664599583; cv=none; d=google.com; s=arc-20160816; b=lHZHJr5bHzmn29d4+r+G3xR1C8ut9tezvJISouWm/I9hyhuYHLIKvstNHm6tr8NkLl AmHEqxTN2do61t2FnqgTYxcI4YcTquFyqmLy3Jd8A0rAtYn8nZboVJIEXXg2W4fNWCi6 ebOS9dcHJkl3hRcNbM9eb7TZSZbmSP+5OuzIjwau18UZeQEDLwuxrbeTh0YDIfnskmWg sPa8hFSqJO28BepLFeUdLf6OCC77AYyzWf53xE2XiYkSLwKe74xKzcsRsnIlQvhPPeWN TYeNVEUlWWb6kcRIbfEr55Ap6o/U+P9KdgwKja01JZcIKG7s3WWaMGOUhAeKfAclOg/m iDXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=iE/lDV7kOdF8xWpV/JZACiiiOV/cbEcADWN3Qb/yPeA=; b=dDqB4DIVGuoaeBDxLtc1/+i+eAanXyEEbfFBakSNB51qGM4R/9Iq0RcckvMf3CiaRQ uCBMGsPVBDa9jNS3IOX6hjEmK2ZrceLG9cXQe5qCApcLmHWcVuCQW3EV+9kKVDUDjCVN KcHxdAGSnBwuh4vYc4spJHLQ4l0hZDmVQZ4LNO5XR0HfT1EmmxAyPazdE1Os7xmwevlf pPsVW9A/w6Akq13fxS2rm4TKjO5rM4TfQh4sW6SlFmULrJJt/jvuSksr+7po1pXu+zas 88qlHv10JdeKEK4TQS1FlAsR6bUCx26EQajhtAwhG5mj3q28j26tYKJmxCxKg0TVEpGR WKZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Sfbu3Uh7; 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 sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id oz44-20020a1709077dac00b00783c4625944si3026044ejc.508.2022.09.30.21.46.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 21:46:23 -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=Sfbu3Uh7; 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 10616385356D for ; Sat, 1 Oct 2022 04:46:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 10616385356D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664599581; bh=iE/lDV7kOdF8xWpV/JZACiiiOV/cbEcADWN3Qb/yPeA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Sfbu3Uh7MA9XZItb5+rD/0lALRDR/SIPv56iZGl4yQW6JwtyWLYge58NOOjq695Si LkpQb7TmVs9bVOMxOKy3KL9P9PuVQd26ymSRWKQ09z4nT+/EUEBCEgymL2QJEvBODn 77Qv/u+AARUTpP5h6Ye0iLnmUofgEggMLHAu7ok0= 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 8A6603858285 for ; Sat, 1 Oct 2022 04:46:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8A6603858285 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 8385F300089; Sat, 1 Oct 2022 04:46:08 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [RFC PATCH 1/1] RISC-V: Implement common register pair framework Date: Sat, 1 Oct 2022 04:45:52 +0000 Message-Id: In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, 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: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org 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?1745459173123182328?= X-GMAIL-MSGID: =?utf-8?q?1745459173123182328?= This commit implements common framework for aligned register pairs (using GPRs). This is particularly useful on following extensions: - 'Zdinx' - 'Zqinx' (once proposed but not ratified yet) - 'Zpsfoperand' (a part of 'P'-extension proposal) New operand type format is shown below: 1. 'l' (stands for "length") 2. One of the following: '1' for 32-bit data (or less), (RV32: 1 register, RV64: 1 register) '2' for 64-bit data (RV32: 2 registers, RV64: 1 register) '4' for 128-bit data (RV32: 4 registers, RV64: 2 registers) 3. One of the following: 'd' for RD 's' for RS1 't' for RS2 'r' for RS3 'u' for RS1 and RS2 (where RS1 == RS2) gas/ChangeLog: * config/tc-riscv.c (riscv_ip): Add handling for "l[124][dstru]". (validate_riscv_insn): Likewise. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Add handling for "l[124][dstru]". --- gas/config/tc-riscv.c | 72 +++++++++++++++++++++++++++++++++++++++++++ opcodes/riscv-dis.c | 31 +++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index bd8f65d94fd..5e6fca3de9f 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -1251,6 +1251,30 @@ validate_riscv_insn (const struct riscv_opcode *opc, int length) case 'z': break; /* Zero immediate. */ case '[': break; /* Unused operand. */ case ']': break; /* Unused operand. */ + case 'l': /* Register pairs. */ + switch (*++oparg) + { + case '1': + case '2': + case '4': + break; + default: + goto unknown_validate_operand; + } + switch (*++oparg) + { + case 'd': USE_BITS (OP_MASK_RD, OP_SH_RD); break; + case 's': USE_BITS (OP_MASK_RS1, OP_SH_RS1); break; + case 't': USE_BITS (OP_MASK_RS2, OP_SH_RS2); break; + case 'r': USE_BITS (OP_MASK_RS3, OP_SH_RS3); break; + case 'u': /* RS1 == RS2. */ + USE_BITS (OP_MASK_RS1, OP_SH_RS1); + USE_BITS (OP_MASK_RS2, OP_SH_RS2); + break; + default: + goto unknown_validate_operand; + } + break; case '0': break; /* AMO displacement, must to zero. */ case '1': break; /* Relaxation operand. */ case 'F': /* Funct for .insn directive. */ @@ -3021,6 +3045,54 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr, } break; + case 'l': /* Register pairs. */ + if (reg_lookup (&asarg, RCLASS_GPR, ®no)) + { + if (*asarg == ' ') + ++asarg; + + unsigned dlen; + switch (*++oparg) + { + case '1': dlen = 32; break; + case '2': dlen = 64; break; + case '4': dlen = 128; break; + default: + goto unknown_riscv_ip_operand; + } + char c = *++oparg; + + /* Check whether the register number is aligned properly. */ + if (!(xlen >= dlen || (regno % (dlen / xlen)) == 0)) + break; + + /* Now the register number is valid. Insert the number to + the corresponding field(s). */ + switch (c) + { + case 'd': + INSERT_OPERAND (RD, *ip, regno); + break; + case 's': + INSERT_OPERAND (RS1, *ip, regno); + break; + case 't': + INSERT_OPERAND (RS2, *ip, regno); + break; + case 'r': + INSERT_OPERAND (RS3, *ip, regno); + break; + case 'u': + INSERT_OPERAND (RS1, *ip, regno); + INSERT_OPERAND (RS2, *ip, regno); + break; + default: + goto unknown_riscv_ip_operand; + } + continue; + } + break; + case 'D': /* Floating point RD. */ case 'S': /* Floating point RS1. */ case 'T': /* Floating point RS2. */ diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 6ac69490b78..85b79db606c 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -488,6 +488,37 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info print (info->stream, dis_style_register, "%s", riscv_gpr_names[0]); break; + case 'l': + { + unsigned dlen; + int regno; + switch (*++oparg) + { + case '1': dlen = 32; break; + case '2': dlen = 64; break; + case '4': dlen = 128; break; + default: + goto undefined_modifier; + } + switch (*++oparg) + { + case 'd': regno = rd; break; + case 's': regno = rs1; break; + case 't': regno = EXTRACT_OPERAND (RS2, l); break; + case 'r': regno = EXTRACT_OPERAND (RS3, l); break; + case 'u': regno = rs1; break; /* RS1 == RS2. */ + default: + goto undefined_modifier; + } + /* Check whether the register number is aligned properly. */ + if (xlen >= dlen || (regno % (dlen / xlen)) == 0) + print (info->stream, dis_style_register, "%s", + riscv_gpr_names[regno]); + else + print (info->stream, dis_style_text, "invalid%d", regno); + break; + } + case '>': print (info->stream, dis_style_immediate, "0x%x", (int)EXTRACT_OPERAND (SHAMT, l));