mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 17:23:56 -06:00
target/riscv: Create function to test if FP is enabled
Let's create a function that tests if floating point support is enabled. We can then protect all floating point operations based on if they are enabled. This patch so far doesn't change anything, it's just preparing for the Hypervisor support for floating point operations. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Christophe de Dinechin <dinechin@redhat.com> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
parent
f14d65e899
commit
b345b48078
3 changed files with 26 additions and 10 deletions
|
@ -46,7 +46,7 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *ops)
|
|||
static int fs(CPURISCVState *env, int csrno)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
@ -108,7 +108,7 @@ static int pmp(CPURISCVState *env, int csrno)
|
|||
static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
@ -119,7 +119,7 @@ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val)
|
|||
static int write_fflags(CPURISCVState *env, int csrno, target_ulong val)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
env->mstatus |= MSTATUS_FS;
|
||||
|
@ -131,7 +131,7 @@ static int write_fflags(CPURISCVState *env, int csrno, target_ulong val)
|
|||
static int read_frm(CPURISCVState *env, int csrno, target_ulong *val)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
@ -142,7 +142,7 @@ static int read_frm(CPURISCVState *env, int csrno, target_ulong *val)
|
|||
static int write_frm(CPURISCVState *env, int csrno, target_ulong val)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
env->mstatus |= MSTATUS_FS;
|
||||
|
@ -154,7 +154,7 @@ static int write_frm(CPURISCVState *env, int csrno, target_ulong val)
|
|||
static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
@ -166,7 +166,7 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val)
|
|||
static int write_fcsr(CPURISCVState *env, int csrno, target_ulong val)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (!env->debugger && !(env->mstatus & MSTATUS_FS)) {
|
||||
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
|
||||
return -1;
|
||||
}
|
||||
env->mstatus |= MSTATUS_FS;
|
||||
|
@ -307,6 +307,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)
|
|||
{
|
||||
target_ulong mstatus = env->mstatus;
|
||||
target_ulong mask = 0;
|
||||
int dirty;
|
||||
|
||||
/* flush tlb on mstatus fields that affect VM */
|
||||
if (env->priv_ver <= PRIV_VERSION_1_09_1) {
|
||||
|
@ -340,8 +341,9 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)
|
|||
|
||||
mstatus = (mstatus & ~mask) | (val & mask);
|
||||
|
||||
int dirty = ((mstatus & MSTATUS_FS) == MSTATUS_FS) |
|
||||
((mstatus & MSTATUS_XS) == MSTATUS_XS);
|
||||
dirty = (riscv_cpu_fp_enabled(env) &&
|
||||
((mstatus & MSTATUS_FS) == MSTATUS_FS)) |
|
||||
((mstatus & MSTATUS_XS) == MSTATUS_XS);
|
||||
mstatus = set_field(mstatus, MSTATUS_SD, dirty);
|
||||
env->mstatus = mstatus;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue