[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] target/arm: Convert get_phys_addr_pmsav7() to
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 07/12] target/arm: Convert get_phys_addr_pmsav7() to not return FSC values |
Date: |
Tue, 5 Dec 2017 19:46:27 +0000 |
Make get_phys_addr_pmsav7() return a fault type in the ARMMMUFaultInfo
structure, which we convert to the FSC at the callsite.
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/helper.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 57286a7..0f5b161 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -9126,7 +9126,8 @@ static inline bool m_is_system_region(CPUARMState *env,
uint32_t address)
static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address,
MMUAccessType access_type, ARMMMUIdx mmu_idx,
- hwaddr *phys_ptr, int *prot, uint32_t *fsr)
+ hwaddr *phys_ptr, int *prot,
+ ARMMMUFaultInfo *fi)
{
ARMCPU *cpu = arm_env_get_cpu(env);
int n;
@@ -9221,7 +9222,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env,
uint32_t address,
if (n == -1) { /* no hits */
if (!pmsav7_use_background_region(cpu, mmu_idx, is_user)) {
/* background fault */
- *fsr = 0;
+ fi->type = ARMFault_Background;
return true;
}
get_phys_addr_pmsav7_default(env, mmu_idx, address, prot);
@@ -9279,7 +9280,8 @@ static bool get_phys_addr_pmsav7(CPUARMState *env,
uint32_t address,
}
}
- *fsr = 0x00d; /* Permission fault */
+ fi->type = ARMFault_Permission;
+ fi->level = 1;
return !(*prot & (1 << access_type));
}
@@ -9824,7 +9826,8 @@ static bool get_phys_addr(CPUARMState *env, target_ulong
address,
} else if (arm_feature(env, ARM_FEATURE_V7)) {
/* PMSAv7 */
ret = get_phys_addr_pmsav7(env, address, access_type, mmu_idx,
- phys_ptr, prot, fsr);
+ phys_ptr, prot, fi);
+ *fsr = arm_fi_to_sfsc(fi);
} else {
/* Pre-v7 MPU */
ret = get_phys_addr_pmsav5(env, address, access_type, mmu_idx,
--
2.7.4
- [Qemu-devel] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 12/12] target/arm: Extend PAR format determination, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 11/12] target/arm: Remove fsr argument from get_phys_addr() and arm_tlb_fill(), Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 10/12] target/arm: Ignore fsr from get_phys_addr() in do_ats_write(), Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 09/12] target/arm: Use ARMMMUFaultInfo in deliver_fault(), Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 07/12] target/arm: Convert get_phys_addr_pmsav7() to not return FSC values,
Peter Maydell <=
- [Qemu-devel] [PATCH 08/12] target/arm: Convert get_phys_addr_pmsav8() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 05/12] target/arm: Convert get_phys_addr_lpae() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 06/12] target/arm: Convert get_phys_addr_pmsav5() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 04/12] target/arm: Convert get_phys_addr_v6() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 03/12] target/arm: Convert get_phys_addr_v5() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 01/12] target/arm: Provide fault type enum and FSR conversion functions, Peter Maydell, 2017/12/05
- [Qemu-devel] [PATCH 02/12] target/arm: Remove fsr argument from arm_ld*_ptw(), Peter Maydell, 2017/12/05
- Re: [Qemu-devel] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Richard Henderson, 2017/12/07
- Re: [Qemu-devel] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Stefano Stabellini, 2017/12/08
- Re: [Qemu-devel] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Edgar E. Iglesias, 2017/12/11