ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm: Pass MemOp to get_phys_addr_nogpc 

Zero is the safe do-nothing value for callers to use.
Pass the value through from get_phys_addr_gpc and
get_phys_addr_with_space_nogpc.

Reviewed-by: Helge Deller <deller@gmx.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-10-05 07:36:10 -07:00
parent 5458670b15
commit c6cd9f9fa9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/arm/ptw.c
View File

@ -75,7 +75,7 @@ typedef struct S1Translate {
static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw, static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw,
vaddr address, vaddr address,
MMUAccessType access_type, MMUAccessType access_type, MemOp memop,
GetPhysAddrResult *result, GetPhysAddrResult *result,
ARMMMUFaultInfo *fi); ARMMMUFaultInfo *fi);
@ -3313,7 +3313,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
ARMSecuritySpace ipa_space; ARMSecuritySpace ipa_space;
uint64_t hcr; uint64_t hcr;
ret = get_phys_addr_nogpc(env, ptw, address, access_type, result, fi); ret = get_phys_addr_nogpc(env, ptw, address, access_type, 0, result, fi);
/* If S1 fails, return early. */ /* If S1 fails, return early. */
if (ret) { if (ret) {
@ -3339,7 +3339,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
cacheattrs1 = result->cacheattrs; cacheattrs1 = result->cacheattrs;
memset(result, 0, sizeof(*result)); memset(result, 0, sizeof(*result));
ret = get_phys_addr_nogpc(env, ptw, ipa, access_type, result, fi); ret = get_phys_addr_nogpc(env, ptw, ipa, access_type, 0, result, fi);
fi->s2addr = ipa; fi->s2addr = ipa;
/* Combine the S1 and S2 perms. */ /* Combine the S1 and S2 perms. */
@ -3406,7 +3406,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw, static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw,
vaddr address, vaddr address,
MMUAccessType access_type, MMUAccessType access_type, MemOp memop,
GetPhysAddrResult *result, GetPhysAddrResult *result,
ARMMMUFaultInfo *fi) ARMMMUFaultInfo *fi)
{ {
@ -3547,7 +3547,8 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Translate *ptw,
GetPhysAddrResult *result, GetPhysAddrResult *result,
ARMMMUFaultInfo *fi) ARMMMUFaultInfo *fi)
{ {
if (get_phys_addr_nogpc(env, ptw, address, access_type, result, fi)) { if (get_phys_addr_nogpc(env, ptw, address, access_type,
memop, result, fi)) {
return true; return true;
} }
if (!granule_protection_check(env, result->f.phys_addr, if (!granule_protection_check(env, result->f.phys_addr,
@ -3568,7 +3569,8 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address,
.in_mmu_idx = mmu_idx, .in_mmu_idx = mmu_idx,
.in_space = space, .in_space = space,
}; };
return get_phys_addr_nogpc(env, &ptw, address, access_type, result, fi); return get_phys_addr_nogpc(env, &ptw, address, access_type,
memop, result, fi);
} }
bool get_phys_addr(CPUARMState *env, vaddr address, bool get_phys_addr(CPUARMState *env, vaddr address,