| Message ID | 20180328022233.13400-2-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | RISC-V: Mark FP status dirty | expand |
On Tue, Mar 27, 2018 at 7:22 PM, Richard Henderson < richard.henderson@linaro.org> wrote: > We will want to track changes to mstatus_fs through the TB. > As there is nothing else in tb_flags at the moment, remove > the variable from DisasContext. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Reviewed-by: Michael Clark <mjc@sifive.com> --- > 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 41e06ac0f9..d201dd3e90 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -269,8 +269,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) > @@ -278,7 +278,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 808eab7f50..a30724aa90 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -43,7 +43,7 @@ typedef struct DisasContext { > target_ulong pc; > target_ulong next_pc; > uint32_t opcode; > - uint32_t flags; > + uint32_t mstatus_fs; > uint32_t mem_idx; > int singlestep_enabled; > int bstate; > @@ -665,7 +665,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; > } > @@ -695,7 +695,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; > } > @@ -986,7 +986,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; > } > > @@ -1862,8 +1862,8 @@ void gen_intermediate_code(CPUState *cs, > TranslationBlock *tb) > > ctx.tb = tb; > ctx.bstate = BS_NONE; > - ctx.flags = tb->flags; > ctx.mem_idx = tb->flags & TB_FLAGS_MMU_MASK; > + ctx.mstatus_fs = tb->flags & TB_FLAGS_MSTATUS_FS; > ctx.frm = -1; /* unknown rounding mode */ > > num_insns = 0; > -- > 2.14.3 > >
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 41e06ac0f9..d201dd3e90 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -269,8 +269,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) @@ -278,7 +278,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 808eab7f50..a30724aa90 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -43,7 +43,7 @@ typedef struct DisasContext { target_ulong pc; target_ulong next_pc; uint32_t opcode; - uint32_t flags; + uint32_t mstatus_fs; uint32_t mem_idx; int singlestep_enabled; int bstate; @@ -665,7 +665,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; } @@ -695,7 +695,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; } @@ -986,7 +986,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; } @@ -1862,8 +1862,8 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) ctx.tb = tb; ctx.bstate = BS_NONE; - ctx.flags = tb->flags; ctx.mem_idx = tb->flags & TB_FLAGS_MMU_MASK; + ctx.mstatus_fs = tb->flags & TB_FLAGS_MSTATUS_FS; ctx.frm = -1; /* unknown rounding mode */ num_insns = 0;
We will want to track changes to mstatus_fs through the TB. As there is nothing else in tb_flags at the moment, remove the variable from DisasContext. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/riscv/cpu.h | 6 +++--- target/riscv/translate.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.14.3