Unverified Commit 83a71719 authored by Richard Henderson's avatar Richard Henderson Committed by Palmer Dabbelt
Browse files

RISC-V: Split out mstatus_fs from tb_flags 



Signed-off-by: default avatarMichael Clark <mjc@sifive.com>
Reviewed-by: default avatarMichael Clark <mjc@sifive.com>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 22c5f446

target/riscv/cpu.h

+3 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ target_ulong cpu_riscv_get_fflags(CPURISCVState *env); 
void cpu_riscv_set_fflags(CPURISCVState *env, target_ulong);



#define TB_FLAGS_MMU_MASK   3

#define TB_FLAGS_FP_ENABLE MSTATUS_FS

#define TB_FLAGS_MSTATUS_FS MSTATUS_FS



static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc,

                                        target_ulong *cs_base, uint32_t *flags)
@@ -284,7 +284,7 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, 
    *pc = env->pc;

    *cs_base = 0;

#ifdef CONFIG_USER_ONLY

    *flags = TB_FLAGS_FP_ENABLE;

    *flags = TB_FLAGS_MSTATUS_FS;

#else

    *flags = cpu_mmu_index(env, 0) | (env->mstatus & MSTATUS_FS);

#endif

target/riscv/translate.c

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef struct DisasContext { 
    /* pc_succ_insn points to the instruction following base.pc_next */

    target_ulong pc_succ_insn;

    uint32_t opcode;

    uint32_t flags;

    uint32_t mstatus_fs;

    uint32_t mem_idx;

    /* Remember the rounding mode encoded in the previous fp instruction,

       which we have already installed into env->fp_status.  Or -1 for
@@ -656,7 +656,7 @@ static void gen_fp_load(DisasContext *ctx, uint32_t opc, int rd, 
{

    TCGv t0;



    if (!(ctx->flags & TB_FLAGS_FP_ENABLE)) {

    if (ctx->mstatus_fs == 0) {

        gen_exception_illegal(ctx);

        return;

    }
@@ -686,7 +686,7 @@ static void gen_fp_store(DisasContext *ctx, uint32_t opc, int rs1, 
{

    TCGv t0;



    if (!(ctx->flags & TB_FLAGS_FP_ENABLE)) {

    if (ctx->mstatus_fs == 0) {

        gen_exception_illegal(ctx);

        return;

    }
@@ -945,7 +945,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, 
{

    TCGv t0 = NULL;



    if (!(ctx->flags & TB_FLAGS_FP_ENABLE)) {

    if (ctx->mstatus_fs == 0) {

        goto do_illegal;

    }
@@ -1818,8 +1818,8 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) 
    DisasContext *ctx = container_of(dcbase, DisasContext, base);



    ctx->pc_succ_insn = ctx->base.pc_first;

    ctx->flags = ctx->base.tb->flags;

    ctx->mem_idx = ctx->base.tb->flags & TB_FLAGS_MMU_MASK;

    ctx->mstatus_fs = ctx->base.tb->flags & TB_FLAGS_MSTATUS_FS;

    ctx->frm = -1;  /* unknown rounding mode */

}