target/arm: Rename arm_cpu_get_phys_page()
The internal helper function arm_cpu_get_phys_page() is named that way because of its use in the get_phys_page_attrs_debug method. Now we've renamed the method, rename the helper to match, since it can handle non-page-aligned addresses. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-id: 20260417173105.1648172-12-peter.maydell@linaro.org Message-ID: <20260430093810.2762539-13-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Peter Maydell committed
Apr 30, 2026 at 10:37 UTC
11f5c51557ae08db38eea9df70adc8544bf2a6b2
1 file changed
+4
-4
target/arm/ptw.c
+4
-4
@@ -3942,7 +3942,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address,
3942
memop, result, fi);
3943
}
3944
3945
-static hwaddr arm_cpu_get_phys_page(CPUARMState *env, vaddr addr,
3945
+static hwaddr arm_cpu_get_phys_addr(CPUARMState *env, vaddr addr,
3946
MemTxAttrs *attrs, ARMMMUIdx mmu_idx)
3947
{
3948
S1Translate ptw = {
@@ -3970,7 +3970,7 @@ hwaddr arm_cpu_get_phys_addr_attrs_debug(CPUState *cs, vaddr addr,
3970
CPUARMState *env = &cpu->env;
3971
ARMMMUIdx mmu_idx = arm_mmu_idx(env);
3972
3973
- hwaddr res = arm_cpu_get_phys_page(env, addr, attrs, mmu_idx);
3973
+ hwaddr res = arm_cpu_get_phys_addr(env, addr, attrs, mmu_idx);
3974
3975
if (res != -1) {
3976
return res;
@@ -3984,10 +3984,10 @@ hwaddr arm_cpu_get_phys_addr_attrs_debug(CPUState *cs, vaddr addr,
3984
switch (mmu_idx) {
3985
case ARMMMUIdx_E10_1:
3986
case ARMMMUIdx_E10_1_PAN:
3987
- return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E10_0);
3987
+ return arm_cpu_get_phys_addr(env, addr, attrs, ARMMMUIdx_E10_0);
3988
case ARMMMUIdx_E20_2:
3989
case ARMMMUIdx_E20_2_PAN:
3990
- return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E20_0);
3990
+ return arm_cpu_get_phys_addr(env, addr, attrs, ARMMMUIdx_E20_0);
3991
default:
3992
return -1;
3993
}