From patchwork Tue Oct 19 15:24:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515965 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp812727imp; Tue, 19 Oct 2021 09:13:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz73Zf31/kholxZYDIYJdquC+r8irfaf/g0Qj/T+W5AN3vx/A4IBYAxgqtbJgnCqP4a/hED X-Received: by 2002:a05:6102:dc9:: with SMTP id e9mr35783863vst.21.1634660012460; Tue, 19 Oct 2021 09:13:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634660012; cv=none; d=google.com; s=arc-20160816; b=lvoRaKlN7YV5l7jsODbZSDlXRVwTff+zM7aL+tLUCKdfCMq3ePKk9NKPf0Wde3gL5d FeVCPYNtas2k6V2BzyZ4sZGtCgt5Mmoy6Z+L9ylSd6eOZFNFZ/LR4UAEvHAcigoIrYpK n4uxQ+4D5KTWIfadXMsiVOvHRVlVa4OAU5QbO9syCPcmyNyRiIHLcpflkzWYOdi29jc1 Gd6r2uCT1P5EifIgFcqSbJgHBn5KNphDJeOlBDkOcmxfAtmEySP4TN4Y0kz0k2EECogF Tz/2FO/a/RWk+v2/RWacytH6ycOfCnprZ7j476/NQV19Tb477gpp5ah3nkHhSiwnMUQb 5HVg== 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=bokkmTqu3PPB9lUNeGMuiR/uQoelWheprwGuLtvEEIw=; b=VpBV5RQDQLPbrPsDq+yHjR86MtOrMnYKUIcLXW4iBE8QWBiJH0iJsbkqpjbtE17hD6 x5CuPFol3Qm1zCyILbvpUEB7NAWmetToDvK/2FkALmhX//oCRk6+MV0nSigLkH/wCcTj YKHLidiKcz2UMmSE1PtoJiceoXPyFRTgi+cAvCGbZ1zRuQZNguGQGCUyZw4PSA6kwfSv IZlECFLu7clZFQR4QOsiCrQo2MbqE8ESbPWprX6kGmgeJhaPp7u7Q9epDWvlrOJ1wygn in2PKh4YA3FcnG3vuqbc1kJhBSr8Hl/Xsz6EN/07RxFNu+/I59BnUT638mQNaELC52Jo 6/zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="LfPiU/J7"; 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 c14si19223309uav.27.2021.10.19.09.13.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 09:13:32 -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="LfPiU/J7"; 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]:55640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcrk3-0000eC-RL for patch@linaro.org; Tue, 19 Oct 2021 12:13:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcqyw-0004sK-E9 for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:24:50 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:42938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcqyr-0007Wz-7l for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:24:50 -0400 Received: by mail-pl1-x633.google.com with SMTP id w17so2057652plg.9 for ; Tue, 19 Oct 2021 08:24:44 -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=bokkmTqu3PPB9lUNeGMuiR/uQoelWheprwGuLtvEEIw=; b=LfPiU/J7Rk9HLzqW/R6fqFFZXUAHkNXIgDrh+M1Q3XH4UXUOVSqQY91ffjiG4uFBFK i6U3ln/K1LPB4b+hn7wDGH+cHR4aTsA041sUpDK2icOr60qbac+pYsRlNHmajeUYYjWc oQIesK8NIxlv9us56t/rh/qnWwzxTWEXMc7pYMoKdPxSxZuh9CFnLuU8MB0rRPKAeKK7 WnmP1n4xEobWSUtO7vEybXeNXfv6lzz0be4WjWxdipoAwPvs0seehTcJLt8LazL+F24l p3YcbbNMGMY+rZdwxZ4bDl7yiJ9hr5iFMjJJJwQoggHXvxz6s1eneAuqtqmd7RsfjJvr vBgg== 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=bokkmTqu3PPB9lUNeGMuiR/uQoelWheprwGuLtvEEIw=; b=dN8uX6/nDA/55U8NOkK5FzxUXOrAZW3OY+QKVBoVU9+na9f6CxuehuHDtabeqmGuDR MgC+Yi872g7jkaHksIIFPd0mPJQFm3k2bXkwzlrwWSbHkSbF+2yxSr58cs+w3wGghU/V SBCAOtLXW3rzzcDlrVKphYWJF22OJA/a+g3GvwEJXk4N8u9WwqpSUuMIgs3fkymu2JHp aZq9LFHtqn8SOKWMJS4SnEHhDPDpkfF4TLgdhZ6yClfqqZ6r7WMYwkeOD1liIVNvrbeN ZjyzAl2bpYz3Bl0VTObHMEAfSB0EQsFsxosrCSPoN8Ss6XtQAKRwE7ZehY31aN126iPQ KmQQ== X-Gm-Message-State: AOAM530kammNxzgOZpJeLAFG0Q65vssiCFCMqNYAuq6EI5R4Wue/8wTq X8vxnXB2kDDGpl6s7IQffXPvAhWOYzcnzg== X-Received: by 2002:a17:902:9a43:b0:13f:8f31:101c with SMTP id x3-20020a1709029a4300b0013f8f31101cmr26763502plv.76.1634657083903; Tue, 19 Oct 2021 08:24:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id i2sm3293814pjt.19.2021.10.19.08.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 08:24:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 06/16] target/riscv: Use REQUIRE_64BIT in amo_check64 Date: Tue, 19 Oct 2021 08:24:28 -0700 Message-Id: <20211019152438.269077-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019152438.269077-1-richard.henderson@linaro.org> References: <20211019152438.269077-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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 081a5ca34d..d60279b295 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)