On Tue, May 22, 2018 at 5:14 PM, Michael Clark <m...@sifive.com> wrote: > From: Richard Henderson <richard.hender...@linaro.org> > > Cc: Sagar Karandikar <sag...@eecs.berkeley.edu> > Cc: Bastian Koppelmann <kbast...@mail.uni-paderborn.de> > Cc: Palmer Dabbelt <pal...@sifive.com> > Cc: Alistair Francis <alistair.fran...@wdc.com> > Cc: Richard Henderson <richard.hender...@linaro.org> > Signed-off-by: Michael Clark <m...@sifive.com> > Reviewed-by: Michael Clark <m...@sifive.com>
Shouldn't this also have Richard's SOB line? Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> Alistair > --- > target/riscv/cpu.h | 6 +++--- > target/riscv/translate.c | 10 +++++----- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 3a3d91447736..242a8fcbe180 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -276,8 +276,8 @@ void QEMU_NORETURN do_raise_exception_err(CPURISCVState > *env, > 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_MMU_MASK 3 > +#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) > @@ -285,7 +285,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 > diff --git a/target/riscv/translate.c b/target/riscv/translate.c > index ee2bbc55b051..466b9551cbd9 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -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; > } > > @@ -1810,8 +1810,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 */ > } > > -- > 2.7.0 > >