From nobody Sat Sep 21 02:53:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=1647956788; cv=none; d=zohomail.com; s=zohoarc; b=Adv/mRFepZh52QHKtX6sPF4uBBhxjj57/zxHzjq80kByyd/QkhC4ESJQuIWNsbzB85u8YBDMApCB6BJk7tFXIYCb4TLAY1HSR+SonV1miONIDZjO2zpwUxfuUGHIG7mmJsSz0czka/XGA6VRo4GBUb/hwYSZZD/U/bvYnBgpFtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647956788; 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=21r0MTqTy6EW9WiBP4H36YUfZKCd0c+Ilx4FpjjR+bM=; b=BOdGbT+MMndNZ/tLDAhrsATM1/KoQAmK1wzG/Dlfkdm2cyxudre/2v4o34fprGpQBuWin3uRwidisLL/vK1R1DaMolnek2q1iCnPCj5k0LFSAtW0O77PZpTDf6QM8CgwqHR9/vN0gRCikLtsUnqGKiXGbPuqJLMpu993Sp7LjRU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1647956788080942.2416723852722; Tue, 22 Mar 2022 06:46:28 -0700 (PDT) Received: from localhost ([::1]:43338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWeqA-0003r3-NJ for importer@patchew.org; Tue, 22 Mar 2022 09:46:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWemZ-0006tC-SC for qemu-devel@nongnu.org; Tue, 22 Mar 2022 09:42:43 -0400 Received: from [2607:f8b0:4864:20::42f] (port=35624 helo=mail-pf1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWemY-0006jG-Cj for qemu-devel@nongnu.org; Tue, 22 Mar 2022 09:42:43 -0400 Received: by mail-pf1-x42f.google.com with SMTP id a5so18231648pfv.2 for ; Tue, 22 Mar 2022 06:42:41 -0700 (PDT) Received: from ThinkPad-T490.dc1.ventanamicro.com ([171.50.204.174]) by smtp.googlemail.com with ESMTPSA id ij17-20020a17090af81100b001c67c964d93sm3101216pjb.2.2022.03.22.06.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 06:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=21r0MTqTy6EW9WiBP4H36YUfZKCd0c+Ilx4FpjjR+bM=; b=LsZYHay1vLbAR8SI2Rj30PnLUa5jxVmhbxElnE/aUzv48U1Alku4cQgNoTo6NZChx8 Dl97ofpfL51ozRW8JVHy5pjGfDhFpff6/dyLJcpWO/mD19tIkWtrVXOVZtVU/PCPOtqo I0cqJC7sMPkdxD04/on/69s0ZdHAy42i47V5gp7m5yfVPyxsCEniEN0wQed1gRmVucb5 3IumG7L3If3btIF9W7geN3QDj2IWz7T3YlrCsD6a0Cje2A5pOKJeInX0t5GM4J2Q4vV3 CEEHze0X8NTbz8w7rc1pGJfr7jrTTF6SV3Z7NOmzQQpDpzkblIrWijsDFPFTOp2Qxy58 GVdg== 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; bh=21r0MTqTy6EW9WiBP4H36YUfZKCd0c+Ilx4FpjjR+bM=; b=ID8QKCeDrPnlTYRfbM9QjfxkoRgn+O8PNmdnL2MpE9u0EGkYPRiX2FUwfI2Dtu5ygt V43hKk97rJJ9t2B4uW8sqc4mtGHBnm1bisp2n2QmptmpO0a40L2RFiUVfpZy/lHJTWSb 7/0CY0s0wVSJ+LlrJCMiC75MlVsA6UyKAtWBX4VJVJTEzUVCNyuZKgh/6gBMLnxAu2Db F/9b0RbQ5Et2cooL854ggHOtln06M2hPROl5FFAz+dcRFkktNI4lt/185jJhi5Tqiuxz PVoN0HhxZLqTMasMkKJxnC31znZplq/H/6UejYT8dFSoL483Bc1Uakv5kkMrU68fFEgj MFXw== X-Gm-Message-State: AOAM5327VC29suYoDtI136T1FBKUAtReW5fWXKWafzBlC5rvQVNS09f+ JGiajzcdzh5BSyun6r9+s9/BxA== X-Google-Smtp-Source: ABdhPJzIT9P54TkWxtJDLib7vJbj7Vwnsn7EDEIoVCA/8BWcbe2MnGf6bvtG+u4Xg89A5ZbUOdGB+Q== X-Received: by 2002:a05:6a00:24cd:b0:4f7:2340:a6cf with SMTP id d13-20020a056a0024cd00b004f72340a6cfmr29243438pfv.36.1647956560270; Tue, 22 Mar 2022 06:42:40 -0700 (PDT) From: Mayuresh Chitale To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [RFC PATCH v1 3/4] target/riscv: smstateen check for fcsr Date: Tue, 22 Mar 2022 19:12:17 +0530 Message-Id: <20220322134218.27322-4-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220322134218.27322-1-mchitale@ventanamicro.com> References: <20220322134218.27322-1-mchitale@ventanamicro.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42f (failed) 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::42f; envelope-from=mchitale@ventanamicro.com; helo=mail-pf1-x42f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mayuresh Chitale , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1647956790452100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If smstateen is implemented and sstateen0.fcsr is clear then the floating point operations must return illegal instruction exception. Signed-off-by: Mayuresh Chitale --- target/riscv/csr.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 46761a6fa8..5d7381c771 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -75,6 +75,10 @@ static RISCVException fs(CPURISCVState *env, int csrno) !RISCV_CPU(env_cpu(env))->cfg.ext_zfinx) { return RISCV_EXCP_ILLEGAL_INST; } + + if (!env->debugger && !riscv_cpu_fp_enabled(env)) { + return smstateen_acc_ok(env, PRV_U, SMSTATEEN0_FCSR); + } #endif return RISCV_EXCP_NONE; } @@ -2005,6 +2009,10 @@ static RISCVException write_mstateen(CPURISCVState *= env, int csrno, uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; =20 reg =3D &env->mstateen[csrno - CSR_MSTATEEN0]; + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + write_smstateen(env, reg, wr_mask, new_val); =20 return RISCV_EXCP_NONE; @@ -2028,6 +2036,10 @@ static RISCVException write_mstateenh(CPURISCVState = *env, int csrno, reg =3D &env->mstateen[csrno - CSR_MSTATEEN0H - 0x10]; val =3D (uint64_t)new_val << 32; val |=3D *reg & 0xFFFFFFFF; + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + write_smstateen(env, reg, wr_mask, val); =20 return RISCV_EXCP_NONE; @@ -2048,6 +2060,10 @@ static RISCVException write_hstateen(CPURISCVState *= env, int csrno, uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; int index =3D csrno - CSR_HSTATEEN0; =20 + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + reg =3D &env->hstateen[index]; wr_mask &=3D env->mstateen[index]; write_smstateen(env, reg, wr_mask, new_val); @@ -2071,6 +2087,10 @@ static RISCVException write_hstateenh(CPURISCVState = *env, int csrno, uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; int index =3D csrno - CSR_HSTATEEN0H - 0x10; =20 + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + reg =3D &env->hstateen[index]; val =3D (uint64_t)new_val << 32; val |=3D *reg & 0xFFFFFFFF; @@ -2096,6 +2116,10 @@ static RISCVException write_sstateen(CPURISCVState *= env, int csrno, int index =3D csrno - CSR_SSTATEEN0; bool virt =3D riscv_cpu_virt_enabled(env); =20 + if (riscv_has_ext(env, RVF)) { + wr_mask |=3D 1UL << SMSTATEEN0_FCSR; + } + reg =3D &env->sstateen[index]; if (virt) { wr_mask &=3D env->mstateen[index]; --=20 2.17.1