riscv: Set xPIE to 1 after xRET
PATCH 1/1 riscv: Set xPIE to 1 after xRET
When executing an xRET instruction, supposing xPP holds the value y, xIE is set to xPIE; the privilege mode is changed to y; xPIE is set to 1. But QEMU sets xPIE to 0 incorrectly.
Signed-off-by Yiting Wang <[email protected]>
--- target/riscv/op_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/riscv/op_helper.c +2 -2
@@ -93,7 +93,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) env->priv_ver >=PRIV_VERSION_1_10_0 ?MSTATUS_SIE :MSTATUS_UIE << prev_priv, get_field(mstatus, MSTATUS_SPIE)); - mstatus =set_field (mstatus,MSTATUS_SPIE ,0 ); + mstatus =set_field (mstatus,MSTATUS_SPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_SPP ,PRV_U );riscv_cpu_set_mode (env, prev_priv); env->mstatus = mstatus;
@@ -118,7 +118,7 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) env->priv_ver >=PRIV_VERSION_1_10_0 ?MSTATUS_MIE :MSTATUS_UIE << prev_priv, get_field(mstatus, MSTATUS_MPIE)); - mstatus =set_field (mstatus,MSTATUS_MPIE ,0 ); + mstatus =set_field (mstatus,MSTATUS_MPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_MPP ,PRV_U );riscv_cpu_set_mode (env, prev_priv); env->mstatus = mstatus;
Signature · 1 line
2.7.4
Quoted 10 lines · Yiting Wang
When executing an xRET instruction, supposing xPP holds the value y, xIE is set to xPIE; the privilege mode is changed to y; xPIE is set to 1. But QEMU sets xPIE to 0 incorrectly.
Signed-off-by Yiting Wang <[email protected]>--- target/riscv/op_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by Bin Meng <[email protected]>
Tested-by Bin Meng <[email protected]>
Quoted 6 lines · Yiting Wang
When executing an xRET instruction, supposing xPP holds the value y, xIE is set to xPIE; the privilege mode is changed to y; xPIE is set to 1. But QEMU sets xPIE to 0 incorrectly.
Signed-off-by Yiting Wang <[email protected]>
Reviewed-by Alistair Francis <[email protected]>
Alistair
Quoted 30 lines
--- target/riscv/op_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/riscv/op_helper.c +2
-3@@ -93,7 +93,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) env->priv_ver >=PRIV_VERSION_1_10_0 ?MSTATUS_SIE :MSTATUS_UIE << prev_priv, get_field(mstatus, MSTATUS_SPIE)); - mstatus =set_field (mstatus,MSTATUS_SPIE ,0 ); + mstatus =set_field (mstatus,MSTATUS_SPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_SPP ,PRV_U );riscv_cpu_set_mode (env, prev_priv); env->mstatus = mstatus;@@ -118,7 +118,7 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) env->priv_ver >=PRIV_VERSION_1_10_0 ?MSTATUS_MIE :MSTATUS_UIE << prev_priv, get_field(mstatus, MSTATUS_MPIE)); - mstatus =set_field (mstatus,MSTATUS_MPIE ,0 ); + mstatus =set_field (mstatus,MSTATUS_MPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_MPP ,PRV_U );riscv_cpu_set_mode (env, prev_priv); env->mstatus = mstatus; --2.7.4