Unverified Commit ae84dd0a authored by Alistair Francis's avatar Alistair Francis Committed by Palmer Dabbelt
Browse files

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: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 45b4dc8b

target/riscv/translate.c

+15 −1
Original line number Diff line number Diff line
@@ -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)

    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