From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 75D53C33CB7 for ; Sat, 1 Feb 2020 01:30:50 +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 43BF320663 for ; Sat, 1 Feb 2020 01:30:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="ELQ19UmR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43BF320663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixhcX-0007tb-G9 for qemu-devel@archiver.kernel.org; Fri, 31 Jan 2020 20:30:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57320) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixhIj-0004Xk-4M for qemu-devel@nongnu.org; Fri, 31 Jan 2020 20:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixhIg-0006ni-V4 for qemu-devel@nongnu.org; Fri, 31 Jan 2020 20:10:20 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:17177) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixhIg-0006JU-9z; Fri, 31 Jan 2020 20:10:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1580519417; x=1612055417; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MfQu9HMHEmztw0Fa6fuBAxvAEoLIXu7ltowVnPTQQzc=; b=ELQ19UmRLizUTH97D2avYGKMzGK5UaS0dWAog1WzyAdjQfYWnNIu7tR/ JWwsyHopInLA6wpNBPRPW7d5gSICeCixZQcw0Pca0NqVJDxLgXqHm0lUD qDHKRsbvMY998/o+2avh0MCM97jFXgi63tN0d/C6FACaFN20LH43ipNri cIA6DPMAe0W/dcnBw+J6k8aCJCf9IhVVIItA45mxkcCphzMNbgY2sP0+v 34x2TuqrQZM5bUllzBmLj7qDvWuRSiZvQuLrYqlbCJO4i0KzTTKrHC4EE gXaSxRJn8ul88MYTJfCuWsMWJT5m3oJJcyz10/D/LEZV9LQ4VMT8LyjIt w==; IronPort-SDR: su27YOiF+PqMUcfevtiOGdUysBRlXXCX90+ZzbtCLf1ip5mN7rrXc3Wur5pC8Pb8l9sq3aAkDc VGyP9hH5icsblAjNOiZLYE8z/nuuMzeckK2BS3OpO93mVRdnZf55Iq7xsd0RUbVTvrpPWsrDhQ ueFDS6k9DI8sUljrLV4Vy9h7jzJoLWCFCzIO7iooZjfzII7QtzU46l5F+cJ+hCjjBp+FxcGxbR sy3jWU5Go2wCfPk4EMo9q3l8GrShbIQmp6tqHfP9UblrH1fW36JOApmWsvTX0rrGvhVmlsdh6y wTU= X-IronPort-AV: E=Sophos;i="5.70,388,1574092800"; d="scan'208";a="128872490" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 01 Feb 2020 09:09:26 +0800 IronPort-SDR: 3djEoM8uMpWHtYSUcn6br7uD3n29nKjFiY+n2nHwZqJnqyin7ErWkdCts8EqUJbttlkxL6Yz/q Fn+03R5tYBKh3MyZOVcxTrv61NgwPbnO+yP1dWFmVPMyThT0D/M1XGgizB1L4/J+mDDTUrpEYa k7VTRXG882UvAvpxU2XEpf5VwzR4i7CD5RGdey4f7pZbyvdObixBLF/hukLuv6EypVUBP6l6y7 OdHC3Dwhkvlyi+/fleT+pR5ZdvDgHRITx28PrIKXYlnL0D0qWsOIUdu6Y3Df8YY0dqxwFDzaeb hrU6ZTU+KmTZi8A9eeUUfIo2 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2020 17:02:35 -0800 IronPort-SDR: 7Uv/QrlUt9NqU/BpRAZ50rxhslP37ctsEHcVvWMB92J3R4FPmUTXV0lfpZn5/bZ5yCrM2HcsZ2 /x1BwE6/fv2QM2u+C453peJmB53e3q1yrkb6ANFWdhfAcmu985fZGF6nmxJ93ddXm+vJdVoPmq VWhAnfuCeQzxhJxOjfWcXU2IODJHv/Nhvc0qzhloUleP4jef21ul8ukr7IImgiM4RXvgrU9rqu JPogv8iRzB1j8InsvOaGUNQLU2YN/ex59qYyJsjKdnDpUaW+LXGx5sGtzo9e8ESJqYhmxJAHdX Chs= WDCIronportException: Internal Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip01.wdc.com with ESMTP; 31 Jan 2020 17:09:26 -0800 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 28/35] target/riscv: Respect MPRV and SPRV for floating point ops Date: Fri, 31 Jan 2020 17:02:49 -0800 Message-Id: X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 216.71.154.42 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, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" mark_fs_dirty() is the only place in translate.c that uses the virt_enabled bool. Let's respect the contents of MSTATUS.MPRV and HSTATUS.SPRV when setting the bool as this is used for performing floating point operations when V=0. Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt --- target/riscv/translate.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 61fe9f03be..240fd7c971 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -748,7 +748,21 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->mstatus_fs = ctx->base.tb->flags & TB_FLAGS_MSTATUS_FS; ctx->priv_ver = env->priv_ver; #if !defined(CONFIG_USER_ONLY) - ctx->virt_enabled = riscv_cpu_virt_enabled(env); + if (riscv_has_ext(env, RVH)) { + ctx->virt_enabled = riscv_cpu_virt_enabled(env); + if (env->priv_ver == PRV_M && + get_field(env->mstatus, MSTATUS_MPRV) && + get_field(env->mstatus, MSTATUS_MPV)) { + ctx->virt_enabled = true; + } else if (env->priv == PRV_S && + !riscv_cpu_virt_enabled(env) && + get_field(env->hstatus, HSTATUS_SPRV) && + get_field(env->hstatus, HSTATUS_SPV)) { + ctx->virt_enabled = true; + } + } else { + ctx->virt_enabled = false; + } #else ctx->virt_enabled = false; #endif -- 2.25.0