target/arm/ptw: Flip sense of get_phys_addr_gpc return value
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
Peter Maydell committed
May 15, 2026 at 15:25 UTC
1567e559ff7cfe024f2bfbf62b1a08d5d54412fe
1 file changed
+8
-8
target/arm/ptw.c
+8
-8
@@ -667,7 +667,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
667
};
668
GetPhysAddrResult s2 = { };
669
670
- if (get_phys_addr_gpc(env, &s2ptw, addr, MMU_DATA_LOAD, 0, &s2, fi)) {
670
+ if (!get_phys_addr_gpc(env, &s2ptw, addr, MMU_DATA_LOAD, 0, &s2, fi)) {
671
goto fail;
672
}
673
@@ -3806,7 +3806,7 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Translate *ptw,
3806
{
3807
if (!get_phys_addr_nogpc(env, ptw, address, access_type,
3808
memop, result, fi)) {
3809
- return true;
3809
+ return false;
3810
}
3811
3812
if (FIELD_EX64(env->cp15.gpccr_el3, GPCCR, GPC)) {
@@ -3826,11 +3826,11 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Translate *ptw,
3826
result->f.attrs.space, ptw->in_space,
3827
fi)) {
3828
fi->type = ARMFault_GPCFOnOutput;
3829
- return true;
3829
+ return false;
3830
}
3831
}
3832
3833
- return false;
3833
+ return true;
3834
}
3835
3836
bool get_phys_addr_for_at(CPUARMState *env, vaddr address,
@@ -3939,7 +3939,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address,
3939
.in_prot_check = 1 << access_type,
3940
};
3941
3942
- return get_phys_addr_gpc(env, &ptw, address, access_type,
3942
+ return !get_phys_addr_gpc(env, &ptw, address, access_type,
3943
memop, result, fi);
3944
}
3945
@@ -3956,16 +3956,16 @@ static bool arm_cpu_get_phys_addr(CPUARMState *env, vaddr addr,
3956
};
3957
GetPhysAddrResult res = {};
3958
ARMMMUFaultInfo fi = {};
3959
- bool fault = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi);
3959
+ bool ok = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi);
3960
3961
- if (!fault) {
3961
+ if (ok) {
3962
/* translation succeeded */
3963
result->physaddr = res.f.phys_addr;
3964
result->attrs = res.f.attrs;
3965
result->attrs.debug = 1;
3966
result->lg_page_size = res.f.lg_page_size;
3967
}
3968
- return fault;
3968
+ return !ok;
3969
}
3970
3971
bool arm_cpu_translate_for_debug(CPUState *cs, vaddr addr,