yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-22 19:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/riscv: Adjust privilege level for HLV(X)/HSV instructions

Browse source 
According to the specification the "field SPVP of hstatus controls the
privilege level of the access" for the hypervisor virtual-machine load
and store instructions HLV, HLVX and HSV.

Backports 90ec1cff768fcbe1fa2870d2018f378376f4f744
This commit is contained in:
Georg Kotheimer 2021-03-30 15:10:40 -04:00 committed by Lioncash
parent 85ccd1a71e
commit eb778614fb
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
qemu/target/riscv/cpu_helper.c
View file

@ -361,7 +361,11 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,
use_background = true; use_background = true;
} }
if (mode == PRV_M && access_type != MMU_INST_FETCH) { /* MPRV does not affect the virtual-machine load/store
instructions, HLV, HLVX, and HSV. */
if (riscv_cpu_two_stage_lookup(mmu_idx)) {
mode = get_field(env->hstatus, HSTATUS_SPVP);
} else if (mode == PRV_M && access_type != MMU_INST_FETCH) {
if (get_field(env->mstatus, MSTATUS_MPRV)) { if (get_field(env->mstatus, MSTATUS_MPRV)) {
mode = get_field(env->mstatus, MSTATUS_MPP); mode = get_field(env->mstatus, MSTATUS_MPP);
} }
@ -731,19 +735,18 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
qemu_log_mask(CPU_LOG_MMU, "%s ad %" VADDR_PRIx " rw %d mmu_idx %d\n", qemu_log_mask(CPU_LOG_MMU, "%s ad %" VADDR_PRIx " rw %d mmu_idx %d\n",
__func__, address, access_type, mmu_idx); __func__, address, access_type, mmu_idx);
if (mode == PRV_M && access_type != MMU_INST_FETCH) { /* MPRV does not affect the virtual-machine load/store
if (get_field(env->mstatus, MSTATUS_MPRV)) { instructions, HLV, HLVX, and HSV. */
mode = get_field(env->mstatus, MSTATUS_MPP); if (riscv_cpu_two_stage_lookup(mmu_idx)) {
mode = get_field(env->hstatus, HSTATUS_SPVP);
} else if (mode == PRV_M && access_type != MMU_INST_FETCH &&
get_field(env->mstatus, MSTATUS_MPRV)) {
mode = get_field(env->mstatus, MSTATUS_MPP);
if (riscv_has_ext(env, RVH) && get_field(env->mstatus, MSTATUS_MPV)) {
two_stage_lookup = true;
} }
} }
if (riscv_has_ext(env, RVH) && env->priv == PRV_M &&
access_type != MMU_INST_FETCH &&
get_field(env->mstatus, MSTATUS_MPRV) &&
get_field(env->mstatus, MSTATUS_MPV)) {
two_stage_lookup = true;
}
if (riscv_cpu_virt_enabled(env) || if (riscv_cpu_virt_enabled(env) ||
((riscv_cpu_two_stage_lookup(mmu_idx) || two_stage_lookup) && ((riscv_cpu_two_stage_lookup(mmu_idx) || two_stage_lookup) &&
access_type != MMU_INST_FETCH)) { access_type != MMU_INST_FETCH)) {