Unverified Commit b2ef6ab9 authored by Alistair Francis's avatar Alistair Francis Committed by Palmer Dabbelt
Browse files

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



Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 36a18664

target/riscv/cpu_helper.c

+18 −6
Original line number Diff line number Diff line
@@ -587,16 +587,28 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address, 
    }

    switch (access_type) {

    case MMU_INST_FETCH:

        if (riscv_cpu_virt_enabled(env) && !first_stage) {

            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;

    case MMU_DATA_LOAD:

        if (riscv_cpu_virt_enabled(env) && !first_stage) {

            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;

    case MMU_DATA_STORE:

        if (riscv_cpu_virt_enabled(env) && !first_stage) {

            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;

    default:

        g_assert_not_reached();