starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

target/arm/ptw: Flip sense of get_phys_addr_gpc return value

Browse Source 
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20260515142541.571911-12-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell
2026-05-15 15:25:38 +01:00
parent df93432713
commit 1567e559ff
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
target/arm/ptw.c
View File

@@ -667,7 +667,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
};
GetPhysAddrResult s2 = { };
if (get_phys_addr_gpc(env, &s2ptw, addr, MMU_DATA_LOAD, 0, &s2, fi)) {
if (!get_phys_addr_gpc(env, &s2ptw, addr, MMU_DATA_LOAD, 0, &s2, fi)) {
goto fail;
}
@@ -3806,7 +3806,7 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Translate *ptw,
{
if (!get_phys_addr_nogpc(env, ptw, address, access_type,
memop, result, fi)) {
return true;
return false;
}
if (FIELD_EX64(env->cp15.gpccr_el3, GPCCR, GPC)) {
@@ -3826,11 +3826,11 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Translate *ptw,
result->f.attrs.space, ptw->in_space,
fi)) {
fi->type = ARMFault_GPCFOnOutput;
return true;
return false;
}
}
return false;
return true;
}
bool get_phys_addr_for_at(CPUARMState *env, vaddr address,
@@ -3939,7 +3939,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address,
.in_prot_check = 1 << access_type,
};
return get_phys_addr_gpc(env, &ptw, address, access_type,
return !get_phys_addr_gpc(env, &ptw, address, access_type,
memop, result, fi);
}
@@ -3956,16 +3956,16 @@ static bool arm_cpu_get_phys_addr(CPUARMState *env, vaddr addr,
};
GetPhysAddrResult res = {};
ARMMMUFaultInfo fi = {};
bool fault = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi);
bool ok = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi);
if (!fault) {
if (ok) {
/* translation succeeded */
result->physaddr = res.f.phys_addr;
result->attrs = res.f.attrs;
result->attrs.debug = 1;
result->lg_page_size = res.f.lg_page_size;
}
return fault;
return !ok;
}
bool arm_cpu_translate_for_debug(CPUState *cs, vaddr addr,