From patchwork Wed Sep 1 02:09:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 504997 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp3344338jai; Tue, 31 Aug 2021 19:39:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwREMAKPobpaoi71A0ylADzxeK2vICW4g8ByPKpRE9R8w46JYzRaX7r4x0b0C9aYyppYTRl X-Received: by 2002:ac8:57d1:: with SMTP id w17mr6124560qta.138.1630463987029; Tue, 31 Aug 2021 19:39:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630463987; cv=none; d=google.com; s=arc-20160816; b=N9HtHb1J0in/hz+zreXXtbu+QFokZoyAF9nPUJPakLBLctAPWG+RC0qLt1HO9XsWEF C1Lf30NZ3yNe/PMAXbJJylSUgZDX0VOwyG91obITXF99PEpphXGeLg9YknmNJ6TV4SzR MsiAtWHY9UYFpTiF2cnLA7aEGK9HOnEY3ol8/9UfGbU4aH1U9dgsMhHu5h8Pp3rpIIQk bKUh7Ejo5vECflHtzFr9IE7/XdatSapGr/f+RsXyDAVKWzKEhG1INgNOmfOfU8TpUZRA +jdYibbSdY6dRfLRca2gipfjTUqDz94eA0lcR+q7Yf4KqeX95uw0NuqaqqQJRSN1uXDZ 3+tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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 :from:dkim-signature:wdcironportexception:ironport-sdr:ironport-sdr :dkim-signature; bh=v/NIHZEukgzr9FUX/v8QWwI9gx2WRjSgTD8ULxCtYbI=; b=BKSmtPTgRTAc4BKI46+3dAeBQKBODaY6BkfoTuICpNffjmyO2tH35ty+Nt+cS0CX9A 0ZbxGaiNJRFpfaHppeQ9Thu7dR5SxeqNOTw/uKT5f5M9Omk2Gz7axzsx/oPx7+pkTAp3 Hqgby7kHp0IAfmbDQqDmIj1mEboFV+tSPu6vuN+HCMk+wI1qW4wQOhMdhhj7Ijm4Ad/b LNYJhMvLsZw+jGCG2DHC+MK62F/yfmlkbKS4PYWDttc+cvKZfJKyWJZqSQ/1IsbQleHL DPFsikBD45hh9ZgCUm5sfxRU+8OysK2x4VTMrvRWG2gfXiDZBQfHMBBcbklERB6MbaSP 58rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=BvnUYc9w; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b=CunSoqMh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n20si11877204qtp.342.2021.08.31.19.39.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Aug 2021 19:39:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=BvnUYc9w; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b=CunSoqMh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=opensource.wdc.com Received: from localhost ([::1]:33228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLGAE-0001wE-Cy for patch@linaro.org; Tue, 31 Aug 2021 22:39:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLFkY-0007w8-2a for qemu-devel@nongnu.org; Tue, 31 Aug 2021 22:13:14 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:25480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLFkM-0000vn-Cw for qemu-devel@nongnu.org; Tue, 31 Aug 2021 22:13:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1630462382; x=1661998382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UkYP+R8GR9rDdHFoS71xp7/peSpQJfKki2BleBjjKCY=; b=BvnUYc9wfth8Jm0QTtH7o9ZGvNLMVRqBfwYzKW+aUaEW85FrGGSpCaYP ubgAx3XSgeCrDIKLTa3UebUMlROYbhGbNNQvb6kOngiyvtC51+XBbRMj8 a+1Gvj6jhr0kjIU/5kz5Ndz1QQMSpExE4rCvkKMaMomwMI2TLoyWDLLkY WjRCkdZOwFYmmbr8krOwizUSI/pRFohAPMlHL4WUqFk0iVwobkogtsxME l5i2t0u6qM41/nM8K8l3X1Zk/inQK0rWE3x6Fl9N0IJrIXU0QPP4SpBIc +oKk/ITqX1WDjYBN4t4od+Z6Z7BVlbLaLq774exQ9fveyke4m0y7Rvvo/ w==; X-IronPort-AV: E=Sophos;i="5.84,368,1620662400"; d="scan'208";a="282698205" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 01 Sep 2021 10:12:58 +0800 IronPort-SDR: 5Rj5kTYI5iP5oU4Pnyc+KkF7HaYJGntTGwDcPHTCWx2esE4CG7BdKgpvarlt9QJ2b/F/UaJqbX dTOzzmUdHXMsIZ4Ns5akasEPh/Vpwh3oj8RCbOD2Oiao/VnGnku2k+850cv8xjiyhp2pgZPipy IrMDpv3Pczj4KMFI5gXoGLSUnHSHHbjl42ff9i3t8L1R38XZcCA7kEAWQNljWzGrNGkbltNE70 gKMNC4hNvCUfVmxkSY/4ScZB1qb/bvqMpUGSkd3egUKBPBVc8yUZ6NoFC00rq7FZYs6Wn5vsVb 3aWB+V0fW3PK9FszOnVZxHm3 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 18:48:04 -0700 IronPort-SDR: Uphecyn3KL71NrWPNi4bGKPz+0Zs2/6KqZId3gJ+zXA95QduoltQAYu7zWEZOE8vnjqbDHfc9I IaIaUtmNSM8ii1AmYgJGLyaWFm2MwZr+G6fDnEkw/XRi/v9b6rTZZMP1IdjiM8wqIVtvWiUVH1 1IBonFWzMm1kCQIMzdIv2eLxgWYQOteYI2Po08UxBgdmzS9BHDCdeHvI3dvbuYUi2JOEGYsiSe QT348FiWb0/kDLiJH0WI/Uq2j8LfqI9HAjDfHy12bnrxe+O9/90iPW/hf436KP5iwQL9CV8daT aLk= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 19:12:59 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4Gzndk3C45z1RvmK for ; Tue, 31 Aug 2021 19:12:58 -0700 (PDT) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1630462373; x=1633054374; bh=UkYP+R8GR9rDdHFoS7 1xp7/peSpQJfKki2BleBjjKCY=; b=CunSoqMhG2/oqcHGoruKBPVxONkIuSYYqH YRAtzx+d9N5ETCLk3Rh5Ctao6N5l9OkhsBa6JgiVhvDFbQgYFCFegeD0Xfs+/pL5 r1uJxcPdSUBgaOtwtL8uFVCyaVciN9a8C/qJk5GSmAhas13NQUYMOcv8gp89HFMg 2GOc3UMwCd8PY/cgEPHqBQITkNDr5dVFTsKcD3bjjyAgf0dudnSRtRaxxJt9JjdM FHvfhtlVMUeOOFdW/a1WpvXDqATSWgZAN67aK8Fte3f5DoOt2/OUtwZHpWAMFtHO hMzmhvpYPi7fECnF4n9RPtvRen+6wmYQZGSOrqmFR9ebjp2wOYrg== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6c24-5Ocd9mO for ; Tue, 31 Aug 2021 19:12:53 -0700 (PDT) Received: from toolbox.alistair23.me (unknown [10.225.165.16]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4GzndY28GCz1Rvl9; Tue, 31 Aug 2021 19:12:48 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: alistair23@gmail.com, Richard Henderson , Alistair Francis Subject: [PULL 29/33] target/riscv: Use gen_shift_imm_fn for slli_uw Date: Wed, 1 Sep 2021 12:09:54 +1000 Message-Id: <20210901020958.458454-30-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210901020958.458454-1-alistair.francis@opensource.wdc.com> References: <20210901020958.458454-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.143.124; envelope-from=prvs=871df42ed=alistair.francis@opensource.wdc.com; helo=esa2.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Always use tcg_gen_deposit_z_tl; the special case for shamt >= 32 is handled there. Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis Message-id: 20210823195529.560295-21-richard.henderson@linaro.org Signed-off-by: Alistair Francis --- target/riscv/insn_trans/trans_rvb.c.inc | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) -- 2.31.1 diff --git a/target/riscv/insn_trans/trans_rvb.c.inc b/target/riscv/insn_trans/trans_rvb.c.inc index b97c3ca5da..b72e76255c 100644 --- a/target/riscv/insn_trans/trans_rvb.c.inc +++ b/target/riscv/insn_trans/trans_rvb.c.inc @@ -635,21 +635,14 @@ static bool trans_add_uw(DisasContext *ctx, arg_add_uw *a) return gen_arith(ctx, a, EXT_NONE, gen_add_uw); } +static void gen_slli_uw(TCGv dest, TCGv src, target_long shamt) +{ + tcg_gen_deposit_z_tl(dest, src, shamt, MIN(32, TARGET_LONG_BITS - shamt)); +} + static bool trans_slli_uw(DisasContext *ctx, arg_slli_uw *a) { REQUIRE_64BIT(ctx); REQUIRE_EXT(ctx, RVB); - - TCGv source1 = tcg_temp_new(); - gen_get_gpr(ctx, source1, a->rs1); - - if (a->shamt < 32) { - tcg_gen_deposit_z_tl(source1, source1, a->shamt, 32); - } else { - tcg_gen_shli_tl(source1, source1, a->shamt); - } - - gen_set_gpr(ctx, a->rd, source1); - tcg_temp_free(source1); - return true; + return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_slli_uw); }