From patchwork Tue Jan 12 09:38:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 12012929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28DF3C433E0 for ; Tue, 12 Jan 2021 09:50:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B343C230FD for ; Tue, 12 Jan 2021 09:50:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B343C230FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzGK4-0004Cv-Pn for qemu-devel@archiver.kernel.org; Tue, 12 Jan 2021 04:50:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzGAF-0002r9-EV for qemu-devel@nongnu.org; Tue, 12 Jan 2021 04:40:35 -0500 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:54908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzGAC-00073S-C7 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 04:40:35 -0500 Received: by mail-pj1-x1032.google.com with SMTP id cq1so1065958pjb.4 for ; Tue, 12 Jan 2021 01:40:26 -0800 (PST) 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=61QjiXctXo3yAQHEh2TCH6xcwkb0TI5rB/BMZKpqTiw=; b=j6bjerPReAcZga2zlDbIeOBxL/vr/kMaQVr7Z6XI7TRCLvJks3ogW2h0pQSRh9M9Jq zJLURRvn9Tmt8M6pSDWIwJA2VTE1Az7tSKt/DPnTlhdusjw32fW3TFFbqp7zq9TljReb VlX1dUE81fY95JaCZupOsGHrT6P0slUVhOtGEcNdjOysIdfCDUzAShRGccPiUFh6iyXn s+t+acVlx24zQzoZ02Bo8elCo5wZED2uOGszRH/NCXsidtwVCsABraJeaya9xXptQBk2 PCWPkD+rBXXB/goaEJLuq322nz2+P3gWDOGgFK682DfBYl0cJklyfOw1JJXBgXmbZH+b Xqrw== 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=61QjiXctXo3yAQHEh2TCH6xcwkb0TI5rB/BMZKpqTiw=; b=XOz3m8XBbf8XOfNkPoKDXk+NiCfZ6oTTHDJd7ePL7eM/ktUoxGTMTwBQWAlxeFnsBr ZhIoKvO4euEh2bcBmwL9EJhkLDLPdeaU+lIY3xKZrIp7qScLKlwodtHnJlYjEe8++kIS tHWXTiU1Aei4+6duqQwZGBWtqJ3ZmN8E0Z4Chia03tPFN0zA4u9/DXchDAgdKIT0JOQF cTne46zeuBpLdGo/vZkxESXFNfZwwPc4S59HTzcj9q+uIxF/7dCwrpLYkfpGs7V2+UpK +HpTE4KKnnXGfd9C8wmWJlB3AoqfvuhXJCS8bfTVvk96A4as4OTuP1ci1m/8PKt71XDW zk+w== X-Gm-Message-State: AOAM530NixPyPoXqC8fqZGKjH5/DpWXZZBAif7vhd/ZhxYiZDDw8UJ6g 7ADKwTmNQ1D8JekywyW3HEg+y7Nqk3aWkEri X-Google-Smtp-Source: ABdhPJxNpazOK/YJxDXXZP5nJj3qeLQ5bEBmBP1zAAy9YpV3msSPUM4X/rizuBtn5f/T4sSFklaLrg== X-Received: by 2002:a17:902:ff0a:b029:de:1d1f:8558 with SMTP id f10-20020a170902ff0ab02900de1d1f8558mr1769672plj.85.1610444425969; Tue, 12 Jan 2021 01:40:25 -0800 (PST) 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 h16sm2865664pgd.62.2021.01.12.01.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 01:40:25 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v6 07/72] target/riscv: rvv-1.0: remove rvv related codes from fcsr registers Date: Tue, 12 Jan 2021 17:38:41 +0800 Message-Id: <20210112093950.17530-8-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210112093950.17530-1-frank.chang@sifive.com> References: <20210112093950.17530-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=frank.chang@sifive.com; helo=mail-pj1-x1032.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=unavailable 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: Frank Chang , Alistair Francis , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Frank Chang * Remove VXRM and VXSAT fields from FCSR register as they are only presented in VCSR register. * Remove RVV loose check in fs() predicate function. Signed-off-by: Frank Chang Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/csr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index c8b1e4954ec..6eda5bacb7c 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -46,10 +46,6 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *ops) static int fs(CPURISCVState *env, int csrno) { #if !defined(CONFIG_USER_ONLY) - /* loose check condition for fcsr in vector extension */ - if ((csrno == CSR_FCSR) && (env->misa & RVV)) { - return 0; - } if (!env->debugger && !riscv_cpu_fp_enabled(env)) { return -RISCV_EXCP_ILLEGAL_INST; } @@ -254,10 +250,6 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val) #endif *val = (riscv_cpu_get_fflags(env) << FSR_AEXC_SHIFT) | (env->frm << FSR_RD_SHIFT); - if (vs(env, csrno) >= 0) { - *val |= (env->vxrm << FSR_VXRM_SHIFT) - | (env->vxsat << FSR_VXSAT_SHIFT); - } return 0; } @@ -268,13 +260,8 @@ static int write_fcsr(CPURISCVState *env, int csrno, target_ulong val) return -RISCV_EXCP_ILLEGAL_INST; } env->mstatus |= MSTATUS_FS; - env->mstatus |= MSTATUS_VS; #endif env->frm = (val & FSR_RD) >> FSR_RD_SHIFT; - if (vs(env, csrno) >= 0) { - env->vxrm = (val & FSR_VXRM) >> FSR_VXRM_SHIFT; - env->vxsat = (val & FSR_VXSAT) >> FSR_VXSAT_SHIFT; - } riscv_cpu_set_fflags(env, (val & FSR_AEXC) >> FSR_AEXC_SHIFT); return 0; }