RTISC-V: Remove deprecated ISA, CPUs and machines
v3 cover RTISC-V: Remove deprecated ISA, CPUs and machines
v3:
- Don't use SiFive CPUs for Spike machine
v2:
- Remove the CPUs and ISA seperatley
Alistair Francis (3):
hw/riscv: spike: Remove deprecated ISA specific machines target/riscv: Remove the deprecated CPUs target/riscv: Drop support for ISA spec version 1.09.1
include/hw/riscv/spike.h | 6 +- target/riscv/cpu.h | 8 - hw/riscv/spike.c | 217 ------------------ target/riscv/cpu.c | 30 --- target/riscv/cpu_helper.c | 82 +++---- target/riscv/csr.c | 118 ++-------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +- tests/qtest/machine-none-test.c | 4 +- 10 files changed, 60 insertions(+), 445 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/3 hw/riscv: spike: Remove deprecated ISA specific machines
The ISA specific Spike machines have been deprecated in QEMU since 4.1, let's finally remove them.
--- include/hw/riscv/spike.h | 6 +- hw/riscv/spike.c | 217 --------------------------------------- 2 files changed, 2 insertions(+), 221 deletions(-)
include/hw/riscv/spike.h +2 -4
@@ -39,11 +39,9 @@ enum { };#if defined(TARGET_RISCV32 ) -#define SPIKE_V1_09_1_CPU TYPE_RISCV_CPU_RV32GCSU_V1_09_1 -#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_RV32GCSU_V1_10_0 +#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_BASE32#elif defined(TARGET_RISCV64 ) -#define SPIKE_V1_09_1_CPU TYPE_RISCV_CPU_RV64GCSU_V1_09_1 -#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_RV64GCSU_V1_10_0 +#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_BASE64#endif #endif
hw/riscv/spike.c +0 -217
227 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v3 2/3 target/riscv: Remove the deprecated CPUs
In reply to Alistair Francis--- target/riscv/cpu.h | 7 ------- target/riscv/cpu.c | 28 ---------------------------- tests/qtest/machine-none-test.c | 4 ++-- 3 files changed, 2 insertions(+), 37 deletions(-)
target/riscv/cpu.h +0 -7
@@ -40,13 +40,6 @@#define TYPE_RISCV_CPU_SIFIVE_E51 RISCV_CPU_TYPE_NAME("sifive-e51")#define TYPE_RISCV_CPU_SIFIVE_U34 RISCV_CPU_TYPE_NAME("sifive-u34")#define TYPE_RISCV_CPU_SIFIVE_U54 RISCV_CPU_TYPE_NAME("sifive-u54") -/* Deprecated */ -#define TYPE_RISCV_CPU_RV32IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv32imacu-nommu") -#define TYPE_RISCV_CPU_RV32GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.9.1") -#define TYPE_RISCV_CPU_RV32GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.10.0") -#define TYPE_RISCV_CPU_RV64IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv64imacu-nommu") -#define TYPE_RISCV_CPU_RV64GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv64gcsu-v1.9.1") -#define TYPE_RISCV_CPU_RV64GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv64gcsu-v1.10.0")#define RV32 ((target_ulong)1 << (TARGET_LONG_BITS - 2))#define RV64 ((target_ulong)2 << (TARGET_LONG_BITS - 2))
target/riscv/cpu.c +0 -28
@@ -135,16 +135,6 @@ static void riscv_base32_cpu_init(Object *obj)set_misa (env,0 ); } -static void rv32gcsu_priv1_09_1_cpu_init (Object *obj) -{ -CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -set_priv_version (env,PRIV_VERSION_1_09_1 ); -set_resetvec (env,DEFAULT_RSTVEC ); -set_feature (env,RISCV_FEATURE_MMU ); -set_feature (env,RISCV_FEATURE_PMP ); -} -static void rv32gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -182,16 +172,6 @@ static void riscv_base64_cpu_init(Object *obj)set_misa (env,0 ); } -static void rv64gcsu_priv1_09_1_cpu_init (Object *obj) -{ -CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV64 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -set_priv_version (env,PRIV_VERSION_1_09_1 ); -set_resetvec (env,DEFAULT_RSTVEC ); -set_feature (env,RISCV_FEATURE_MMU ); -set_feature (env,RISCV_FEATURE_PMP ); -} -static void rv64gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -621,18 +601,10 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_init), -/* Depreacted */ -DEFINE_CPU (TYPE_RISCV_CPU_RV32IMACU_NOMMU , rv32imacu_nommu_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_RV32GCSU_V1_09_1 , rv32gcsu_priv1_09_1_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_10_0, rv32gcsu_priv1_10_0_cpu_init) #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base64_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64gcsu_priv1_10_0_cpu_init), -/* Deprecated */ -DEFINE_CPU (TYPE_RISCV_CPU_RV64IMACU_NOMMU , rv64imacu_nommu_cpu_init), -DEFINE_CPU (TYPE_RISCV_CPU_RV64GCSU_V1_09_1 , rv64gcsu_priv1_09_1_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_RV64GCSU_V1_10_0, rv64gcsu_priv1_10_0_cpu_init)#endif };
tests/qtest/machine-none-test.c +2 -2
@@ -54,8 +54,8 @@ static struct arch2cpu cpus_map[] = { { "xtensa", "dc233c" }, { "xtensaeb", "fsf" }, { "hppa", "hppa" }, - { "riscv64", "rv64gcsu-v1.10.0" }, - { "riscv32", "rv32gcsu-v1.9.1" }, + { "riscv64", "sifive-u54" }, + { "riscv32", "sifive-u34" }, { "rx", "rx62n" }, };
Signature · 1 line
2.26.2
PATCH v3 3/3 target/riscv: Drop support for ISA spec version 1.09.1
In reply to Alistair FrancisThe RISC-V ISA spec version 1.09.1 has been deprecated in QEMU since 4.1. It's not commonly used so let's remove support for it.
--- target/riscv/cpu.h | 1 - target/riscv/cpu.c | 2 - target/riscv/cpu_helper.c | 82 +++++------- target/riscv/csr.c | 118 +++--------------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +-- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +-- 7 files changed, 56 insertions(+), 187 deletions(-)
target/riscv/cpu.h +0 -1
@@ -73,7 +73,6 @@ enum { RISCV_FEATURE_MISA }; -#define PRIV_VERSION_1_09_1 0x00010901#define PRIV_VERSION_1_10_0 0x00011000#define PRIV_VERSION_1_11_0 0x00011100
target/riscv/cpu.c +0 -2
@@ -368,8 +368,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) priv_version =PRIV_VERSION_1_11_0 ; }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.10.0" )) { priv_version =PRIV_VERSION_1_10_0 ; - }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.9.1" )) { - priv_version =PRIV_VERSION_1_09_1 ; }else { error_setg(errp, "Unsupported privilege spec version '%s'",
target/riscv/cpu_helper.c +29 -53
109 lines not on this page · raw message
target/riscv/csr.c +18 -100
215 lines not on this page · raw message
target/riscv/insn_trans/trans_privileged.inc.c +4 -14
@@ -85,30 +85,21 @@ static bool trans_wfi(DisasContext *ctx, arg_wfi *a)static bool trans_sfence_vma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } +gen_helper_tlb_flush (cpu_env); +return true;#endif return false; }static bool trans_sfence_vm (DisasContext *ctx,arg_sfence_vm *a) { -#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver <=PRIV_VERSION_1_09_1 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } -#endif return false; }static bool trans_hfence_gvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M ||
@@ -127,8 +118,7 @@ static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a)static bool trans_hfence_bvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M ||
target/riscv/monitor.c +0 -5
@@ -215,11 +215,6 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)return ; } -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -monitor_printf (mon,"Privileged mode < 1.10 unsupported\n" ); -return ; - } -if (!(env->satp &SATP_MODE )) {monitor_printf (mon,"No translation or protection\n" );return ;
target/riscv/op_helper.c +5 -12
@@ -84,8 +84,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)riscv_raise_exception (env,RISCV_EXCP_INST_ADDR_MIS ,GETPC ()); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) { +if (get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }
@@ -119,10 +118,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) }else { prev_priv =get_field (mstatus,MSTATUS_SPP ); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_SIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_SPIE )); + mstatus =set_field (mstatus,MSTATUS_SIE , +get_field (mstatus,MSTATUS_SPIE )); mstatus =set_field (mstatus,MSTATUS_SPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_SPP ,PRV_U ); env->mstatus = mstatus;
@@ -147,10 +144,8 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb)target_ulong mstatus = env->mstatus;target_ulong prev_priv =get_field (mstatus,MSTATUS_MPP );target_ulong prev_virt =MSTATUS_MPV_ISSET (env); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_MIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_MPIE )); + mstatus =set_field (mstatus,MSTATUS_MIE , +get_field (mstatus,MSTATUS_MPIE )); mstatus =set_field (mstatus,MSTATUS_MPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_MPP ,PRV_U );#ifdef TARGET_RISCV32
@@ -177,7 +172,6 @@ void helper_wfi(CPURISCVState *env)CPUState *cs =env_cpu (env);if ((env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TW )) ||riscv_cpu_virt_enabled (env)) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ());
@@ -193,7 +187,6 @@ void helper_tlb_flush(CPURISCVState *env)CPUState *cs =env_cpu (env);if (!(env->priv >=PRV_S ) || (env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TVM ))) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }else {
Signature · 1 line
2.26.2
Re: [PATCH v3 3/3] target/riscv: Drop support for ISA spec version 1.09.1
сре, 27. мај 2020. у 00:56 Alistair Francis <[email protected]> је написао/ла:
Quoted 4 lines
The RISC-V ISA spec version 1.09.1 has been deprecated in QEMU since 4.1. It's not commonly used so let's remove support for it.
Hmmm, a very odd commit message. Do you suggest that there could be the case that spec version 1.09.1 has been deprecated, but, let's say, it remained commonly in use, and in that case, supposedly, it wouldn't be removed (even though it was annonced as deprecated), or, even "undeprecated"? I am not saying anything is wrong, but just looks like an uncommon explanation for removing after deprecating, like a novel approach to the deprecation process.
Best Regards,
Aleksandar
Quoted 507 lines
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.h | 1 - target/riscv/cpu.c | 2 - target/riscv/cpu_helper.c | 82 +++++------- target/riscv/csr.c | 118 +++--------------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +-- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +-- 7 files changed, 56 insertions(+), 187 deletions(-)target/riscv/cpu.h +0
-1@@ -73,7 +73,6 @@ enum { RISCV_FEATURE_MISA }; -#define PRIV_VERSION_1_09_1 0x00010901#define PRIV_VERSION_1_10_0 0x00011000#define PRIV_VERSION_1_11_0 0x00011100target/riscv/cpu.c +0
-2@@ -368,8 +368,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) priv_version =PRIV_VERSION_1_11_0 ; }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.10.0" )) { priv_version =PRIV_VERSION_1_10_0 ; - }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.9.1" )) { - priv_version =PRIV_VERSION_1_09_1 ; }else { error_setg(errp, "Unsupported privilege spec version '%s'",target/riscv/cpu_helper.c +29
-53@@ -364,57 +364,36 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, mxr =get_field (env->vsstatus,MSTATUS_MXR ); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if (first_stage == true) { -if (use_background) { - base = (hwaddr )get_field (env->vsatp,SATP_PPN ) <<PGSHIFT ; - vm =get_field (env->vsatp,SATP_MODE ); - }else { - base = (hwaddr )get_field (env->satp,SATP_PPN ) <<PGSHIFT ; - vm =get_field (env->satp,SATP_MODE ); - } - widened =0 ; +if (first_stage == true) { +if (use_background) { + base = (hwaddr )get_field (env->vsatp,SATP_PPN ) <<PGSHIFT ; + vm =get_field (env->vsatp,SATP_MODE ); }else { - base = (hwaddr )get_field (env->hgatp,HGATP_PPN ) <<PGSHIFT ; - vm =get_field (env->hgatp,HGATP_MODE ); - widened =2 ; - } - sum =get_field (env->mstatus,MSTATUS_SUM ); -switch (vm) { -case VM_1_10_SV32 : - levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; -case VM_1_10_SV39 : - levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_SV48 : - levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_SV57 : - levels =5 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_MBARE : - *physical = addr; - *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; -return TRANSLATE_SUCCESS ; -default : -g_assert_not_reached (); + base = (hwaddr )get_field (env->satp,SATP_PPN ) <<PGSHIFT ; + vm =get_field (env->satp,SATP_MODE ); } - }else { widened =0 ; - base = (hwaddr)(env->sptbr) <<PGSHIFT ; - sum = !get_field (env->mstatus,MSTATUS_PUM ); - vm =get_field (env->mstatus,MSTATUS_VM ); -switch (vm) { -case VM_1_09_SV32 : - levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; -case VM_1_09_SV39 : - levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_09_SV48 : - levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_09_MBARE : - *physical = addr; - *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; -return TRANSLATE_SUCCESS ; -default : -g_assert_not_reached (); - } + }else { + base = (hwaddr )get_field (env->hgatp,HGATP_PPN ) <<PGSHIFT ; + vm =get_field (env->hgatp,HGATP_MODE ); + widened =2 ; + } + sum =get_field (env->mstatus,MSTATUS_SUM ); +switch (vm) { +case VM_1_10_SV32 : + levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; +case VM_1_10_SV39 : + levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_SV48 : + levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_SV57 : + levels =5 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_MBARE : + *physical = addr; + *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; +return TRANSLATE_SUCCESS ; +default : +g_assert_not_reached (); }CPUState *cs =env_cpu (env);@@ -588,7 +567,6 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address,int page_fault_exceptions;if (first_stage) { page_fault_exceptions = - (env->priv_ver >=PRIV_VERSION_1_10_0 ) &&get_field (env->satp,SATP_MODE ) !=VM_1_10_MBARE && !pmp_violation; }else {@@ -941,8 +919,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) } s = env->mstatus; - s =set_field (s,MSTATUS_SPIE , env->priv_ver >=PRIV_VERSION_1_10_0 ? -get_field (s,MSTATUS_SIE ) :get_field (s,MSTATUS_UIE << env->priv)); + s =set_field (s,MSTATUS_SPIE ,get_field (s,MSTATUS_SIE )); s =set_field (s,MSTATUS_SPP , env->priv); s =set_field (s,MSTATUS_SIE ,0 ); env->mstatus = s;@@ -979,8 +956,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) } s = env->mstatus; - s =set_field (s,MSTATUS_MPIE , env->priv_ver >=PRIV_VERSION_1_10_0 ? -get_field (s,MSTATUS_MIE ) :get_field (s,MSTATUS_UIE << env->priv)); + s =set_field (s,MSTATUS_MPIE ,get_field (s,MSTATUS_MIE )); s =set_field (s,MSTATUS_MPP , env->priv); s =set_field (s,MSTATUS_MIE ,0 ); env->mstatus = s;target/riscv/csr.c +18
-100@@ -58,31 +58,11 @@ static int ctr(CPURISCVState *env, int csrno)#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs); -uint32_t ctr_en = ~0u ;if (!cpu->cfg.ext_counters) {/* The Counters extensions is not enabled */ return -1 ; } - -/* -* The counters are always enabled at run time on newer priv specs, as the -* CSR has changed from controlling that the counters can be read to -* controlling that the counters increment. -*/ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return 0 ; - } - -if (env->priv <PRV_M ) { - ctr_en &= env->mcounteren; - } -if (env->priv <PRV_S ) { - ctr_en &= env->scounteren; - } -if (!(ctr_en & (1u << (csrno &31 )))) { -return -1 ; - }#endif return 0 ; }@@ -293,9 +273,6 @@ static const target_ulong delegable_excps = (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT )) | (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT )) | (1ULL << (RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT )); -static const target_ulong sstatus_v1_9_mask =SSTATUS_SIE |SSTATUS_SPIE | -SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS | -SSTATUS_SUM |SSTATUS_SD ;static const target_ulong sstatus_v1_10_mask =SSTATUS_SIE |SSTATUS_SPIE |SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS |SSTATUS_SUM |SSTATUS_MXR |SSTATUS_SD ;@@ -304,20 +281,11 @@ static const target_ulong hip_writable_mask = MIP_VSSIP | MIP_VSTIP | MIP_VSEIP;static const target_ulong vsip_writable_mask =MIP_VSSIP ;#if defined(TARGET_RISCV32 ) -static const char valid_vm_1_09[16 ] = { - [VM_1_09_MBARE ] =1 , - [VM_1_09_SV32 ] =1 , -};static const char valid_vm_1_10[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV32 ] =1 };#elif defined(TARGET_RISCV64 ) -static const char valid_vm_1_09[16 ] = { - [VM_1_09_MBARE ] =1 , - [VM_1_09_SV39 ] =1 , - [VM_1_09_SV48 ] =1 , -};static const char valid_vm_1_10[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV39] = 1,@@ -347,8 +315,7 @@ static int read_mstatus(CPURISCVState *env, int csrno, target_ulong *val)static int validate_vm (CPURISCVState *env,target_ulong vm) { -return (env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - valid_vm_1_10[vm &0xf ] : valid_vm_1_09[vm &0xf ]; +return valid_vm_1_10[vm &0xf ]; }static int write_mstatus (CPURISCVState *env,int csrno,target_ulong val)@@ -358,34 +325,21 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)int dirty;/* flush tlb on mstatus fields that affect VM */ -if (env->priv_ver <=PRIV_VERSION_1_09_1 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP | -MSTATUS_MPRV |MSTATUS_SUM |MSTATUS_VM )) { -tlb_flush (env_cpu (env)); - } - mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | -MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | -MSTATUS_MPP |MSTATUS_MXR | - (validate_vm (env,get_field (val,MSTATUS_VM )) ? -MSTATUS_VM :0 ); +if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV | +MSTATUS_MPRV |MSTATUS_SUM )) { +tlb_flush (env_cpu (env)); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV | -MSTATUS_MPRV |MSTATUS_SUM )) { -tlb_flush (env_cpu (env)); - } - mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | -MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | -MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR | -MSTATUS_TW ; + mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | +MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | +MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR | +MSTATUS_TW ;#if defined(TARGET_RISCV64 ) -/* -* RV32: MPV and MTL are not in mstatus. The current plan is to -* add them to mstatush. For now, we just don't support it. -*/ - mask |=MSTATUS_MTL |MSTATUS_MPV ; +/* +* RV32: MPV and MTL are not in mstatus. The current plan is to +* add them to mstatush. For now, we just don't support it. +*/ + mask |=MSTATUS_MTL |MSTATUS_MPV ;#endif - } mstatus = (mstatus & ~mask) | (val & mask);@@ -534,18 +488,12 @@ static int write_mtvec(CPURISCVState *env, int csrno, target_ulong val)static int read_mcounteren (CPURISCVState *env,int csrno,target_ulong *val) { -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -return -1 ; - } *val = env->mcounteren;return 0 ; }static int write_mcounteren (CPURISCVState *env,int csrno,target_ulong val) { -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -return -1 ; - } env->mcounteren = val;return 0 ; }@@ -553,8 +501,7 @@ static int write_mcounteren(CPURISCVState *env, int csrno, target_ulong val)/* This regiser is replaced with CSR_MCOUNTINHIBIT in 1.11.0 */ static int read_mscounteren (CPURISCVState *env,int csrno,target_ulong *val) { -if (env->priv_ver >PRIV_VERSION_1_09_1 - && env->priv_ver <PRIV_VERSION_1_11_0 ) { +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return -1 ; } *val = env->mcounteren;@@ -564,32 +511,13 @@ static int read_mscounteren(CPURISCVState *env, int csrno, target_ulong *val)/* This regiser is replaced with CSR_MCOUNTINHIBIT in 1.11.0 */ static int write_mscounteren (CPURISCVState *env,int csrno,target_ulong val) { -if (env->priv_ver >PRIV_VERSION_1_09_1 - && env->priv_ver <PRIV_VERSION_1_11_0 ) { +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return -1 ; } env->mcounteren = val;return 0 ; } -static int read_mucounteren (CPURISCVState *env,int csrno,target_ulong *val) -{ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return -1 ; - } - *val = env->scounteren; -return 0 ; -} - -static int write_mucounteren (CPURISCVState *env,int csrno,target_ulong val) -{ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return -1 ; - } - env->scounteren = val; -return 0 ; -} -/* Machine Trap Handling */ static int read_mscratch (CPURISCVState *env,int csrno,target_ulong *val) {@@ -663,16 +591,14 @@ static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value,/* Supervisor Trap Setup */ static int read_sstatus (CPURISCVState *env,int csrno,target_ulong *val) { -target_ulong mask = ((env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - sstatus_v1_10_mask : sstatus_v1_9_mask); +target_ulong mask = (sstatus_v1_10_mask); *val = env->mstatus & mask;return 0 ; }static int write_sstatus (CPURISCVState *env,int csrno,target_ulong val) { -target_ulong mask = ((env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - sstatus_v1_10_mask : sstatus_v1_9_mask); +target_ulong mask = (sstatus_v1_10_mask);target_ulong newval = (env->mstatus & ~mask) | (val & mask);return write_mstatus (env,CSR_MSTATUS , newval); }@@ -829,13 +755,7 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val)if (!riscv_feature (env,RISCV_FEATURE_MMU )) {return 0 ; } -if (env->priv_ver <=PRIV_VERSION_1_09_1 && (val ^ env->sptbr)) { -tlb_flush (env_cpu (env)); - env->sptbr = val & (((target_ulong ) -1 << (TARGET_PHYS_ADDR_SPACE_BITS -PGSHIFT )) -1 ); - } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -validate_vm (env,get_field (val,SATP_MODE )) && +if (validate_vm (env,get_field (val,SATP_MODE )) && ((val ^ env->satp) & (SATP_MODE |SATP_ASID |SATP_PPN ))) {if (env->priv ==PRV_S &&get_field (env->mstatus,MSTATUS_TVM )) {@@ -1313,8 +1233,6 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MSTATUSH] = { any, read_mstatush, write_mstatush }, #endif -/* Legacy Counter Setup (priv v1.9.1) */ - [CSR_MUCOUNTEREN] = { any, read_mucounteren, write_mucounteren }, [CSR_MSCOUNTEREN] = { any, read_mscounteren, write_mscounteren },/* Machine Trap Handling */ target/riscv/insn_trans/trans_privileged.inc.c +4
-14@@ -85,30 +85,21 @@ static bool trans_wfi(DisasContext *ctx, arg_wfi *a)static bool trans_sfence_vma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } +gen_helper_tlb_flush (cpu_env); +return true;#endif return false; }static bool trans_sfence_vm (DisasContext *ctx,arg_sfence_vm *a) { -#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver <=PRIV_VERSION_1_09_1 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } -#endif return false; }static bool trans_hfence_gvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M || @@ -127,8 +118,7 @@ static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a)static bool trans_hfence_bvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M || target/riscv/monitor.c +0
-5@@ -215,11 +215,6 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)return ; } -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -monitor_printf (mon,"Privileged mode < 1.10 unsupported\n" ); -return ; - } -if (!(env->satp &SATP_MODE )) {monitor_printf (mon,"No translation or protection\n" );return ;target/riscv/op_helper.c +5
-13@@ -84,8 +84,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)riscv_raise_exception (env,RISCV_EXCP_INST_ADDR_MIS ,GETPC ()); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) { +if (get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }@@ -119,10 +118,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) }else { prev_priv =get_field (mstatus,MSTATUS_SPP ); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_SIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_SPIE )); + mstatus =set_field (mstatus,MSTATUS_SIE , +get_field (mstatus,MSTATUS_SPIE )); mstatus =set_field (mstatus,MSTATUS_SPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_SPP ,PRV_U ); env->mstatus = mstatus;@@ -147,10 +144,8 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb)target_ulong mstatus = env->mstatus;target_ulong prev_priv =get_field (mstatus,MSTATUS_MPP );target_ulong prev_virt =MSTATUS_MPV_ISSET (env); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_MIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_MPIE )); + mstatus =set_field (mstatus,MSTATUS_MIE , +get_field (mstatus,MSTATUS_MPIE )); mstatus =set_field (mstatus,MSTATUS_MPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_MPP ,PRV_U );#ifdef TARGET_RISCV32 @@ -177,7 +172,6 @@ void helper_wfi(CPURISCVState *env)CPUState *cs =env_cpu (env);if ((env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TW )) ||riscv_cpu_virt_enabled (env)) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ());@@ -193,7 +187,6 @@ void helper_tlb_flush(CPURISCVState *env)CPUState *cs =env_cpu (env);if (!(env->priv >=PRV_S ) || (env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TVM ))) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }else { --2.26.2
Re: [PATCH v3 3/3] target/riscv: Drop support for ISA spec version 1.09.1
Quoted 8 lines · Aleksandar Markovic
сре, 27. мај 2020. у 00:56 Alistair Francis <[email protected]> је написао/ла:
Quoted 4 lines
The RISC-V ISA spec version 1.09.1 has been deprecated in QEMU since 4.1. It's not commonly used so let's remove support for it.
Quoted 5 lines
Hmmm, a very odd commit message. Do you suggest that there could be the case that spec version 1.09.1 has been deprecated, but, let's say, it remained commonly in use, and in that case, supposedly, it wouldn't be removed (even though it was annonced as deprecated), or, even "undeprecated"? I am not saying anything is wrong, but just looks like
The commit message was just confirming why it was deprecated in the first place. AFAIK no one is using the 1.09.1 version of the spec.
In saying that I think that it could be "undeprecated". I don't use the 1.09.1 and no one I know uses it, but if after deprecating it in QEMU a large group of users voiced interest in it, I think we would still keep it around. That would depend on the burden and teh level of interest. So I think things could be "undeprecated" or at least the deprecation timeline could be extended if required or requested.
Alistair
Quoted 515 lines
an uncommon explanation for removing after deprecating, like a novel approach to the deprecation process.
Best Regards,
AleksandarQuoted 507 lines
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.h | 1 - target/riscv/cpu.c | 2 - target/riscv/cpu_helper.c | 82 +++++------- target/riscv/csr.c | 118 +++--------------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +-- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +-- 7 files changed, 56 insertions(+), 187 deletions(-)target/riscv/cpu.h +0
-1@@ -73,7 +73,6 @@ enum { RISCV_FEATURE_MISA }; -#define PRIV_VERSION_1_09_1 0x00010901#define PRIV_VERSION_1_10_0 0x00011000#define PRIV_VERSION_1_11_0 0x00011100target/riscv/cpu.c +0
-2@@ -368,8 +368,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) priv_version =PRIV_VERSION_1_11_0 ; }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.10.0" )) { priv_version =PRIV_VERSION_1_10_0 ; - }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.9.1" )) { - priv_version =PRIV_VERSION_1_09_1 ; }else { error_setg(errp, "Unsupported privilege spec version '%s'",target/riscv/cpu_helper.c +29
-53@@ -364,57 +364,36 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, mxr =get_field (env->vsstatus,MSTATUS_MXR ); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if (first_stage == true) { -if (use_background) { - base = (hwaddr )get_field (env->vsatp,SATP_PPN ) <<PGSHIFT ; - vm =get_field (env->vsatp,SATP_MODE ); - }else { - base = (hwaddr )get_field (env->satp,SATP_PPN ) <<PGSHIFT ; - vm =get_field (env->satp,SATP_MODE ); - } - widened =0 ; +if (first_stage == true) { +if (use_background) { + base = (hwaddr )get_field (env->vsatp,SATP_PPN ) <<PGSHIFT ; + vm =get_field (env->vsatp,SATP_MODE ); }else { - base = (hwaddr )get_field (env->hgatp,HGATP_PPN ) <<PGSHIFT ; - vm =get_field (env->hgatp,HGATP_MODE ); - widened =2 ; - } - sum =get_field (env->mstatus,MSTATUS_SUM ); -switch (vm) { -case VM_1_10_SV32 : - levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; -case VM_1_10_SV39 : - levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_SV48 : - levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_SV57 : - levels =5 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_MBARE : - *physical = addr; - *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; -return TRANSLATE_SUCCESS ; -default : -g_assert_not_reached (); + base = (hwaddr )get_field (env->satp,SATP_PPN ) <<PGSHIFT ; + vm =get_field (env->satp,SATP_MODE ); } - }else { widened =0 ; - base = (hwaddr)(env->sptbr) <<PGSHIFT ; - sum = !get_field (env->mstatus,MSTATUS_PUM ); - vm =get_field (env->mstatus,MSTATUS_VM ); -switch (vm) { -case VM_1_09_SV32 : - levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; -case VM_1_09_SV39 : - levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_09_SV48 : - levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_09_MBARE : - *physical = addr; - *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; -return TRANSLATE_SUCCESS ; -default : -g_assert_not_reached (); - } + }else { + base = (hwaddr )get_field (env->hgatp,HGATP_PPN ) <<PGSHIFT ; + vm =get_field (env->hgatp,HGATP_MODE ); + widened =2 ; + } + sum =get_field (env->mstatus,MSTATUS_SUM ); +switch (vm) { +case VM_1_10_SV32 : + levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; +case VM_1_10_SV39 : + levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_SV48 : + levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_SV57 : + levels =5 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_MBARE : + *physical = addr; + *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; +return TRANSLATE_SUCCESS ; +default : +g_assert_not_reached (); }CPUState *cs =env_cpu (env);@@ -588,7 +567,6 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address,int page_fault_exceptions;if (first_stage) { page_fault_exceptions = - (env->priv_ver >=PRIV_VERSION_1_10_0 ) &&get_field (env->satp,SATP_MODE ) !=VM_1_10_MBARE && !pmp_violation; }else {@@ -941,8 +919,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) } s = env->mstatus; - s =set_field (s,MSTATUS_SPIE , env->priv_ver >=PRIV_VERSION_1_10_0 ? -get_field (s,MSTATUS_SIE ) :get_field (s,MSTATUS_UIE << env->priv)); + s =set_field (s,MSTATUS_SPIE ,get_field (s,MSTATUS_SIE )); s =set_field (s,MSTATUS_SPP , env->priv); s =set_field (s,MSTATUS_SIE ,0 ); env->mstatus = s;@@ -979,8 +956,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) } s = env->mstatus; - s =set_field (s,MSTATUS_MPIE , env->priv_ver >=PRIV_VERSION_1_10_0 ? -get_field (s,MSTATUS_MIE ) :get_field (s,MSTATUS_UIE << env->priv)); + s =set_field (s,MSTATUS_MPIE ,get_field (s,MSTATUS_MIE )); s =set_field (s,MSTATUS_MPP , env->priv); s =set_field (s,MSTATUS_MIE ,0 ); env->mstatus = s;target/riscv/csr.c +18
-100@@ -58,31 +58,11 @@ static int ctr(CPURISCVState *env, int csrno)#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs); -uint32_t ctr_en = ~0u ;if (!cpu->cfg.ext_counters) {/* The Counters extensions is not enabled */ return -1 ; } - -/* -* The counters are always enabled at run time on newer priv specs, as the -* CSR has changed from controlling that the counters can be read to -* controlling that the counters increment. -*/ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return 0 ; - } - -if (env->priv <PRV_M ) { - ctr_en &= env->mcounteren; - } -if (env->priv <PRV_S ) { - ctr_en &= env->scounteren; - } -if (!(ctr_en & (1u << (csrno &31 )))) { -return -1 ; - }#endif return 0 ; }@@ -293,9 +273,6 @@ static const target_ulong delegable_excps = (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT )) | (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT )) | (1ULL << (RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT )); -static const target_ulong sstatus_v1_9_mask =SSTATUS_SIE |SSTATUS_SPIE | -SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS | -SSTATUS_SUM |SSTATUS_SD ;static const target_ulong sstatus_v1_10_mask =SSTATUS_SIE |SSTATUS_SPIE |SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS |SSTATUS_SUM |SSTATUS_MXR |SSTATUS_SD ;@@ -304,20 +281,11 @@ static const target_ulong hip_writable_mask = MIP_VSSIP | MIP_VSTIP | MIP_VSEIP;static const target_ulong vsip_writable_mask =MIP_VSSIP ;#if defined(TARGET_RISCV32 ) -static const char valid_vm_1_09[16 ] = { - [VM_1_09_MBARE ] =1 , - [VM_1_09_SV32 ] =1 , -};static const char valid_vm_1_10[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV32 ] =1 };#elif defined(TARGET_RISCV64 ) -static const char valid_vm_1_09[16 ] = { - [VM_1_09_MBARE ] =1 , - [VM_1_09_SV39 ] =1 , - [VM_1_09_SV48 ] =1 , -};static const char valid_vm_1_10[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV39] = 1,@@ -347,8 +315,7 @@ static int read_mstatus(CPURISCVState *env, int csrno, target_ulong *val)static int validate_vm (CPURISCVState *env,target_ulong vm) { -return (env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - valid_vm_1_10[vm &0xf ] : valid_vm_1_09[vm &0xf ]; +return valid_vm_1_10[vm &0xf ]; }static int write_mstatus (CPURISCVState *env,int csrno,target_ulong val)@@ -358,34 +325,21 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)int dirty;/* flush tlb on mstatus fields that affect VM */ -if (env->priv_ver <=PRIV_VERSION_1_09_1 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP | -MSTATUS_MPRV |MSTATUS_SUM |MSTATUS_VM )) { -tlb_flush (env_cpu (env)); - } - mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | -MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | -MSTATUS_MPP |MSTATUS_MXR | - (validate_vm (env,get_field (val,MSTATUS_VM )) ? -MSTATUS_VM :0 ); +if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV | +MSTATUS_MPRV |MSTATUS_SUM )) { +tlb_flush (env_cpu (env)); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV | -MSTATUS_MPRV |MSTATUS_SUM )) { -tlb_flush (env_cpu (env)); - } - mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | -MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | -MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR | -MSTATUS_TW ; + mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | +MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | +MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR | +MSTATUS_TW ;#if defined(TARGET_RISCV64 ) -/* -* RV32: MPV and MTL are not in mstatus. The current plan is to -* add them to mstatush. For now, we just don't support it. -*/ - mask |=MSTATUS_MTL |MSTATUS_MPV ; +/* +* RV32: MPV and MTL are not in mstatus. The current plan is to +* add them to mstatush. For now, we just don't support it. +*/ + mask |=MSTATUS_MTL |MSTATUS_MPV ;#endif - } mstatus = (mstatus & ~mask) | (val & mask);@@ -534,18 +488,12 @@ static int write_mtvec(CPURISCVState *env, int csrno, target_ulong val)static int read_mcounteren (CPURISCVState *env,int csrno,target_ulong *val) { -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -return -1 ; - } *val = env->mcounteren;return 0 ; }static int write_mcounteren (CPURISCVState *env,int csrno,target_ulong val) { -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -return -1 ; - } env->mcounteren = val;return 0 ; }@@ -553,8 +501,7 @@ static int write_mcounteren(CPURISCVState *env, int csrno, target_ulong val)/* This regiser is replaced with CSR_MCOUNTINHIBIT in 1.11.0 */ static int read_mscounteren (CPURISCVState *env,int csrno,target_ulong *val) { -if (env->priv_ver >PRIV_VERSION_1_09_1 - && env->priv_ver <PRIV_VERSION_1_11_0 ) { +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return -1 ; } *val = env->mcounteren;@@ -564,32 +511,13 @@ static int read_mscounteren(CPURISCVState *env, int csrno, target_ulong *val)/* This regiser is replaced with CSR_MCOUNTINHIBIT in 1.11.0 */ static int write_mscounteren (CPURISCVState *env,int csrno,target_ulong val) { -if (env->priv_ver >PRIV_VERSION_1_09_1 - && env->priv_ver <PRIV_VERSION_1_11_0 ) { +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return -1 ; } env->mcounteren = val;return 0 ; } -static int read_mucounteren (CPURISCVState *env,int csrno,target_ulong *val) -{ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return -1 ; - } - *val = env->scounteren; -return 0 ; -} - -static int write_mucounteren (CPURISCVState *env,int csrno,target_ulong val) -{ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return -1 ; - } - env->scounteren = val; -return 0 ; -} -/* Machine Trap Handling */ static int read_mscratch (CPURISCVState *env,int csrno,target_ulong *val) {@@ -663,16 +591,14 @@ static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value,/* Supervisor Trap Setup */ static int read_sstatus (CPURISCVState *env,int csrno,target_ulong *val) { -target_ulong mask = ((env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - sstatus_v1_10_mask : sstatus_v1_9_mask); +target_ulong mask = (sstatus_v1_10_mask); *val = env->mstatus & mask;return 0 ; }static int write_sstatus (CPURISCVState *env,int csrno,target_ulong val) { -target_ulong mask = ((env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - sstatus_v1_10_mask : sstatus_v1_9_mask); +target_ulong mask = (sstatus_v1_10_mask);target_ulong newval = (env->mstatus & ~mask) | (val & mask);return write_mstatus (env,CSR_MSTATUS , newval); }@@ -829,13 +755,7 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val)if (!riscv_feature (env,RISCV_FEATURE_MMU )) {return 0 ; } -if (env->priv_ver <=PRIV_VERSION_1_09_1 && (val ^ env->sptbr)) { -tlb_flush (env_cpu (env)); - env->sptbr = val & (((target_ulong ) -1 << (TARGET_PHYS_ADDR_SPACE_BITS -PGSHIFT )) -1 ); - } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -validate_vm (env,get_field (val,SATP_MODE )) && +if (validate_vm (env,get_field (val,SATP_MODE )) && ((val ^ env->satp) & (SATP_MODE |SATP_ASID |SATP_PPN ))) {if (env->priv ==PRV_S &&get_field (env->mstatus,MSTATUS_TVM )) {@@ -1313,8 +1233,6 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MSTATUSH] = { any, read_mstatush, write_mstatush }, #endif -/* Legacy Counter Setup (priv v1.9.1) */ - [CSR_MUCOUNTEREN] = { any, read_mucounteren, write_mucounteren }, [CSR_MSCOUNTEREN] = { any, read_mscounteren, write_mscounteren },/* Machine Trap Handling */ target/riscv/insn_trans/trans_privileged.inc.c +4
-14@@ -85,30 +85,21 @@ static bool trans_wfi(DisasContext *ctx, arg_wfi *a)static bool trans_sfence_vma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } +gen_helper_tlb_flush (cpu_env); +return true;#endif return false; }static bool trans_sfence_vm (DisasContext *ctx,arg_sfence_vm *a) { -#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver <=PRIV_VERSION_1_09_1 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } -#endif return false; }static bool trans_hfence_gvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M || @@ -127,8 +118,7 @@ static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a)static bool trans_hfence_bvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M || target/riscv/monitor.c +0
-5@@ -215,11 +215,6 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)return ; } -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -monitor_printf (mon,"Privileged mode < 1.10 unsupported\n" ); -return ; - } -if (!(env->satp &SATP_MODE )) {monitor_printf (mon,"No translation or protection\n" );return ;target/riscv/op_helper.c +5
-13@@ -84,8 +84,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)riscv_raise_exception (env,RISCV_EXCP_INST_ADDR_MIS ,GETPC ()); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) { +if (get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }@@ -119,10 +118,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) }else { prev_priv =get_field (mstatus,MSTATUS_SPP ); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_SIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_SPIE )); + mstatus =set_field (mstatus,MSTATUS_SIE , +get_field (mstatus,MSTATUS_SPIE )); mstatus =set_field (mstatus,MSTATUS_SPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_SPP ,PRV_U ); env->mstatus = mstatus;@@ -147,10 +144,8 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb)target_ulong mstatus = env->mstatus;target_ulong prev_priv =get_field (mstatus,MSTATUS_MPP );target_ulong prev_virt =MSTATUS_MPV_ISSET (env); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_MIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_MPIE )); + mstatus =set_field (mstatus,MSTATUS_MIE , +get_field (mstatus,MSTATUS_MPIE )); mstatus =set_field (mstatus,MSTATUS_MPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_MPP ,PRV_U );#ifdef TARGET_RISCV32 @@ -177,7 +172,6 @@ void helper_wfi(CPURISCVState *env)CPUState *cs =env_cpu (env);if ((env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TW )) ||riscv_cpu_virt_enabled (env)) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ());@@ -193,7 +187,6 @@ void helper_tlb_flush(CPURISCVState *env)CPUState *cs =env_cpu (env);if (!(env->priv >=PRV_S ) || (env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TVM ))) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }else { --2.26.2
Re: [PATCH v3 3/3] target/riscv: Drop support for ISA spec version 1.09.1
сре, 27. мај 2020. у 02:33 Alistair Francis <[email protected]> је написао/ла:
Quoted 20 lines
Quoted 8 lines · Aleksandar Markovic
сре, 27. мај 2020. у 00:56 Alistair Francis <[email protected]> је написао/ла:
Quoted 4 lines
The RISC-V ISA spec version 1.09.1 has been deprecated in QEMU since 4.1. It's not commonly used so let's remove support for it.
Quoted 5 lines
Hmmm, a very odd commit message. Do you suggest that there could be the case that spec version 1.09.1 has been deprecated, but, let's say, it remained commonly in use, and in that case, supposedly, it wouldn't be removed (even though it was annonced as deprecated), or, even "undeprecated"? I am not saying anything is wrong, but just looks like
The commit message was just confirming why it was deprecated in the first place. AFAIK no one is using the 1.09.1 version of the spec.
Quoted 9 lines
In saying that I think that it could be "undeprecated". I don't use the 1.09.1 and no one I know uses it, but if after deprecating it in QEMU a large group of users voiced interest in it, I think we would still keep it around. That would depend on the burden and teh level of interest. So I think things could be "undeprecated" or at least the deprecation timeline could be extended if required or requested.
Alistair
Fair enough.
Quoted 515 lines
Quoted 515 lines
an uncommon explanation for removing after deprecating, like a novel approach to the deprecation process.
Best Regards,
AleksandarQuoted 507 lines
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.h | 1 - target/riscv/cpu.c | 2 - target/riscv/cpu_helper.c | 82 +++++------- target/riscv/csr.c | 118 +++--------------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +-- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +-- 7 files changed, 56 insertions(+), 187 deletions(-)target/riscv/cpu.h +0
-1@@ -73,7 +73,6 @@ enum { RISCV_FEATURE_MISA }; -#define PRIV_VERSION_1_09_1 0x00010901#define PRIV_VERSION_1_10_0 0x00011000#define PRIV_VERSION_1_11_0 0x00011100target/riscv/cpu.c +0
-2@@ -368,8 +368,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) priv_version =PRIV_VERSION_1_11_0 ; }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.10.0" )) { priv_version =PRIV_VERSION_1_10_0 ; - }else if (!g_strcmp0 (cpu->cfg.priv_spec,"v1.9.1" )) { - priv_version =PRIV_VERSION_1_09_1 ; }else { error_setg(errp, "Unsupported privilege spec version '%s'",target/riscv/cpu_helper.c +29
-53@@ -364,57 +364,36 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, mxr =get_field (env->vsstatus,MSTATUS_MXR ); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if (first_stage == true) { -if (use_background) { - base = (hwaddr )get_field (env->vsatp,SATP_PPN ) <<PGSHIFT ; - vm =get_field (env->vsatp,SATP_MODE ); - }else { - base = (hwaddr )get_field (env->satp,SATP_PPN ) <<PGSHIFT ; - vm =get_field (env->satp,SATP_MODE ); - } - widened =0 ; +if (first_stage == true) { +if (use_background) { + base = (hwaddr )get_field (env->vsatp,SATP_PPN ) <<PGSHIFT ; + vm =get_field (env->vsatp,SATP_MODE ); }else { - base = (hwaddr )get_field (env->hgatp,HGATP_PPN ) <<PGSHIFT ; - vm =get_field (env->hgatp,HGATP_MODE ); - widened =2 ; - } - sum =get_field (env->mstatus,MSTATUS_SUM ); -switch (vm) { -case VM_1_10_SV32 : - levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; -case VM_1_10_SV39 : - levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_SV48 : - levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_SV57 : - levels =5 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_10_MBARE : - *physical = addr; - *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; -return TRANSLATE_SUCCESS ; -default : -g_assert_not_reached (); + base = (hwaddr )get_field (env->satp,SATP_PPN ) <<PGSHIFT ; + vm =get_field (env->satp,SATP_MODE ); } - }else { widened =0 ; - base = (hwaddr)(env->sptbr) <<PGSHIFT ; - sum = !get_field (env->mstatus,MSTATUS_PUM ); - vm =get_field (env->mstatus,MSTATUS_VM ); -switch (vm) { -case VM_1_09_SV32 : - levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; -case VM_1_09_SV39 : - levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_09_SV48 : - levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; -case VM_1_09_MBARE : - *physical = addr; - *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; -return TRANSLATE_SUCCESS ; -default : -g_assert_not_reached (); - } + }else { + base = (hwaddr )get_field (env->hgatp,HGATP_PPN ) <<PGSHIFT ; + vm =get_field (env->hgatp,HGATP_MODE ); + widened =2 ; + } + sum =get_field (env->mstatus,MSTATUS_SUM ); +switch (vm) { +case VM_1_10_SV32 : + levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; +case VM_1_10_SV39 : + levels =3 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_SV48 : + levels =4 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_SV57 : + levels =5 ; ptidxbits =9 ; ptesize =8 ;break ; +case VM_1_10_MBARE : + *physical = addr; + *prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; +return TRANSLATE_SUCCESS ; +default : +g_assert_not_reached (); }CPUState *cs =env_cpu (env);@@ -588,7 +567,6 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address,int page_fault_exceptions;if (first_stage) { page_fault_exceptions = - (env->priv_ver >=PRIV_VERSION_1_10_0 ) &&get_field (env->satp,SATP_MODE ) !=VM_1_10_MBARE && !pmp_violation; }else {@@ -941,8 +919,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) } s = env->mstatus; - s =set_field (s,MSTATUS_SPIE , env->priv_ver >=PRIV_VERSION_1_10_0 ? -get_field (s,MSTATUS_SIE ) :get_field (s,MSTATUS_UIE << env->priv)); + s =set_field (s,MSTATUS_SPIE ,get_field (s,MSTATUS_SIE )); s =set_field (s,MSTATUS_SPP , env->priv); s =set_field (s,MSTATUS_SIE ,0 ); env->mstatus = s;@@ -979,8 +956,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) } s = env->mstatus; - s =set_field (s,MSTATUS_MPIE , env->priv_ver >=PRIV_VERSION_1_10_0 ? -get_field (s,MSTATUS_MIE ) :get_field (s,MSTATUS_UIE << env->priv)); + s =set_field (s,MSTATUS_MPIE ,get_field (s,MSTATUS_MIE )); s =set_field (s,MSTATUS_MPP , env->priv); s =set_field (s,MSTATUS_MIE ,0 ); env->mstatus = s;target/riscv/csr.c +18
-100@@ -58,31 +58,11 @@ static int ctr(CPURISCVState *env, int csrno)#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs); -uint32_t ctr_en = ~0u ;if (!cpu->cfg.ext_counters) {/* The Counters extensions is not enabled */ return -1 ; } - -/* -* The counters are always enabled at run time on newer priv specs, as the -* CSR has changed from controlling that the counters can be read to -* controlling that the counters increment. -*/ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return 0 ; - } - -if (env->priv <PRV_M ) { - ctr_en &= env->mcounteren; - } -if (env->priv <PRV_S ) { - ctr_en &= env->scounteren; - } -if (!(ctr_en & (1u << (csrno &31 )))) { -return -1 ; - }#endif return 0 ; }@@ -293,9 +273,6 @@ static const target_ulong delegable_excps = (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT )) | (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT )) | (1ULL << (RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT )); -static const target_ulong sstatus_v1_9_mask =SSTATUS_SIE |SSTATUS_SPIE | -SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS | -SSTATUS_SUM |SSTATUS_SD ;static const target_ulong sstatus_v1_10_mask =SSTATUS_SIE |SSTATUS_SPIE |SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS |SSTATUS_SUM |SSTATUS_MXR |SSTATUS_SD ;@@ -304,20 +281,11 @@ static const target_ulong hip_writable_mask = MIP_VSSIP | MIP_VSTIP | MIP_VSEIP;static const target_ulong vsip_writable_mask =MIP_VSSIP ;#if defined(TARGET_RISCV32 ) -static const char valid_vm_1_09[16 ] = { - [VM_1_09_MBARE ] =1 , - [VM_1_09_SV32 ] =1 , -};static const char valid_vm_1_10[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV32 ] =1 };#elif defined(TARGET_RISCV64 ) -static const char valid_vm_1_09[16 ] = { - [VM_1_09_MBARE ] =1 , - [VM_1_09_SV39 ] =1 , - [VM_1_09_SV48 ] =1 , -};static const char valid_vm_1_10[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV39] = 1,@@ -347,8 +315,7 @@ static int read_mstatus(CPURISCVState *env, int csrno, target_ulong *val)static int validate_vm (CPURISCVState *env,target_ulong vm) { -return (env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - valid_vm_1_10[vm &0xf ] : valid_vm_1_09[vm &0xf ]; +return valid_vm_1_10[vm &0xf ]; }static int write_mstatus (CPURISCVState *env,int csrno,target_ulong val)@@ -358,34 +325,21 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)int dirty;/* flush tlb on mstatus fields that affect VM */ -if (env->priv_ver <=PRIV_VERSION_1_09_1 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP | -MSTATUS_MPRV |MSTATUS_SUM |MSTATUS_VM )) { -tlb_flush (env_cpu (env)); - } - mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | -MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | -MSTATUS_MPP |MSTATUS_MXR | - (validate_vm (env,get_field (val,MSTATUS_VM )) ? -MSTATUS_VM :0 ); +if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV | +MSTATUS_MPRV |MSTATUS_SUM )) { +tlb_flush (env_cpu (env)); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV | -MSTATUS_MPRV |MSTATUS_SUM )) { -tlb_flush (env_cpu (env)); - } - mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | -MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | -MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR | -MSTATUS_TW ; + mask =MSTATUS_SIE |MSTATUS_SPIE |MSTATUS_MIE |MSTATUS_MPIE | +MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM | +MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR | +MSTATUS_TW ;#if defined(TARGET_RISCV64 ) -/* -* RV32: MPV and MTL are not in mstatus. The current plan is to -* add them to mstatush. For now, we just don't support it. -*/ - mask |=MSTATUS_MTL |MSTATUS_MPV ; +/* +* RV32: MPV and MTL are not in mstatus. The current plan is to +* add them to mstatush. For now, we just don't support it. +*/ + mask |=MSTATUS_MTL |MSTATUS_MPV ;#endif - } mstatus = (mstatus & ~mask) | (val & mask);@@ -534,18 +488,12 @@ static int write_mtvec(CPURISCVState *env, int csrno, target_ulong val)static int read_mcounteren (CPURISCVState *env,int csrno,target_ulong *val) { -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -return -1 ; - } *val = env->mcounteren;return 0 ; }static int write_mcounteren (CPURISCVState *env,int csrno,target_ulong val) { -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -return -1 ; - } env->mcounteren = val;return 0 ; }@@ -553,8 +501,7 @@ static int write_mcounteren(CPURISCVState *env, int csrno, target_ulong val)/* This regiser is replaced with CSR_MCOUNTINHIBIT in 1.11.0 */ static int read_mscounteren (CPURISCVState *env,int csrno,target_ulong *val) { -if (env->priv_ver >PRIV_VERSION_1_09_1 - && env->priv_ver <PRIV_VERSION_1_11_0 ) { +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return -1 ; } *val = env->mcounteren;@@ -564,32 +511,13 @@ static int read_mscounteren(CPURISCVState *env, int csrno, target_ulong *val)/* This regiser is replaced with CSR_MCOUNTINHIBIT in 1.11.0 */ static int write_mscounteren (CPURISCVState *env,int csrno,target_ulong val) { -if (env->priv_ver >PRIV_VERSION_1_09_1 - && env->priv_ver <PRIV_VERSION_1_11_0 ) { +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return -1 ; } env->mcounteren = val;return 0 ; } -static int read_mucounteren (CPURISCVState *env,int csrno,target_ulong *val) -{ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return -1 ; - } - *val = env->scounteren; -return 0 ; -} - -static int write_mucounteren (CPURISCVState *env,int csrno,target_ulong val) -{ -if (env->priv_ver >PRIV_VERSION_1_09_1 ) { -return -1 ; - } - env->scounteren = val; -return 0 ; -} -/* Machine Trap Handling */ static int read_mscratch (CPURISCVState *env,int csrno,target_ulong *val) {@@ -663,16 +591,14 @@ static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value,/* Supervisor Trap Setup */ static int read_sstatus (CPURISCVState *env,int csrno,target_ulong *val) { -target_ulong mask = ((env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - sstatus_v1_10_mask : sstatus_v1_9_mask); +target_ulong mask = (sstatus_v1_10_mask); *val = env->mstatus & mask;return 0 ; }static int write_sstatus (CPURISCVState *env,int csrno,target_ulong val) { -target_ulong mask = ((env->priv_ver >=PRIV_VERSION_1_10_0 ) ? - sstatus_v1_10_mask : sstatus_v1_9_mask); +target_ulong mask = (sstatus_v1_10_mask);target_ulong newval = (env->mstatus & ~mask) | (val & mask);return write_mstatus (env,CSR_MSTATUS , newval); }@@ -829,13 +755,7 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val)if (!riscv_feature (env,RISCV_FEATURE_MMU )) {return 0 ; } -if (env->priv_ver <=PRIV_VERSION_1_09_1 && (val ^ env->sptbr)) { -tlb_flush (env_cpu (env)); - env->sptbr = val & (((target_ulong ) -1 << (TARGET_PHYS_ADDR_SPACE_BITS -PGSHIFT )) -1 ); - } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -validate_vm (env,get_field (val,SATP_MODE )) && +if (validate_vm (env,get_field (val,SATP_MODE )) && ((val ^ env->satp) & (SATP_MODE |SATP_ASID |SATP_PPN ))) {if (env->priv ==PRV_S &&get_field (env->mstatus,MSTATUS_TVM )) {@@ -1313,8 +1233,6 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MSTATUSH] = { any, read_mstatush, write_mstatush }, #endif -/* Legacy Counter Setup (priv v1.9.1) */ - [CSR_MUCOUNTEREN] = { any, read_mucounteren, write_mucounteren }, [CSR_MSCOUNTEREN] = { any, read_mscounteren, write_mscounteren },/* Machine Trap Handling */ target/riscv/insn_trans/trans_privileged.inc.c +4
-14@@ -85,30 +85,21 @@ static bool trans_wfi(DisasContext *ctx, arg_wfi *a)static bool trans_sfence_vma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } +gen_helper_tlb_flush (cpu_env); +return true;#endif return false; }static bool trans_sfence_vm (DisasContext *ctx,arg_sfence_vm *a) { -#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver <=PRIV_VERSION_1_09_1 ) { -gen_helper_tlb_flush (cpu_env); -return true; - } -#endif return false; }static bool trans_hfence_gvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M || @@ -127,8 +118,7 @@ static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a)static bool trans_hfence_bvma (DisasContext *ctx,arg_sfence_vma *a) {#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { +if (has_ext (ctx,RVH )) {/* Hpervisor extensions exist */ /* * if (env->priv == PRV_M || target/riscv/monitor.c +0
-5@@ -215,11 +215,6 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)return ; } -if (env->priv_ver <PRIV_VERSION_1_10_0 ) { -monitor_printf (mon,"Privileged mode < 1.10 unsupported\n" ); -return ; - } -if (!(env->satp &SATP_MODE )) {monitor_printf (mon,"No translation or protection\n" );return ;target/riscv/op_helper.c +5
-13@@ -84,8 +84,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)riscv_raise_exception (env,RISCV_EXCP_INST_ADDR_MIS ,GETPC ()); } -if (env->priv_ver >=PRIV_VERSION_1_10_0 && -get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) { +if (get_field (env->mstatus,MSTATUS_TSR ) && !(env->priv >=PRV_M )) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }@@ -119,10 +118,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) }else { prev_priv =get_field (mstatus,MSTATUS_SPP ); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_SIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_SPIE )); + mstatus =set_field (mstatus,MSTATUS_SIE , +get_field (mstatus,MSTATUS_SPIE )); mstatus =set_field (mstatus,MSTATUS_SPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_SPP ,PRV_U ); env->mstatus = mstatus;@@ -147,10 +144,8 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb)target_ulong mstatus = env->mstatus;target_ulong prev_priv =get_field (mstatus,MSTATUS_MPP );target_ulong prev_virt =MSTATUS_MPV_ISSET (env); - mstatus =set_field (mstatus, - env->priv_ver >=PRIV_VERSION_1_10_0 ? -MSTATUS_MIE :MSTATUS_UIE << prev_priv, -get_field (mstatus,MSTATUS_MPIE )); + mstatus =set_field (mstatus,MSTATUS_MIE , +get_field (mstatus,MSTATUS_MPIE )); mstatus =set_field (mstatus,MSTATUS_MPIE ,1 ); mstatus =set_field (mstatus,MSTATUS_MPP ,PRV_U );#ifdef TARGET_RISCV32 @@ -177,7 +172,6 @@ void helper_wfi(CPURISCVState *env)CPUState *cs =env_cpu (env);if ((env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TW )) ||riscv_cpu_virt_enabled (env)) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ());@@ -193,7 +187,6 @@ void helper_tlb_flush(CPURISCVState *env)CPUState *cs =env_cpu (env);if (!(env->priv >=PRV_S ) || (env->priv ==PRV_S && - env->priv_ver >=PRIV_VERSION_1_10_0 &&get_field (env->mstatus,MSTATUS_TVM ))) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); }else { --2.26.2
Re: [PATCH v3 3/3] target/riscv: Drop support for ISA spec version 1.09.1
In reply to Alistair FrancisQuoted 5 lines · Alistair Francis
The RISC-V ISA spec version 1.09.1 has been deprecated in QEMU since 4.1. It's not commonly used so let's remove support for it.
Signed-off-by Alistair Francis <[email protected]>
Quoted 10 lines
--- target/riscv/cpu.h | 1 - target/riscv/cpu.c | 2 - target/riscv/cpu_helper.c | 82 +++++------- target/riscv/csr.c | 118 +++--------------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +-- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +-- 7 files changed, 56 insertions(+), 187 deletions(-)
There are 3 more places in csr.c that need to be removed
./target/riscv/csr.c:651: if (env->priv_ver < PRIV_VERSION_1_10_0) {
./target/riscv/csr.c:660: if (env->priv_ver < PRIV_VERSION_1_10_0) {
./target/riscv/csr.c:741: } else if (env->priv_ver >= PRIV_VERSION_1_10_0) {Regards,
Bin
Re: [PATCH v3 3/3] target/riscv: Drop support for ISA spec version 1.09.1
Quoted 19 lines · Bin Meng
Quoted 5 lines · Alistair Francis
The RISC-V ISA spec version 1.09.1 has been deprecated in QEMU since 4.1. It's not commonly used so let's remove support for it.
Signed-off-by Alistair Francis <[email protected]>Quoted 10 lines
--- target/riscv/cpu.h | 1 - target/riscv/cpu.c | 2 - target/riscv/cpu_helper.c | 82 +++++------- target/riscv/csr.c | 118 +++--------------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +-- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +-- 7 files changed, 56 insertions(+), 187 deletions(-)
Quoted 5 lines
There are 3 more places in
csr.cthat need to be removed./target/riscv/csr.c:651: if (env->priv_ver < PRIV_VERSION_1_10_0) { ./target/riscv/csr.c:660: if (env->priv_ver < PRIV_VERSION_1_10_0) { ./target/riscv/csr.c:741: } else if (env->priv_ver >= PRIV_VERSION_1_10_0) {
Thanks, fixed.
Alistair
Quoted 3 lines
Regards,
Bin
Quoted 12 lines · Alistair Francis
include/hw/riscv/spike.h | 6 +- target/riscv/cpu.h | 8 - hw/riscv/spike.c | 217 ------------------ target/riscv/cpu.c | 30 --- target/riscv/cpu_helper.c | 82 +++---- target/riscv/csr.c | 118 ++-------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +- tests/qtest/machine-none-test.c | 4 +- 10 files changed, 60 insertions(+), 445 deletions(-)
Hi,
looking at the diffstat, I think you should also edit ./docs/system/deprecated.rst according to your changes?
Thomas
Quoted 15 lines · Thomas Huth
Quoted 12 lines · Alistair Francis
include/hw/riscv/spike.h | 6 +- target/riscv/cpu.h | 8 - hw/riscv/spike.c | 217 ------------------ target/riscv/cpu.c | 30 --- target/riscv/cpu_helper.c | 82 +++---- target/riscv/csr.c | 118 ++-------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +- tests/qtest/machine-none-test.c | 4 +- 10 files changed, 60 insertions(+), 445 deletions(-)
Quoted 4 lines
Hi,
looking at the diffstat, I think you should also edit
./docs/system/deprecated.rstaccording to your changes?
I'm not sure what I should edit there. These are already marked as deprecated, do I need to make a change when they are removed?
Alistair
Quoted 3 lines
Thomas
Quoted 16 lines · Alistair Francis
Quoted 15 lines · Thomas Huth
Quoted 12 lines · Alistair Francis
include/hw/riscv/spike.h | 6 +- target/riscv/cpu.h | 8 - hw/riscv/spike.c | 217 ------------------ target/riscv/cpu.c | 30 --- target/riscv/cpu_helper.c | 82 +++---- target/riscv/csr.c | 118 ++-------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +- tests/qtest/machine-none-test.c | 4 +- 10 files changed, 60 insertions(+), 445 deletions(-)
Quoted 7 lines
Quoted 4 lines
Hi,
looking at the diffstat, I think you should also edit
./docs/system/deprecated.rstaccording to your changes?I'm not sure what I should edit there. These are already marked as deprecated, do I need to make a change when they are removed?
Yes, you should move the features to the "Recently removed features" section at the end of the file. See e.g. commit b4983c570c7a5848c9df.
Thomas
Quoted 20 lines · Thomas Huth
Quoted 18 lines · Alistair Francis
Quoted 17 lines · Thomas Huth
Quoted 12 lines · Alistair Francis
include/hw/riscv/spike.h | 6 +- target/riscv/cpu.h | 8 - hw/riscv/spike.c | 217 ------------------ target/riscv/cpu.c | 30 --- target/riscv/cpu_helper.c | 82 +++---- target/riscv/csr.c | 118 ++-------- .../riscv/insn_trans/trans_privileged.inc.c | 18 +- target/riscv/monitor.c | 5 - target/riscv/op_helper.c | 17 +- tests/qtest/machine-none-test.c | 4 +- 10 files changed, 60 insertions(+), 445 deletions(-)Hi,
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
looking at the diffstat, I think you should also edit
./docs/system/deprecated.rstaccording to your changes?I'm not sure what I should edit there. These are already marked as deprecated, do I need to make a change when they are removed?
Yes, you should move the features to the "Recently removed features" section at the end of the file. See e.g. commit
b4983c570c7a5848c9df.
Ah, I didn't see that. Fixed in the next version.
Alistair
Quoted 3 lines
Thomas