diff options
| author | Alistair Francis | 2020-02-01 02:02:49 +0100 |
|---|---|---|
| committer | Palmer Dabbelt | 2020-02-27 22:46:27 +0100 |
| commit | ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02 (patch) | |
| tree | afa66d26dc0f35eebba44d0a2e4eab458df0c6df /target/riscv/translate.c | |
| parent | target/riscv: Mark both sstatus and msstatus_hs as dirty (diff) | |
| download | qemu-ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02.tar.gz qemu-ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02.tar.xz qemu-ae84dd0ab7eaf7e98cd6ee05b2063cce8ff9bc02.zip | |
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/riscv/translate.c')
| -rw-r--r-- | target/riscv/translate.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 3ce86adb89..b51ab92068 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 |