Unverified Commit 82f01467 authored by ShihPo Hung's avatar ShihPo Hung Committed by Palmer Dabbelt
Browse files

target/riscv: update mstatus.SD when FS is set dirty 



remove the check becuase SD bit should summarize FS and XS fields
unconditionally.

Signed-off-by: default avatarShihPo Hung <shihpo.hung@sifive.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent a59796eb

target/riscv/csr.c

+1 −2
Original line number Diff line number Diff line
@@ -341,8 +341,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) 


    mstatus = (mstatus & ~mask) | (val & mask);



    dirty = (riscv_cpu_fp_enabled(env) &&

             ((mstatus & MSTATUS_FS) == MSTATUS_FS)) |

    dirty = ((mstatus & MSTATUS_FS) == MSTATUS_FS) |

            ((mstatus & MSTATUS_XS) == MSTATUS_XS);

    mstatus = set_field(mstatus, MSTATUS_SD, dirty);

    env->mstatus = mstatus;

target/riscv/translate.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static void mark_fs_dirty(DisasContext *ctx) 


    tmp = tcg_temp_new();

    tcg_gen_ld_tl(tmp, cpu_env, offsetof(CPURISCVState, mstatus));

    tcg_gen_ori_tl(tmp, tmp, MSTATUS_FS);

    tcg_gen_ori_tl(tmp, tmp, MSTATUS_FS | MSTATUS_SD);

    tcg_gen_st_tl(tmp, cpu_env, offsetof(CPURISCVState, mstatus));

    tcg_temp_free(tmp);

}