Fix the Hypervisor access functions
v3 cover Fix the Hypervisor access functions
Richard pointed out that the Hypervisor access functions don't work correctly, see:
https://www.mail-archive.com/[email protected]/msg751540.html.
This seris fixes them up by adding a new MMU index for the virtualised state.
v3:
- Only set the virtualised MMU mode for HLX ops
v2:
- Use only 6 MMU modes instead of 8
Alistair Francis (6):
target/riscv: Add a virtualised MMU Mode
target/riscv: Set the virtualised MMU mode when doing hyp accesses target/riscv: Remove the HS_TWO_STAGE flag target/riscv: Remove the hyp load and store functions target/riscv: Remove the Hypervisor access check function target/riscv: Split the Hypervisor execute load helpers
Yifei Jiang (1):
target/riscv: Merge m/vsstatus and m/vsstatush into one uint64_t unit
target/riscv/cpu-param.h | 10 +- target/riscv/cpu.h | 43 ++-- target/riscv/cpu_bits.h | 20 +- target/riscv/helper.h | 5 +- target/riscv/cpu.c | 8 +- target/riscv/cpu_helper.c | 99 ++++------ target/riscv/csr.c | 18 +- target/riscv/op_helper.c | 135 +------------ target/riscv/translate.c | 2 + target/riscv/insn_trans/trans_rvh.c.inc | 248 +++++++++++++++--------- 10 files changed, 260 insertions(+), 328 deletions(-)
Signature · 1 line
2.28.0
PATCH v3 1/7 target/riscv: Merge m/vsstatus and m/vsstatush into one uint64_t unit
From: Yifei Jiang <[email protected]>
mstatus/mstatush and vsstatus/vsstatush are two halved for RISCV32. This patch expands mstatus and vsstatus to uint64_t instead of target_ulong so that it can be saved as one unit and reduce some ifdefs in the code.
Message-id: [email protected]
--- target/riscv/cpu.h | 24 +++++++++++------------- target/riscv/cpu_bits.h | 19 ++++--------------- target/riscv/cpu.c | 8 +++++--- target/riscv/cpu_helper.c | 35 +++++++---------------------------- target/riscv/csr.c | 18 ++++++++++-------- target/riscv/op_helper.c | 11 ++++------- 6 files changed, 41 insertions(+), 74 deletions(-)
target/riscv/cpu.h +11 -13
@@ -144,14 +144,14 @@ struct CPURISCVState {target_ulong resetvec;target_ulong mhartid; -target_ulong mstatus; +/* +* For RV32 this is 32-bit mstatus and 32-bit mstatush. +* For RV64 this is a 64-bit mstatus. +*/ +uint64_t mstatus;target_ulong mip; -#ifdef TARGET_RISCV32 -target_ulong mstatush; -#endif -uint32_t miclaim;target_ulong mie;
@@ -183,16 +183,17 @@ struct CPURISCVState {uint64_t htimedelta;/* Virtual CSRs */ -target_ulong vsstatus; +/* +* For RV32 this is 32-bit vsstatus and 32-bit vsstatush. +* For RV64 this is a 64-bit vsstatus. +*/ +uint64_t vsstatus;target_ulong vstvec;target_ulong vsscratch;target_ulong vsepc;target_ulong vscause;target_ulong vstval;target_ulong vsatp; -#ifdef TARGET_RISCV32 -target_ulong vsstatush; -#endif target_ulong mtval2;target_ulong mtinst;
@@ -204,10 +205,7 @@ struct CPURISCVState {target_ulong scause_hs;target_ulong stval_hs;target_ulong satp_hs; -target_ulong mstatus_hs; -#ifdef TARGET_RISCV32 -target_ulong mstatush_hs; -#endif +uint64_t mstatus_hs;target_ulong scounteren;target_ulong mcounteren;
target/riscv/cpu_bits.h +4 -15
@@ -4,10 +4,10 @@#define TARGET_RISCV_CPU_BITS_H #define get_field (reg, mask) (((reg) & \ - (target_ulong)(mask)) / ((mask) & ~((mask) << 1))) -#define set_field (reg, mask, val) (((reg) & ~(target_ulong)(mask)) | \ - (((target_ulong)(val) * ((mask) & ~((mask) << 1))) & \ - (target_ulong)(mask))) + (uint64_t)(mask)) / ((mask) & ~((mask) << 1))) +#define set_field (reg, mask, val) (((reg) & ~(uint64_t)(mask)) | \ + (((uint64_t)(val) * ((mask) & ~((mask) << 1))) & \ + (uint64_t)(mask)))/* Floating point round mode */ #define FSR_RD_SHIFT 5
@@ -381,19 +381,8 @@#define MSTATUS_TVM 0x00100000/* since: priv-1.10 */ #define MSTATUS_TW 0x20000000/* since: priv-1.10 */ #define MSTATUS_TSR 0x40000000/* since: priv-1.10 */ -#if defined(TARGET_RISCV64 )#define MSTATUS_GVA 0x4000000000ULL#define MSTATUS_MPV 0x8000000000ULL -#elif defined(TARGET_RISCV32 ) -#define MSTATUS_GVA 0x00000040 -#define MSTATUS_MPV 0x00000080 -#endif - -#ifdef TARGET_RISCV32 -# define MSTATUS_MPV_ISSET (env) get_field(env->mstatush, MSTATUS_MPV) -#else -# define MSTATUS_MPV_ISSET (env) get_field(env->mstatus, MSTATUS_MPV) -#endif #define MSTATUS64_UXL 0x0000000300000000ULL#define MSTATUS64_SXL 0x0000000C00000000ULL
target/riscv/cpu.c +5 -3
@@ -216,13 +216,15 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags)qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"pc " , env->pc);#ifndef CONFIG_USER_ONLY qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mhartid " , env->mhartid); -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatus " , env->mstatus); +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatus " , (target_ulong )env->mstatus);#ifdef TARGET_RISCV32 -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatush " , env->mstatush); +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatush " , + (target_ulong)(env->mstatus >>32 ));#endif if (riscv_has_ext (env,RVH )) {qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"hstatus " , env->hstatus); -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"vsstatus " , env->vsstatus); +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"vsstatus " , + (target_ulong )env->vsstatus); }qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mip " , env->mip);qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mie " , env->mie);
target/riscv/cpu_helper.c +7 -28
@@ -110,27 +110,19 @@ bool riscv_cpu_fp_enabled(CPURISCVState *env)void riscv_cpu_swap_hypervisor_regs (CPURISCVState *env) { -target_ulong mstatus_mask =MSTATUS_MXR |MSTATUS_SUM |MSTATUS_FS | -MSTATUS_SPP |MSTATUS_SPIE |MSTATUS_SIE ; +uint64_t mstatus_mask =MSTATUS_MXR |MSTATUS_SUM |MSTATUS_FS | +MSTATUS_SPP |MSTATUS_SPIE |MSTATUS_SIE | +MSTATUS64_UXL ;bool current_virt =riscv_cpu_virt_enabled (env);g_assert (riscv_has_ext (env,RVH )); -#if defined(TARGET_RISCV64 ) - mstatus_mask |=MSTATUS64_UXL ; -#endif -if (current_virt) {/* Current V=1 and we are about to change to V=0 */ env->vsstatus = env->mstatus & mstatus_mask; env->mstatus &= ~mstatus_mask; env->mstatus |= env->mstatus_hs; -#if defined(TARGET_RISCV32 ) - env->vsstatush = env->mstatush; - env->mstatush |= env->mstatush_hs; -#endif - env->vstvec = env->stvec; env->stvec = env->stvec_hs;
@@ -154,11 +146,6 @@ void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env) env->mstatus &= ~mstatus_mask; env->mstatus |= env->vsstatus; -#if defined(TARGET_RISCV32 ) - env->mstatush_hs = env->mstatush; - env->mstatush |= env->vsstatush; -#endif - env->stvec_hs = env->stvec; env->stvec = env->vstvec;
@@ -727,7 +714,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && access_type !=MMU_INST_FETCH &&get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env)) { +get_field (env->mstatus,MSTATUS_MPV )) {riscv_cpu_set_two_stage_lookup (env, true); }
@@ -799,7 +786,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && access_type !=MMU_INST_FETCH &&get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env)) { +get_field (env->mstatus,MSTATUS_MPV )) {riscv_cpu_set_two_stage_lookup (env, false); }
@@ -862,7 +849,7 @@ void riscv_cpu_do_interrupt(CPUState *cs)RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;bool force_hs_execp =riscv_cpu_force_hs_excep_enabled (env); -target_ulong s; +uint64_t s;/* cs->exception is 32-bits wide unlike mcause which is XLEN-bits wide * so we mask off the MSB and separate into trap type and cause.
@@ -995,19 +982,11 @@ void riscv_cpu_do_interrupt(CPUState *cs)if (riscv_cpu_virt_enabled (env)) {riscv_cpu_swap_hypervisor_regs (env); } -#ifdef TARGET_RISCV32 - env->mstatush =set_field (env->mstatush,MSTATUS_MPV , -riscv_cpu_virt_enabled (env)); -if (riscv_cpu_virt_enabled (env) && tval) { - env->mstatush =set_field (env->mstatush,MSTATUS_GVA ,1 ); - } -#else env->mstatus =set_field (env->mstatus,MSTATUS_MPV , -riscv_cpu_virt_enabled (env)); +riscv_cpu_virt_enabled (env));if (riscv_cpu_virt_enabled (env) && tval) { env->mstatus =set_field (env->mstatus,MSTATUS_GVA ,1 ); } -#endif mtval2 = env->guest_phys_fault_addr;
target/riscv/csr.c +10 -8
@@ -446,8 +446,8 @@ static int validate_vm(CPURISCVState *env, target_ulong vm)static int write_mstatus (CPURISCVState *env,int csrno,target_ulong val) { -target_ulong mstatus = env->mstatus; -target_ulong mask =0 ; +uint64_t mstatus = env->mstatus; +uint64_t mask =0 ;int dirty;/* flush tlb on mstatus fields that affect VM */
@@ -480,19 +480,20 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)#ifdef TARGET_RISCV32 static int read_mstatush (CPURISCVState *env,int csrno,target_ulong *val) { - *val = env->mstatush; + *val = env->mstatus >>32 ;return 0 ; }static int write_mstatush (CPURISCVState *env,int csrno,target_ulong val) { -if ((val ^ env->mstatush) & (MSTATUS_MPV )) { +uint64_t valh = (uint64_t )val <<32 ; +uint64_t mask =MSTATUS_MPV |MSTATUS_GVA ; + +if ((valh ^ env->mstatus) & (MSTATUS_MPV )) {tlb_flush (env_cpu (env)); } - val &=MSTATUS_MPV |MSTATUS_GVA ; - - env->mstatush = val; + env->mstatus = (env->mstatus & ~mask) | (valh & mask);return 0 ; }
@@ -1105,7 +1106,8 @@ static int read_vsstatus(CPURISCVState *env, int csrno, target_ulong *val)static int write_vsstatus (CPURISCVState *env,int csrno,target_ulong val) { - env->vsstatus = val; +uint64_t mask = (target_ulong)-1 ; + env->vsstatus = (env->vsstatus & ~mask) | (uint64_t )val;return 0 ; }
target/riscv/op_helper.c +4 -7
@@ -78,7 +78,8 @@ target_ulong helper_csrrc(CPURISCVState *env, target_ulong src,target_ulong helper_sret (CPURISCVState *env,target_ulong cpu_pc_deb) { -target_ulong prev_priv, prev_virt, mstatus; +uint64_t mstatus; +target_ulong prev_priv, prev_virt;if (!(env->priv >=PRV_S )) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ());
@@ -147,18 +148,14 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb)riscv_raise_exception (env,RISCV_EXCP_INST_ADDR_MIS ,GETPC ()); } -target_ulong mstatus = env->mstatus; +uint64_t mstatus = env->mstatus;target_ulong prev_priv =get_field (mstatus,MSTATUS_MPP ); -target_ulong prev_virt =MSTATUS_MPV_ISSET (env); +target_ulong prev_virt =get_field (env->mstatus,MSTATUS_MPV ); 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 - env->mstatush =set_field (env->mstatush,MSTATUS_MPV ,0 ); -#else mstatus =set_field (mstatus,MSTATUS_MPV ,0 ); -#endif env->mstatus = mstatus;riscv_cpu_set_mode (env, prev_priv);
Signature · 1 line
2.28.0
Re: [PATCH v3 1/7] target/riscv: Merge m/vsstatus and m/vsstatush into one uint64_t unit
Quoted 8 lines · Alistair Francis
From: Yifei Jiang <[email protected]>
mstatus/mstatush and vsstatus/vsstatush are two halved for RISCV32. This patch expands mstatus and vsstatus to
uint64_tinstead oftarget_ulongso that it can be saved as one unit and reduce some ifdefs in the code.
Quoted 5 lines
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>Signed-off-by Alistair Francis <[email protected]>Reviewed-by Alistair Francis <[email protected]>Message-id: [email protected]
Argh, sorry I messed up my base branch in my script. Ignore this patch
Alistair
Quoted 313 lines
--- target/riscv/cpu.h | 24 +++++++++++------------- target/riscv/cpu_bits.h | 19 ++++--------------- target/riscv/cpu.c | 8 +++++--- target/riscv/cpu_helper.c | 35 +++++++---------------------------- target/riscv/csr.c | 18 ++++++++++-------- target/riscv/op_helper.c | 11 ++++------- 6 files changed, 41 insertions(+), 74 deletions(-)target/riscv/cpu.h +11
-13@@ -144,14 +144,14 @@ struct CPURISCVState {target_ulong resetvec;target_ulong mhartid; -target_ulong mstatus; +/* +* For RV32 this is 32-bit mstatus and 32-bit mstatush. +* For RV64 this is a 64-bit mstatus. +*/ +uint64_t mstatus;target_ulong mip; -#ifdef TARGET_RISCV32 -target_ulong mstatush; -#endif -uint32_t miclaim;target_ulong mie;@@ -183,16 +183,17 @@ struct CPURISCVState {uint64_t htimedelta;/* Virtual CSRs */ -target_ulong vsstatus; +/* +* For RV32 this is 32-bit vsstatus and 32-bit vsstatush. +* For RV64 this is a 64-bit vsstatus. +*/ +uint64_t vsstatus;target_ulong vstvec;target_ulong vsscratch;target_ulong vsepc;target_ulong vscause;target_ulong vstval;target_ulong vsatp; -#ifdef TARGET_RISCV32 -target_ulong vsstatush; -#endif target_ulong mtval2;target_ulong mtinst;@@ -204,10 +205,7 @@ struct CPURISCVState {target_ulong scause_hs;target_ulong stval_hs;target_ulong satp_hs; -target_ulong mstatus_hs; -#ifdef TARGET_RISCV32 -target_ulong mstatush_hs; -#endif +uint64_t mstatus_hs;target_ulong scounteren;target_ulong mcounteren;target/riscv/cpu_bits.h +4
-15@@ -4,10 +4,10 @@#define TARGET_RISCV_CPU_BITS_H #define get_field (reg, mask) (((reg) & \ - (target_ulong)(mask)) / ((mask) & ~((mask) << 1))) -#define set_field (reg, mask, val) (((reg) & ~(target_ulong)(mask)) | \ - (((target_ulong)(val) * ((mask) & ~((mask) << 1))) & \ - (target_ulong)(mask))) + (uint64_t)(mask)) / ((mask) & ~((mask) << 1))) +#define set_field (reg, mask, val) (((reg) & ~(uint64_t)(mask)) | \ + (((uint64_t)(val) * ((mask) & ~((mask) << 1))) & \ + (uint64_t)(mask)))/* Floating point round mode */ #define FSR_RD_SHIFT 5@@ -381,19 +381,8 @@#define MSTATUS_TVM 0x00100000/* since: priv-1.10 */ #define MSTATUS_TW 0x20000000/* since: priv-1.10 */ #define MSTATUS_TSR 0x40000000/* since: priv-1.10 */ -#if defined(TARGET_RISCV64 )#define MSTATUS_GVA 0x4000000000ULL#define MSTATUS_MPV 0x8000000000ULL -#elif defined(TARGET_RISCV32 ) -#define MSTATUS_GVA 0x00000040 -#define MSTATUS_MPV 0x00000080 -#endif - -#ifdef TARGET_RISCV32 -# define MSTATUS_MPV_ISSET (env) get_field(env->mstatush, MSTATUS_MPV) -#else -# define MSTATUS_MPV_ISSET (env) get_field(env->mstatus, MSTATUS_MPV) -#endif #define MSTATUS64_UXL 0x0000000300000000ULL#define MSTATUS64_SXL 0x0000000C00000000ULLtarget/riscv/cpu.c +5
-3@@ -216,13 +216,15 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags)qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"pc " , env->pc);#ifndef CONFIG_USER_ONLY qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mhartid " , env->mhartid); -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatus " , env->mstatus); +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatus " , (target_ulong )env->mstatus);#ifdef TARGET_RISCV32 -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatush " , env->mstatush); +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatush " , + (target_ulong)(env->mstatus >>32 ));#endif if (riscv_has_ext (env,RVH )) {qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"hstatus " , env->hstatus); -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"vsstatus " , env->vsstatus); +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"vsstatus " , + (target_ulong )env->vsstatus); }qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mip " , env->mip);qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mie " , env->mie);target/riscv/cpu_helper.c +7
-28@@ -110,27 +110,19 @@ bool riscv_cpu_fp_enabled(CPURISCVState *env)void riscv_cpu_swap_hypervisor_regs (CPURISCVState *env) { -target_ulong mstatus_mask =MSTATUS_MXR |MSTATUS_SUM |MSTATUS_FS | -MSTATUS_SPP |MSTATUS_SPIE |MSTATUS_SIE ; +uint64_t mstatus_mask =MSTATUS_MXR |MSTATUS_SUM |MSTATUS_FS | +MSTATUS_SPP |MSTATUS_SPIE |MSTATUS_SIE | +MSTATUS64_UXL ;bool current_virt =riscv_cpu_virt_enabled (env);g_assert (riscv_has_ext (env,RVH )); -#if defined(TARGET_RISCV64 ) - mstatus_mask |=MSTATUS64_UXL ; -#endif -if (current_virt) {/* Current V=1 and we are about to change to V=0 */ env->vsstatus = env->mstatus & mstatus_mask; env->mstatus &= ~mstatus_mask; env->mstatus |= env->mstatus_hs; -#if defined(TARGET_RISCV32 ) - env->vsstatush = env->mstatush; - env->mstatush |= env->mstatush_hs; -#endif - env->vstvec = env->stvec; env->stvec = env->stvec_hs;@@ -154,11 +146,6 @@ void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env) env->mstatus &= ~mstatus_mask; env->mstatus |= env->vsstatus; -#if defined(TARGET_RISCV32 ) - env->mstatush_hs = env->mstatush; - env->mstatush |= env->vsstatush; -#endif - env->stvec_hs = env->stvec; env->stvec = env->vstvec;@@ -727,7 +714,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && access_type !=MMU_INST_FETCH &&get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env)) { +get_field (env->mstatus,MSTATUS_MPV )) {riscv_cpu_set_two_stage_lookup (env, true); }@@ -799,7 +786,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && access_type !=MMU_INST_FETCH &&get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env)) { +get_field (env->mstatus,MSTATUS_MPV )) {riscv_cpu_set_two_stage_lookup (env, false); }@@ -862,7 +849,7 @@ void riscv_cpu_do_interrupt(CPUState *cs)RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;bool force_hs_execp =riscv_cpu_force_hs_excep_enabled (env); -target_ulong s; +uint64_t s;/* cs->exception is 32-bits wide unlike mcause which is XLEN-bits wide * so we mask off the MSB and separate into trap type and cause. @@ -995,19 +982,11 @@ void riscv_cpu_do_interrupt(CPUState *cs)if (riscv_cpu_virt_enabled (env)) {riscv_cpu_swap_hypervisor_regs (env); } -#ifdef TARGET_RISCV32 - env->mstatush =set_field (env->mstatush,MSTATUS_MPV , -riscv_cpu_virt_enabled (env)); -if (riscv_cpu_virt_enabled (env) && tval) { - env->mstatush =set_field (env->mstatush,MSTATUS_GVA ,1 ); - } -#else env->mstatus =set_field (env->mstatus,MSTATUS_MPV , -riscv_cpu_virt_enabled (env)); +riscv_cpu_virt_enabled (env));if (riscv_cpu_virt_enabled (env) && tval) { env->mstatus =set_field (env->mstatus,MSTATUS_GVA ,1 ); } -#endif mtval2 = env->guest_phys_fault_addr;target/riscv/csr.c +10
-8@@ -446,8 +446,8 @@ static int validate_vm(CPURISCVState *env, target_ulong vm)static int write_mstatus (CPURISCVState *env,int csrno,target_ulong val) { -target_ulong mstatus = env->mstatus; -target_ulong mask =0 ; +uint64_t mstatus = env->mstatus; +uint64_t mask =0 ;int dirty;/* flush tlb on mstatus fields that affect VM */ @@ -480,19 +480,20 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)#ifdef TARGET_RISCV32 static int read_mstatush (CPURISCVState *env,int csrno,target_ulong *val) { - *val = env->mstatush; + *val = env->mstatus >>32 ;return 0 ; }static int write_mstatush (CPURISCVState *env,int csrno,target_ulong val) { -if ((val ^ env->mstatush) & (MSTATUS_MPV )) { +uint64_t valh = (uint64_t )val <<32 ; +uint64_t mask =MSTATUS_MPV |MSTATUS_GVA ; + +if ((valh ^ env->mstatus) & (MSTATUS_MPV )) {tlb_flush (env_cpu (env)); } - val &=MSTATUS_MPV |MSTATUS_GVA ; - - env->mstatush = val; + env->mstatus = (env->mstatus & ~mask) | (valh & mask);return 0 ; }@@ -1105,7 +1106,8 @@ static int read_vsstatus(CPURISCVState *env, int csrno, target_ulong *val)static int write_vsstatus (CPURISCVState *env,int csrno,target_ulong val) { - env->vsstatus = val; +uint64_t mask = (target_ulong)-1 ; + env->vsstatus = (env->vsstatus & ~mask) | (uint64_t )val;return 0 ; }target/riscv/op_helper.c +4
-8@@ -78,7 +78,8 @@ target_ulong helper_csrrc(CPURISCVState *env, target_ulong src,target_ulong helper_sret (CPURISCVState *env,target_ulong cpu_pc_deb) { -target_ulong prev_priv, prev_virt, mstatus; +uint64_t mstatus; +target_ulong prev_priv, prev_virt;if (!(env->priv >=PRV_S )) {riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ());@@ -147,18 +148,14 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb)riscv_raise_exception (env,RISCV_EXCP_INST_ADDR_MIS ,GETPC ()); } -target_ulong mstatus = env->mstatus; +uint64_t mstatus = env->mstatus;target_ulong prev_priv =get_field (mstatus,MSTATUS_MPP ); -target_ulong prev_virt =MSTATUS_MPV_ISSET (env); +target_ulong prev_virt =get_field (env->mstatus,MSTATUS_MPV ); 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 - env->mstatush =set_field (env->mstatush,MSTATUS_MPV ,0 ); -#else mstatus =set_field (mstatus,MSTATUS_MPV ,0 ); -#endif env->mstatus = mstatus;riscv_cpu_set_mode (env, prev_priv); --2.28.0
Re: [PATCH v3 1/7] target/riscv: Merge m/vsstatus and m/vsstatush into one uint64_t unit
In reply to Alistair FrancisQuoted 12 lines · Alistair Francis
From: Yifei Jiang <[email protected]>
mstatus/mstatush and vsstatus/vsstatush are two halved for RISCV32. This patch expands mstatus and vsstatus to
uint64_tinstead oftarget_ulongso that it can be saved as one unit and reduce some ifdefs in the code.Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>Signed-off-by Alistair Francis <[email protected]>Reviewed-by Alistair Francis <[email protected]>Message-id: [email protected]
Quoted 8 lines
--- target/riscv/cpu.h | 24 +++++++++++------------- target/riscv/cpu_bits.h | 19 ++++--------------- target/riscv/cpu.c | 8 +++++--- target/riscv/cpu_helper.c | 35 +++++++---------------------------- target/riscv/csr.c | 18 ++++++++++-------- target/riscv/op_helper.c | 11 ++++------- 6 files changed, 41 insertions(+), 74 deletions(-)
r~
PATCH v3 2/7 target/riscv: Add a virtualised MMU Mode
In reply to Alistair FrancisAdd a new MMU mode that includes the current virt mode.
--- target/riscv/cpu-param.h | 10 +++++++++- target/riscv/cpu.h | 4 +++- target/riscv/cpu_helper.c | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-)
target/riscv/cpu-param.h +9 -1
@@ -18,6 +18,14 @@# define TARGET_VIRT_ADDR_SPACE_BITS 32/* sv32 */ #endif #define TARGET_PAGE_BITS 12/* 4 KiB Pages */ -#define NB_MMU_MODES 4 +/* +* The current MMU Modes are: +* - U mode 0b000 +* - S mode 0b001 +* - M mode 0b011 +* - HU mode 0b100 +* - HS mode 0b101 +*/ +#define NB_MMU_MODES 6#endif
target/riscv/cpu.h +3 -1
@@ -363,7 +363,9 @@ void QEMU_NORETURN riscv_raise_exception(CPURISCVState *env,target_ulong riscv_cpu_get_fflags (CPURISCVState *env);void riscv_cpu_set_fflags (CPURISCVState *env,target_ulong ); -#define TB_FLAGS_MMU_MASK 3 +#define TB_FLAGS_MMU_MASK 7 +#define TB_FLAGS_PRIV_MMU_MASK 3 +#define TB_FLAGS_PRIV_HYP_ACCESS_MASK (1 << 2)#define TB_FLAGS_MSTATUS_FS MSTATUS_FStypedef CPURISCVState CPUArchState ;
target/riscv/cpu_helper.c +5 -1
@@ -30,6 +30,10 @@ int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)#ifdef CONFIG_USER_ONLY return 0 ;#else +if (riscv_cpu_virt_enabled (env)) { +return env->priv |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; + } +return env->priv;#endif }
@@ -323,7 +327,7 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,* (riscv_cpu_do_interrupt) is correct */ MemTxResult res;MemTxAttrs attrs =MEMTXATTRS_UNSPECIFIED ; -int mode = mmu_idx; +int mode = mmu_idx &TB_FLAGS_PRIV_MMU_MASK ;bool use_background = false;/*
Signature · 1 line
2.28.0
Re: [PATCH v3 2/7] target/riscv: Add a virtualised MMU Mode
target/riscv/cpu_helper.c int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch) · line 35
Quoted 7 lines · Alistair Francis
target/riscv/cpu_helper.c +3
-0@@ -30,6 +30,10 @@ int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)#ifdef CONFIG_USER_ONLY return 0 ;#else +if (riscv_cpu_virt_enabled (env)) { +return env->priv |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; + }
Still setting this bit here, incorrectly.
r~
Re: [PATCH v3 2/7] target/riscv: Add a virtualised MMU Mode
Quoted 11 lines · Richard Henderson
target/riscv/cpu_helper.c int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch) · line 35
Quoted 7 lines · Alistair Francis
target/riscv/cpu_helper.c +3
-0@@ -30,6 +30,10 @@ int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)#ifdef CONFIG_USER_ONLY return 0 ;#else +if (riscv_cpu_virt_enabled (env)) { +return env->priv |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; + }Still setting this bit here, incorrectly.
Argh! I must have dreamed fixing it. Sending a new version now.
Alistair
Quoted 3 lines
r~
PATCH v3 3/7 target/riscv: Set the virtualised MMU mode when doing hyp accesses
In reply to Alistair FrancisWhen performing the hypervisor load/store operations set the MMU mode to indicate that we are virtualised.
--- target/riscv/op_helper.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
target/riscv/op_helper.c +17 -13
@@ -235,30 +235,31 @@ target_ulong helper_hyp_load(CPURISCVState *env, target_ulong address, (env->priv == PRV_U && !riscv_cpu_virt_enabled(env) && get_field(env->hstatus, HSTATUS_HU))) {target_ulong pte; +int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ;riscv_cpu_set_two_stage_lookup (env, true);switch (memop) {case MO_SB : - pte =cpu_ldsb_data_ra (env, address,GETPC ()); + pte =cpu_ldsb_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_UB : - pte =cpu_ldub_data_ra (env, address,GETPC ()); + pte =cpu_ldub_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_TESW : - pte =cpu_ldsw_data_ra (env, address,GETPC ()); + pte =cpu_ldsw_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_TEUW : - pte =cpu_lduw_data_ra (env, address,GETPC ()); + pte =cpu_lduw_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_TESL : - pte =cpu_ldl_data_ra (env, address,GETPC ()); + pte =cpu_ldl_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_TEUL : - pte =cpu_ldl_data_ra (env, address,GETPC ()); + pte =cpu_ldl_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_TEQ : - pte =cpu_ldq_data_ra (env, address,GETPC ()); + pte =cpu_ldq_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;default :g_assert_not_reached ();
@@ -284,23 +285,25 @@ void helper_hyp_store(CPURISCVState *env, target_ulong address, (env->priv == PRV_S && !riscv_cpu_virt_enabled(env)) || (env->priv == PRV_U && !riscv_cpu_virt_enabled(env) && get_field(env->hstatus, HSTATUS_HU))) { +int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; +riscv_cpu_set_two_stage_lookup (env, true);switch (memop) {case MO_SB :case MO_UB : -cpu_stb_data_ra (env, address, val,GETPC ()); +cpu_stb_mmuidx_ra (env, address, val, mmu_idx,GETPC ());break ;case MO_TESW :case MO_TEUW : -cpu_stw_data_ra (env, address, val,GETPC ()); +cpu_stw_mmuidx_ra (env, address, val, mmu_idx,GETPC ());break ;case MO_TESL :case MO_TEUL : -cpu_stl_data_ra (env, address, val,GETPC ()); +cpu_stl_mmuidx_ra (env, address, val, mmu_idx,GETPC ());break ;case MO_TEQ : -cpu_stq_data_ra (env, address, val,GETPC ()); +cpu_stq_mmuidx_ra (env, address, val, mmu_idx,GETPC ());break ;default :g_assert_not_reached ();
@@ -326,15 +329,16 @@ target_ulong helper_hyp_x_load(CPURISCVState *env, target_ulong address, (env->priv == PRV_U && !riscv_cpu_virt_enabled(env) && get_field(env->hstatus, HSTATUS_HU))) {target_ulong pte; +int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ;riscv_cpu_set_two_stage_lookup (env, true);switch (memop) {case MO_TEUW : - pte =cpu_lduw_data_ra (env, address,GETPC ()); + pte =cpu_lduw_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;case MO_TEUL : - pte =cpu_ldl_data_ra (env, address,GETPC ()); + pte =cpu_ldl_mmuidx_ra (env, address, mmu_idx,GETPC ());break ;default :g_assert_not_reached ();
Signature · 1 line
2.28.0
PATCH v3 4/7 target/riscv: Remove the HS_TWO_STAGE flag
In reply to Alistair FrancisThe HS_TWO_STAGE flag is no longer required as the MMU index contains the information if we are performing a two stage access.
--- target/riscv/cpu.h | 3 +- target/riscv/cpu_bits.h | 1 - target/riscv/cpu_helper.c | 60 ++++++++++++++++----------------------- target/riscv/op_helper.c | 12 -------- 4 files changed, 25 insertions(+), 51 deletions(-)
target/riscv/cpu.h +1 -2
@@ -323,8 +323,7 @@ bool riscv_cpu_virt_enabled(CPURISCVState *env);void riscv_cpu_set_virt_enabled (CPURISCVState *env,bool enable);bool riscv_cpu_force_hs_excep_enabled (CPURISCVState *env);void riscv_cpu_set_force_hs_excep (CPURISCVState *env,bool enable); -bool riscv_cpu_two_stage_lookup (CPURISCVState *env); -void riscv_cpu_set_two_stage_lookup (CPURISCVState *env,bool enable); +bool riscv_cpu_two_stage_lookup (int mmu_idx);int riscv_cpu_mmu_index (CPURISCVState *env,bool ifetch);hwaddr riscv_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
target/riscv/cpu_bits.h +0 -1
@@ -469,7 +469,6 @@* page table fault. */ #define FORCE_HS_EXCEP 2 -#define HS_TWO_STAGE 4/* RV32 satp CSR field masks */ #define SATP32_MODE 0x80000000
target/riscv/cpu_helper.c +24 -36
134 lines not on this page · raw message
target/riscv/op_helper.c +0 -12
@@ -237,8 +237,6 @@ target_ulong helper_hyp_load(CPURISCVState *env, target_ulong address,target_ulong pte;int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; -riscv_cpu_set_two_stage_lookup (env, true); -switch (memop) {case MO_SB : pte =cpu_ldsb_mmuidx_ra (env, address, mmu_idx,GETPC ());
@@ -265,8 +263,6 @@ target_ulong helper_hyp_load(CPURISCVState *env, target_ulong address,g_assert_not_reached (); } -riscv_cpu_set_two_stage_lookup (env, false); -return pte; }
@@ -287,8 +283,6 @@ void helper_hyp_store(CPURISCVState *env, target_ulong address, get_field(env->hstatus, HSTATUS_HU))) {int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; -riscv_cpu_set_two_stage_lookup (env, true); -switch (memop) {case MO_SB :case MO_UB :
@@ -309,8 +303,6 @@ void helper_hyp_store(CPURISCVState *env, target_ulong address,g_assert_not_reached (); } -riscv_cpu_set_two_stage_lookup (env, false); -return ; }
@@ -331,8 +323,6 @@ target_ulong helper_hyp_x_load(CPURISCVState *env, target_ulong address,target_ulong pte;int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; -riscv_cpu_set_two_stage_lookup (env, true); -switch (memop) {case MO_TEUW : pte =cpu_lduw_mmuidx_ra (env, address, mmu_idx,GETPC ());
@@ -344,8 +334,6 @@ target_ulong helper_hyp_x_load(CPURISCVState *env, target_ulong address,g_assert_not_reached (); } -riscv_cpu_set_two_stage_lookup (env, false); -return pte; }
Signature · 1 line
2.28.0
PATCH v3 5/7 target/riscv: Remove the hyp load and store functions
In reply to Alistair FrancisRemove the special Virtulisation load and store functions and just use the standard tcg tcg_gen_qemu_ld_tl() and tcg_gen_qemu_st_tl() functions instead.
As part of this change we ensure we still run an access check to make sure we can perform the operations.
--- target/riscv/helper.h | 3 +- target/riscv/op_helper.c | 72 +-------------- target/riscv/insn_trans/trans_rvh.c.inc | 111 +++++++----------------- 3 files changed, 35 insertions(+), 151 deletions(-)
target/riscv/helper.h +1 -2
@@ -81,8 +81,7 @@ DEF_HELPER_1(tlb_flush, void, env)#ifndef CONFIG_USER_ONLY DEF_HELPER_1(hyp_tlb_flush, void, env) DEF_HELPER_1(hyp_gvma_tlb_flush, void, env) -DEF_HELPER_4(hyp_load, tl, env, tl, tl, tl) -DEF_HELPER_5(hyp_store, void, env, tl, tl, tl, tl) +DEF_HELPER_1(hyp_access_check, void, env) DEF_HELPER_4(hyp_x_load, tl, env, tl, tl, tl)#endif
target/riscv/op_helper.c +1 -71
83 lines not on this page · raw message
target/riscv/insn_trans/trans_rvh.c.inc +33 -78
253 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v3 6/7 target/riscv: Remove the Hypervisor access check function
In reply to Alistair FrancisInstead of using an external helper to ensure we can perform the Hypervisor load/store instructions let's do it inline using TB_FLAGS.
--- target/riscv/cpu.h | 12 +++ target/riscv/helper.h | 1 - target/riscv/op_helper.c | 16 ---- target/riscv/translate.c | 2 + target/riscv/insn_trans/trans_rvh.c.inc | 121 +++++++++++++++++++++--- 5 files changed, 124 insertions(+), 28 deletions(-)
target/riscv/cpu.h +12 -0
@@ -375,6 +375,8 @@ FIELD(TB_FLAGS, VL_EQ_VLMAX, 2, 1) FIELD(TB_FLAGS, LMUL, 3, 2) FIELD(TB_FLAGS, SEW, 5, 3)FIELD (TB_FLAGS ,VILL ,8 ,1 ) +/* Is a Hypervisor instruction load/store allowed? */ +FIELD (TB_FLAGS ,HLSX ,9 ,1 )/* * A simplification for VLMAX
@@ -421,7 +423,17 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc,if (riscv_cpu_fp_enabled (env)) { flags |= env->mstatus &MSTATUS_FS ; } + +if (riscv_has_ext (env,RVH )) { +if (env->priv ==PRV_M || + (env->priv ==PRV_S && !riscv_cpu_virt_enabled (env)) || + (env->priv ==PRV_U && !riscv_cpu_virt_enabled (env) && +get_field (env->hstatus,HSTATUS_HU ))) { + flags =FIELD_DP32 (flags,TB_FLAGS ,HLSX ,1 ); + } + }#endif + *pflags = flags; }
target/riscv/helper.h +0 -1
@@ -81,7 +81,6 @@ DEF_HELPER_1(tlb_flush, void, env)#ifndef CONFIG_USER_ONLY DEF_HELPER_1(hyp_tlb_flush, void, env) DEF_HELPER_1(hyp_gvma_tlb_flush, void, env) -DEF_HELPER_1(hyp_access_check, void, env) DEF_HELPER_4(hyp_x_load, tl, env, tl, tl, tl)#endif
target/riscv/op_helper.c +0 -16
@@ -227,22 +227,6 @@ void helper_hyp_gvma_tlb_flush(CPURISCVState *env)helper_hyp_tlb_flush (env); } -void helper_hyp_access_check (CPURISCVState *env) -{ -if (env->priv ==PRV_M || - (env->priv ==PRV_S && !riscv_cpu_virt_enabled (env)) || - (env->priv ==PRV_U && !riscv_cpu_virt_enabled (env) && -get_field (env->hstatus,HSTATUS_HU ))) { -return ; - } - -if (riscv_cpu_virt_enabled (env)) { -riscv_raise_exception (env,RISCV_EXCP_VIRT_INSTRUCTION_FAULT ,GETPC ()); - }else { -riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); - } -} -target_ulong helper_hyp_x_load (CPURISCVState *env,target_ulong address,target_ulong attrs,target_ulong memop) {
target/riscv/translate.c +2 -0
@@ -56,6 +56,7 @@ typedef struct DisasContext {to reset this known value. */ int frm;bool ext_ifencei; +bool hlsx;/* vector extension */ bool vill;uint8_t lmul;
@@ -807,6 +808,7 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->frm =-1 ;/* unknown rounding mode */ ctx->ext_ifencei = cpu->cfg.ext_ifencei; ctx->vlen = cpu->cfg.vlen; + ctx->hlsx =FIELD_EX32 (tb_flags,TB_FLAGS ,HLSX ); ctx->vill =FIELD_EX32 (tb_flags,TB_FLAGS ,VILL ); ctx->sew =FIELD_EX32 (tb_flags,TB_FLAGS ,SEW ); ctx->lmul =FIELD_EX32 (tb_flags,TB_FLAGS ,LMUL );
target/riscv/insn_trans/trans_rvh.c.inc +110 -11
187 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH v3 6/7] target/riscv: Remove the Hypervisor access check function
Quoted 21 lines · Alistair Francis
target/riscv/insn_trans/trans_rvh.c.inc +10
-1@@ -199,7 +271,16 @@ static bool trans_hlv_wu(DisasContext *ctx, arg_hlv_wu *a) TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); - gen_helper_hyp_access_check(cpu_env); + if (!ctx->hlsx) { + if (ctx->virt_enabled) { + generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); + } else { + generate_exception(ctx, RISCV_EXCP_ILLEGAL_INST); + } + exit_tb(ctx); /* no chaining */ + ctx->base.is_jmp = DISAS_NORETURN; + return false; + } gen_get_gpr(t0, a->rs1);@@ -221,7 +302,16 @@ static bool trans_hlv_d(DisasContext *ctx, arg_hlv_d *a) TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new();
target/riscv/insn_trans/trans_rvh.c.inc static bool trans_hlv_d(DisasContext *ctx, arg_hlv_d *a) · line 312
Quoted 10 lines
target/riscv/insn_trans/trans_rvh.c.inc +8
-1- gen_helper_hyp_access_check(cpu_env); + if (!ctx->hlsx) { + if (ctx->virt_enabled) { + generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); + } else { + generate_exception(ctx, RISCV_EXCP_ILLEGAL_INST); + } + exit_tb(ctx); /* no chaining */ + ctx->base.is_jmp = DISAS_NORETURN;
generate_exception already is noreturn. The exit_tb is unreachable. You should extract this to a helper function anyway, instead of 6 copies.
I would squash this with the previous, so that you don't add helper_hyp_access_check and then remove it in the next patch.
r~
PATCH v3 7/7 target/riscv: Split the Hypervisor execute load helpers
In reply to Alistair FrancisSplit the hypervisor execute load functions into two seperate functions. This avoids us having to pass the memop to the C helper functions.
--- target/riscv/helper.h | 3 +- target/riscv/op_helper.c | 36 ++++++----------------- target/riscv/insn_trans/trans_rvh.c.inc | 38 ++++++++++++++++--------- 3 files changed, 35 insertions(+), 42 deletions(-)
target/riscv/helper.h +2 -1
@@ -81,7 +81,8 @@ DEF_HELPER_1(tlb_flush, void, env)#ifndef CONFIG_USER_ONLY DEF_HELPER_1(hyp_tlb_flush, void, env) DEF_HELPER_1(hyp_gvma_tlb_flush, void, env) -DEF_HELPER_4(hyp_x_load, tl, env, tl, tl, tl) +DEF_HELPER_2(hyp_hlvx_hu, tl, env, tl) +DEF_HELPER_2(hyp_hlvx_wu, tl, env, tl)#endif /* Vector functions */
target/riscv/op_helper.c +9 -27
@@ -227,36 +227,18 @@ void helper_hyp_gvma_tlb_flush(CPURISCVState *env) helper_hyp_tlb_flush(env); } -target_ulong helper_hyp_x_load (CPURISCVState *env,target_ulong address, -target_ulong attrs,target_ulong memop) +target_ulong helper_hyp_hlvx_hu (CPURISCVState *env,target_ulong address) { -if (env->priv ==PRV_M || - (env->priv ==PRV_S && !riscv_cpu_virt_enabled (env)) || - (env->priv ==PRV_U && !riscv_cpu_virt_enabled (env) && -get_field (env->hstatus,HSTATUS_HU ))) { -target_ulong pte; -int mmu_idx =cpu_mmu_index (env, false) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; - -switch (memop) { -case MO_TEUW : - pte =cpu_lduw_mmuidx_ra (env, address, mmu_idx,GETPC ()); -break ; -case MO_TEUL : - pte =cpu_ldl_mmuidx_ra (env, address, mmu_idx,GETPC ()); -break ; -default : -g_assert_not_reached (); - } +int mmu_idx =cpu_mmu_index (env, true) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; -return pte; - } +return cpu_lduw_mmuidx_ra (env, address, mmu_idx,GETPC ()); +} -if (riscv_cpu_virt_enabled (env)) { -riscv_raise_exception (env,RISCV_EXCP_VIRT_INSTRUCTION_FAULT ,GETPC ()); - }else { -riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); - } -return 0 ; +target_ulong helper_hyp_hlvx_wu (CPURISCVState *env,target_ulong address) +{ +int mmu_idx =cpu_mmu_index (env, true) |TB_FLAGS_PRIV_HYP_ACCESS_MASK ; + +return cpu_ldl_mmuidx_ra (env, address, mmu_idx,GETPC ()); }#endif /* !CONFIG_USER_ONLY */
target/riscv/insn_trans/trans_rvh.c.inc +24 -14
@@ -364,20 +364,25 @@ static bool trans_hlvx_hu(DisasContext *ctx, arg_hlvx_hu *a) #ifndef CONFIG_USER_ONLY TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); - TCGv mem_idx = tcg_temp_new(); - TCGv memop = tcg_temp_new(); + + if (!ctx->hlsx) { + if (ctx->virt_enabled) { + generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); + } else { + generate_exception(ctx, RISCV_EXCP_ILLEGAL_INST); + } + exit_tb(ctx); /* no chaining */ + ctx->base.is_jmp = DISAS_NORETURN; + return false; + } gen_get_gpr(t0, a->rs1); - tcg_gen_movi_tl(mem_idx, ctx->mem_idx); - tcg_gen_movi_tl(memop, MO_TEUW); - gen_helper_hyp_x_load(t1, cpu_env, t0, mem_idx, memop); + gen_helper_hyp_hlvx_hu(t1, cpu_env, t0); gen_set_gpr(a->rd, t1); tcg_temp_free(t0); tcg_temp_free(t1); - tcg_temp_free(mem_idx); - tcg_temp_free(memop); return true; #else return false;
@@ -390,20 +395,25 @@ static bool trans_hlvx_wu(DisasContext *ctx, arg_hlvx_wu *a) #ifndef CONFIG_USER_ONLY TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); - TCGv mem_idx = tcg_temp_new(); - TCGv memop = tcg_temp_new(); + + if (!ctx->hlsx) { + if (ctx->virt_enabled) { + generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); + } else { + generate_exception(ctx, RISCV_EXCP_ILLEGAL_INST); + } + exit_tb(ctx); /* no chaining */ + ctx->base.is_jmp = DISAS_NORETURN; + return false; + } gen_get_gpr(t0, a->rs1); - tcg_gen_movi_tl(mem_idx, ctx->mem_idx); - tcg_gen_movi_tl(memop, MO_TEUL); - gen_helper_hyp_x_load(t1, cpu_env, t0, mem_idx, memop); + gen_helper_hyp_hlvx_wu(t1, cpu_env, t0); gen_set_gpr(a->rd, t1); tcg_temp_free(t0); tcg_temp_free(t1); - tcg_temp_free(mem_idx); - tcg_temp_free(memop); return true; #else return false;
Signature · 1 line
2.28.0
Re: [PATCH v3 7/7] target/riscv: Split the Hypervisor execute load helpers
Quoted 9 lines · Alistair Francis
Split the hypervisor execute load functions into two seperate functions. This avoids us having to pass the memop to the C helper functions.
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/helper.h | 3 +- target/riscv/op_helper.c | 36 ++++++----------------- target/riscv/insn_trans/trans_rvh.c.inc | 38 ++++++++++++++++--------- 3 files changed, 35 insertions(+), 42 deletions(-)
Modulo the access check, which should be shared,
r~