target/riscv: csr: Remove redundant check in fp csr read/write routines
PATCH v2 1/1 target/riscv: csr: Remove redundant check in fp csr read/write routines
The following check:
if (!env->debugger && !riscv_cpu_fp_enabled(env)) {
return -RISCV_EXCP_ILLEGAL_INST;
}is redundant in fflags/frm/fcsr read/write routines, as the check was already done in fs().
Signed-off-by Bin Meng <[email protected]>
Reviewed-by Alistair Francis <[email protected]>
---
Changes in v2:
- rebase on qemu/master
target/riscv/csr.c | 24 ------------------------ 1 file changed, 24 deletions(-)
target/riscv/csr.c +0 -24
@@ -215,11 +215,6 @@ static RISCVException epmp(CPURISCVState *env, int csrno)static RISCVException read_fflags (CPURISCVState *env,int csrno,target_ulong *val) { -#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -#endif *val =riscv_cpu_get_fflags (env);return RISCV_EXCP_NONE ; }
@@ -228,9 +223,6 @@ static RISCVException write_fflags(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } env->mstatus |=MSTATUS_FS ;#endif riscv_cpu_set_fflags (env, val & (FSR_AEXC >>FSR_AEXC_SHIFT ));
@@ -240,11 +232,6 @@ static RISCVException write_fflags(CPURISCVState *env, int csrno,static RISCVException read_frm (CPURISCVState *env,int csrno,target_ulong *val) { -#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -#endif *val = env->frm;return RISCV_EXCP_NONE ; }
@@ -253,9 +240,6 @@ static RISCVException write_frm(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } env->mstatus |=MSTATUS_FS ;#endif env->frm = val & (FSR_RD >>FSR_RD_SHIFT );
@@ -265,11 +249,6 @@ static RISCVException write_frm(CPURISCVState *env, int csrno,static RISCVException read_fcsr (CPURISCVState *env,int csrno,target_ulong *val) { -#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -#endif *val = (riscv_cpu_get_fflags (env) <<FSR_AEXC_SHIFT ) | (env->frm <<FSR_RD_SHIFT );if (vs (env, csrno) >=0 ) {
@@ -283,9 +262,6 @@ static RISCVException write_fcsr(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } env->mstatus |=MSTATUS_FS ;#endif env->frm = (val &FSR_RD ) >>FSR_RD_SHIFT ;
Signature · 1 line
2.25.1
Alistair Francis
AppliedQuoted 7 lines · Bin Meng
The following check:
if (!env->debugger && !riscv_cpu_fp_enabled(env)) { return -RISCV_EXCP_ILLEGAL_INST; }
Quoted 5 lines
is redundant in fflags/frm/fcsr read/write routines, as the check was already done in
fs().Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 83 lines
---
Changes in v2:
- rebase on qemu/mastertarget/riscv/csr.c | 24 ------------------------ 1 file changed, 24 deletions(-)target/riscv/csr.c +0
-25@@ -215,11 +215,6 @@ static RISCVException epmp(CPURISCVState *env, int csrno)static RISCVException read_fflags (CPURISCVState *env,int csrno,target_ulong *val) { -#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -#endif *val =riscv_cpu_get_fflags (env);return RISCV_EXCP_NONE ; }@@ -228,9 +223,6 @@ static RISCVException write_fflags(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } env->mstatus |=MSTATUS_FS ;#endif riscv_cpu_set_fflags (env, val & (FSR_AEXC >>FSR_AEXC_SHIFT ));@@ -240,11 +232,6 @@ static RISCVException write_fflags(CPURISCVState *env, int csrno,static RISCVException read_frm (CPURISCVState *env,int csrno,target_ulong *val) { -#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -#endif *val = env->frm;return RISCV_EXCP_NONE ; }@@ -253,9 +240,6 @@ static RISCVException write_frm(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } env->mstatus |=MSTATUS_FS ;#endif env->frm = val & (FSR_RD >>FSR_RD_SHIFT );@@ -265,11 +249,6 @@ static RISCVException write_frm(CPURISCVState *env, int csrno,static RISCVException read_fcsr (CPURISCVState *env,int csrno,target_ulong *val) { -#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -#endif *val = (riscv_cpu_get_fflags (env) <<FSR_AEXC_SHIFT ) | (env->frm <<FSR_RD_SHIFT );if (vs (env, csrno) >=0 ) {@@ -283,9 +262,6 @@ static RISCVException write_fcsr(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return RISCV_EXCP_ILLEGAL_INST ; - } env->mstatus |=MSTATUS_FS ;#endif env->frm = (val &FSR_RD ) >>FSR_RD_SHIFT ; --2.25.1