diff options
| author | Alistair Francis | 2020-02-01 02:02:41 +0100 |
|---|---|---|
| committer | Palmer Dabbelt | 2020-02-27 22:45:46 +0100 |
| commit | e28eaed87902c5e852c3ed043b27204e879aa4e2 (patch) | |
| tree | 4258f9f4ea3982ed3d4b70172d17c7d9d8e422b8 | |
| parent | target/riscv: Remove the hret instruction (diff) | |
| download | qemu-e28eaed87902c5e852c3ed043b27204e879aa4e2.tar.gz qemu-e28eaed87902c5e852c3ed043b27204e879aa4e2.tar.xz qemu-e28eaed87902c5e852c3ed043b27204e879aa4e2.zip | |
target/riscv: Only set TB flags with FP status if enabled
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
| -rw-r--r-- | target/riscv/cpu.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 5b889a0065..aa04e5cca7 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -332,7 +332,10 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, #ifdef CONFIG_USER_ONLY *flags = TB_FLAGS_MSTATUS_FS; #else - *flags = cpu_mmu_index(env, 0) | (env->mstatus & MSTATUS_FS); + *flags = cpu_mmu_index(env, 0); + if (riscv_cpu_fp_enabled(env)) { + *flags |= env->mstatus & MSTATUS_FS; + } #endif } |