aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2020-01-31 17:02:49 -0800
committerPalmer Dabbelt <palmerdabbelt@google.com>2020-02-27 13:46:27 -0800
commitae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02 (patch)
treeafa66d26dc0f35eebba44d0a2e4eab458df0c6df /target
parent45b4dc8b403aa5473ec015336adf7d14d88e85c5 (diff)
downloadqemu-ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02.zip
qemu-ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02.tar.gz
qemu-ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02.tar.bz2
target/riscv: Respect MPRV and SPRV for floating point ops
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 <alistair.francis@wdc.com> Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com> Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Diffstat (limited to 'target')
-rw-r--r--target/riscv/translate.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index 3ce86ad..b51ab92 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -751,7 +751,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