From nobody Mon Feb 9 23:03:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1618979129; cv=none; d=zohomail.com; s=zohoarc; b=WuBMeq0t/K1NTpvSvw0CYoSBJh75lZxbYWMjivtZhB1og/y9fA8vF+iqJOu6LVopT95zTJSHQ2swfTw+iIWib/Rr41XREFGgbTtK9s5UPsnWONVEzREMl5uQ07L9bpfVWTk1etN6BFw1sPBqjeo7ufXpNCS+IgcLjT6/vj3b3zA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618979129; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=JZRXLju1W0DUJfWSJ/qAg/atQdQXPJ/g9gL7eWvCb4U=; b=IRkONXl1v4j23TnX3Fb3dofRtit4YTqehmTbQIK+oNgWhROBenj37A1b1bkQMZAl7GgGQ7XDVvcEpVXXAsx3v0TjDNx2a4aBh5FvTJUi1yntLFCst2D7Y5sJ66uvDf5C8jku5dPvLVs7vtvYaYkVsHdF9N9vZwMfCWdWhWlQoxo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618979129239869.0974846075773; Tue, 20 Apr 2021 21:25:29 -0700 (PDT) Received: from localhost ([::1]:50380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZ4Qa-0006CD-7T for importer@patchew.org; Wed, 21 Apr 2021 00:25:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZ4GN-0007Ld-Q0 for qemu-devel@nongnu.org; Wed, 21 Apr 2021 00:14:56 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:40801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZ4GM-0003KA-0U for qemu-devel@nongnu.org; Wed, 21 Apr 2021 00:14:55 -0400 Received: by mail-pl1-x632.google.com with SMTP id 20so16947490pll.7 for ; Tue, 20 Apr 2021 21:14:53 -0700 (PDT) Received: from frankchang-ThinkPad-T490.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id jx20sm551465pjb.41.2021.04.20.21.14.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 21:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JZRXLju1W0DUJfWSJ/qAg/atQdQXPJ/g9gL7eWvCb4U=; b=H6RO1YB2qXRSiXwrTKd+f1M2gxdqzCdVDnJUzLhhYDTYNp7ODhbluvyvN5YNJFZtzm Zbs0NwIU9VNkXf202pypYvszBWfyWfrBBdVlMV5n5lARFSa+iZTCdkvbMNtX2ae51yju toNh7S/YllLimm0tX1xKc+NMXhnd6CKEHtGgo5gmGsDpqXxmV5PnCSUjizKnWwz8/zfA g1wUXwsxRsoSHkaI0/7UNoqLlEmEjwSJqbnHfagxUYBuZV9HvrqT4QIpCddygF0RutRU 4oG2HL+7DMB71xUI+cj6FVuS0o2ApMOvL+YmFLXz5hWI9wDOT+eHqNSPxrLQRAhgGxzN deew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JZRXLju1W0DUJfWSJ/qAg/atQdQXPJ/g9gL7eWvCb4U=; b=F4WlHbSO62AUTPd7rYXyRGyl5vTwee4f0Mx9ZtlXzZ4/n/DhqyfTlQKmIf7mqXGMiB 87ViqOqZH2Iys+f98ErqF+ocmsPxpD3eDkctStlf4TFDzrbG8iyWoYXkQxdzFJZy+MOn TLHJfnBEeCzGRnmTFd/hGUY17vbZGf/HOhDBDxx1unefERqwLMfY0ufW2a9NFOMMamaK hIWA9+GE71pu5T2gLJ4WcjC6RFePnwoAGOwYgSjEDiizHdlw5iBQveCHREiKczs4GnBz b0gs5bq+V1vgCyzMUu+I49af+5PkyVDivB8LD99jG91Fc8g/GTncw3tCd0LNAllU8Qnj F+lg== X-Gm-Message-State: AOAM531x2v8mLN1EMMEdP4Wx/np9bJ2ZNJNxwNf1AIur6xDmTqOIxIad mNt6fGZlKQpvT7KQAakA9fjHbzhi3CUDWQNq X-Google-Smtp-Source: ABdhPJzBSlXrrXwq0rX4/TYGPAWR+fnlMsovfX84shcSvViF6ibZ/qO5xpOCOHlMXA0bWCBCuluMJA== X-Received: by 2002:a17:902:9b97:b029:eb:7a1b:5b88 with SMTP id y23-20020a1709029b97b02900eb7a1b5b88mr31116520plp.77.1618978492330; Tue, 20 Apr 2021 21:14:52 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 14/17] target/riscv: rvb: address calculation Date: Wed, 21 Apr 2021 12:13:56 +0800 Message-Id: <20210421041400.22243-15-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210421041400.22243-1-frank.chang@sifive.com> References: <20210421041400.22243-1-frank.chang@sifive.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagar Karandikar , Frank Chang , Bastian Koppelmann , Richard Henderson , Alistair Francis , Palmer Dabbelt , Kito Cheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Kito Cheng Signed-off-by: Kito Cheng Signed-off-by: Frank Chang Reviewed-by: Richard Henderson --- target/riscv/insn32-64.decode | 3 +++ target/riscv/insn32.decode | 3 +++ target/riscv/insn_trans/trans_rvb.c.inc | 23 ++++++++++++++++++ target/riscv/translate.c | 32 +++++++++++++++++++++++++ 4 files changed, 61 insertions(+) diff --git a/target/riscv/insn32-64.decode b/target/riscv/insn32-64.decode index 894db5e3abf..2f80b0c07ae 100644 --- a/target/riscv/insn32-64.decode +++ b/target/riscv/insn32-64.decode @@ -104,6 +104,9 @@ rorw 0110000 .......... 101 ..... 0111011 @r rolw 0110000 .......... 001 ..... 0111011 @r grevw 0110100 .......... 101 ..... 0111011 @r gorcw 0010100 .......... 101 ..... 0111011 @r +sh1add_uw 0010000 .......... 010 ..... 0111011 @r +sh2add_uw 0010000 .......... 100 ..... 0111011 @r +sh3add_uw 0010000 .......... 110 ..... 0111011 @r =20 bsetiw 0010100 .......... 001 ..... 0011011 @sh5 bclriw 0100100 .......... 001 ..... 0011011 @sh5 diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 0756ea5cc28..b90c1c0a350 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -621,6 +621,9 @@ ror 0110000 .......... 101 ..... 0110011 @r rol 0110000 .......... 001 ..... 0110011 @r grev 0110100 .......... 101 ..... 0110011 @r gorc 0010100 .......... 101 ..... 0110011 @r +sh1add 0010000 .......... 010 ..... 0110011 @r +sh2add 0010000 .......... 100 ..... 0110011 @r +sh3add 0010000 .......... 110 ..... 0110011 @r =20 bseti 00101. ........... 001 ..... 0010011 @sh bclri 01001. ........... 001 ..... 0010011 @sh diff --git a/target/riscv/insn_trans/trans_rvb.c.inc b/target/riscv/insn_tr= ans/trans_rvb.c.inc index a4181dbf0de..ca987f2705f 100644 --- a/target/riscv/insn_trans/trans_rvb.c.inc +++ b/target/riscv/insn_trans/trans_rvb.c.inc @@ -226,6 +226,17 @@ static bool trans_gorci(DisasContext *ctx, arg_gorci *= a) return gen_shifti(ctx, a, gen_helper_gorc); } =20 +#define GEN_TRANS_SHADD(SHAMT) = \ +static bool trans_sh##SHAMT##add(DisasContext *ctx, arg_sh##SHAMT##add *a)= \ +{ = \ + REQUIRE_EXT(ctx, RVB); = \ + return gen_arith(ctx, a, gen_sh##SHAMT##add); = \ +} + +GEN_TRANS_SHADD(1) +GEN_TRANS_SHADD(2) +GEN_TRANS_SHADD(3) + /* RV64-only instructions */ #ifdef TARGET_RISCV64 =20 @@ -367,4 +378,16 @@ static bool trans_gorciw(DisasContext *ctx, arg_gorciw= *a) return gen_shiftiw(ctx, a, gen_gorcw); } =20 +#define GEN_TRANS_SHADD_UW(SHAMT) \ +static bool trans_sh##SHAMT##add_uw(DisasContext *ctx, \ + arg_sh##SHAMT##add_uw *a) \ +{ \ + REQUIRE_EXT(ctx, RVB); \ + return gen_arith(ctx, a, gen_sh##SHAMT##add_uw); \ +} + +GEN_TRANS_SHADD_UW(1) +GEN_TRANS_SHADD_UW(2) +GEN_TRANS_SHADD_UW(3) + #endif diff --git a/target/riscv/translate.c b/target/riscv/translate.c index e1e8315ccbd..7e92cd87851 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -637,6 +637,21 @@ static bool gen_grevi(DisasContext *ctx, arg_grevi *a) return true; } =20 +#define GEN_SHADD(SHAMT) \ +static void gen_sh##SHAMT##add(TCGv ret, TCGv arg1, TCGv arg2) \ +{ \ + TCGv t =3D tcg_temp_new(); \ + \ + tcg_gen_shli_tl(t, arg1, SHAMT); \ + tcg_gen_add_tl(ret, t, arg2); \ + \ + tcg_temp_free(t); \ +} + +GEN_SHADD(1) +GEN_SHADD(2) +GEN_SHADD(3) + #ifdef TARGET_RISCV64 =20 static void gen_ctzw(TCGv ret, TCGv arg1) @@ -723,6 +738,23 @@ static void gen_gorcw(TCGv ret, TCGv arg1, TCGv arg2) gen_helper_gorcw(ret, arg1, arg2); } =20 +#define GEN_SHADD_UW(SHAMT) \ +static void gen_sh##SHAMT##add_uw(TCGv ret, TCGv arg1, TCGv arg2) \ +{ \ + TCGv t =3D tcg_temp_new(); \ + \ + tcg_gen_ext32u_tl(t, arg1); \ + \ + tcg_gen_shli_tl(t, t, SHAMT); \ + tcg_gen_add_tl(ret, t, arg2); \ + \ + tcg_temp_free(t); \ +} + +GEN_SHADD_UW(1) +GEN_SHADD_UW(2) +GEN_SHADD_UW(3) + #endif =20 static bool gen_arith(DisasContext *ctx, arg_r *a, --=20 2.17.1