From patchwork Wed Oct 20 03:17:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515979 Delivered-To: patch@linaro.org Received: by 2002:adf:a11e:0:0:0:0:0 with SMTP id o30csp1317804wro; Tue, 19 Oct 2021 20:19:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwg30TH8g/R9YIh5Crz2q0oG2SH5g7BHav3vSJWVqkSjw4SsX2l3E1nGdQLazFoMDiUKDTj X-Received: by 2002:a9d:4a8d:: with SMTP id i13mr8740790otf.180.1634699946283; Tue, 19 Oct 2021 20:19:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634699946; cv=none; d=google.com; s=arc-20160816; b=aAToskE1u6kroQk9cHrX0l4FaBPTp896PDTVbrLZNePMWZutDgKI0pDckBEgW1vLao CM0oJqD3Rey+vTVigV9LXk4yOZvZPixUD7DgTdWp+gBdZ5G67xG4ipX61KBkti0jyUT+ aRNaQuMljQBRL+dRTdzcK4sylQiZVpx643nA+u4kT4nHXMUUHoa9I6j0y2kOcystmJUu Zi+eKT3SYJz+XOz3vKBoOvNHl5145cKXq/ybnOEiRIhXM7nnHoXg+d0pdUk7B5Y7MAjX I+EpMGdAMMy0A+0WQYOWpBAsT+E2o/ijc75EN+9/v1I25LUZWtGOLi5CPllACRquSF7g oe0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:from :dkim-signature; bh=bBSwvYrqDYoBvyXlKSM9sotJjdfK3T1QfOWZZldWl7E=; b=Mr7lqxkaCg/OtuLpYc2X3pOTk8XezPafl7tuBSvhSE2Z2bV8XPztMZF5gv+k7NzEF/ T3eGKvH7QPYA2yl32qHtNt1Rk2jEzVwHhKrLzZlYByLbHWaHwWIlaqaBD+B5KmOwL/+Z 0py0QLyQbceck0BbK+o0n0s504YK9yVPUzw1zih4jqXasr311lo5Op5bH3b3Zu/iDzue XslshQmLKzYlrxXmQr98/9ZdLYIVCm4nf3u8WnVyvAhYIClgMT6/kZUOWiI/F6R3HCQy 0L/+abCLHslRQiC5NxMsStLYjtrQkj0RS1D3aJm2smr2Hh04F1XCAFYlc/vfBA1qPBqs 7LdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=n50p56Wr; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u9si907906ooj.37.2021.10.19.20.19.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 20:19:06 -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=@linaro.org header.s=google header.b=n50p56Wr; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1md289-0007sM-Dv for patch@linaro.org; Tue, 19 Oct 2021 23:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1md26U-0006sS-MX for qemu-devel@nongnu.org; Tue, 19 Oct 2021 23:17:22 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:43732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1md26Q-00011l-Qp for qemu-devel@nongnu.org; Tue, 19 Oct 2021 23:17:22 -0400 Received: by mail-pl1-x62d.google.com with SMTP id y1so15114500plk.10 for ; Tue, 19 Oct 2021 20:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bBSwvYrqDYoBvyXlKSM9sotJjdfK3T1QfOWZZldWl7E=; b=n50p56Wr/DPeCdE2xHU9kvyD4fD4SpTFnHDfOkke8NQr04Kd3bLwFci5X1q3zTRzpt qmIBiTcllto6mZoCe20soWOMCvenAnnG611pqYqeoC/IWW7jatfWyl6FHhyISJK4GnsZ 3Bq2AwdmhmJdc+MtLixkWWnm/HJNPAGql2LjMT9ckY80zHShiKU7oX5LRIh09laKDDMU kc/uwSjsYbKZJ9KCLZ7bdD0CPJ4R42mjFTYNC3M1PjOe9Bouby575Ru5oWRwPGFAKkFD tiepJFRnymJ1nMaxe5RaQENxAX3eqpjxXVAF2fKf88N+tNTHDCq7dMxUAZw3FG+DUs1z rFIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bBSwvYrqDYoBvyXlKSM9sotJjdfK3T1QfOWZZldWl7E=; b=EkyvNfwgOx2V7rmB0TvsUOYDUcY6ce6QQgtDRIUAZrI6/5YFw43iJ2TrUPXRc9LfYZ chf9C4bd731uMdztMTtJV1HFJINjj4aCP/RyCPSFP2OdGjuJrnJZmHOc/c6bEY1GJdwr XzlQn+Yiw42Bgp2Nd500DLPVKZRR4vuT7p6dyeVNCBmPWRUStbVGqOg515IorR8mfxsQ emgMQ4XGy8EfIiQzJ4x7x+5C78IJfxR3/UJs0cqAU1ZDHQGVK4DkY33hhk4DDVwol0/x USbkj1gwoDAvW9ywBJAnSrhhguJzUXwOVHwGvQv6I/d4MO+6Rn1iP9Xk/3eXyPnzsM1C /7/A== X-Gm-Message-State: AOAM532lTHux96qUTqaD/UjSa4skKOwtvwad0wJihYSjMDK7u0Yf4pvn HTjGpNoOL0xnh/dahfcI0rL9ChPnvr1+cA== X-Received: by 2002:a17:902:be0f:b0:13a:95e:a51 with SMTP id r15-20020a170902be0f00b0013a095e0a51mr36293876pls.44.1634699835429; Tue, 19 Oct 2021 20:17:15 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id c8sm505364pjr.38.2021.10.19.20.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 20:17:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 06/15] target/riscv: Use REQUIRE_64BIT in amo_check64 Date: Tue, 19 Oct 2021 20:17:00 -0700 Message-Id: <20211020031709.359469-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211020031709.359469-1-richard.henderson@linaro.org> References: <20211020031709.359469-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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: alistair.francis@wdc.com, qemu-riscv@nongnu.org, zhiwei_liu@c-sky.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use the same REQUIRE_64BIT check that we use elsewhere, rather than open-coding the use of is_32bit. Reviewed-by: LIU Zhiwei Reviewed-by: Alistair Francis Signed-off-by: Richard Henderson --- target/riscv/insn_trans/trans_rvv.c.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc index f730bd68d1..61fd82d41a 100644 --- a/target/riscv/insn_trans/trans_rvv.c.inc +++ b/target/riscv/insn_trans/trans_rvv.c.inc @@ -743,7 +743,8 @@ static bool amo_check(DisasContext *s, arg_rwdvm* a) static bool amo_check64(DisasContext *s, arg_rwdvm* a) { - return !is_32bit(s) && amo_check(s, a); + REQUIRE_64BIT(s); + return amo_check(s, a); } GEN_VEXT_TRANS(vamoswapw_v, 0, rwdvm, amo_op, amo_check)