yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-06 12:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/riscv: Raise the new execptions when 2nd stage translation fails

Browse source 
Backports commit b2ef6ab9fee6948cf016f9e741feecdfb333fcbe from qemu
This commit is contained in:
Alistair Francis 2020-03-22 02:08:50 -04:00 committed by Lioncash
parent 773757a919
commit 141c47a286
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -581,16 +581,28 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address,
} }
switch (access_type) { switch (access_type) {
case MMU_INST_FETCH: case MMU_INST_FETCH:
cs->exception_index = page_fault_exceptions ? if (riscv_cpu_virt_enabled(env) && !first_stage) {
RISCV_EXCP_INST_PAGE_FAULT : RISCV_EXCP_INST_ACCESS_FAULT; cs->exception_index = RISCV_EXCP_INST_GUEST_PAGE_FAULT;
} else {
cs->exception_index = page_fault_exceptions ?
RISCV_EXCP_INST_PAGE_FAULT : RISCV_EXCP_INST_ACCESS_FAULT;
}
break; break;
case MMU_DATA_LOAD: case MMU_DATA_LOAD:
cs->exception_index = page_fault_exceptions ? if (riscv_cpu_virt_enabled(env) && !first_stage) {
RISCV_EXCP_LOAD_PAGE_FAULT : RISCV_EXCP_LOAD_ACCESS_FAULT; cs->exception_index = RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT;
} else {
cs->exception_index = page_fault_exceptions ?
RISCV_EXCP_LOAD_PAGE_FAULT : RISCV_EXCP_LOAD_ACCESS_FAULT;
}
break; break;
case MMU_DATA_STORE: case MMU_DATA_STORE:
cs->exception_index = page_fault_exceptions ? if (riscv_cpu_virt_enabled(env) && !first_stage) {
RISCV_EXCP_STORE_PAGE_FAULT : RISCV_EXCP_STORE_AMO_ACCESS_FAULT; cs->exception_index = RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT;
} else {
cs->exception_index = page_fault_exceptions ?
RISCV_EXCP_STORE_PAGE_FAULT : RISCV_EXCP_STORE_AMO_ACCESS_FAULT;
}
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();