From: Peter Maydell <[email protected]> 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 <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-id: [email protected] Message-ID: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/ptw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 7dd3a7a3ede..24656b1a062 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3942,7 +3942,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address, memop, result, fi); } -static hwaddr arm_cpu_get_phys_page(CPUARMState *env, vaddr addr, +static hwaddr arm_cpu_get_phys_addr(CPUARMState *env, vaddr addr, MemTxAttrs *attrs, ARMMMUIdx mmu_idx) { S1Translate ptw = { @@ -3970,7 +3970,7 @@ hwaddr arm_cpu_get_phys_addr_attrs_debug(CPUState *cs, vaddr addr, CPUARMState *env = &cpu->env; ARMMMUIdx mmu_idx = arm_mmu_idx(env); - hwaddr res = arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); + hwaddr res = arm_cpu_get_phys_addr(env, addr, attrs, mmu_idx); if (res != -1) { return res; @@ -3984,10 +3984,10 @@ hwaddr arm_cpu_get_phys_addr_attrs_debug(CPUState *cs, vaddr addr, switch (mmu_idx) { case ARMMMUIdx_E10_1: case ARMMMUIdx_E10_1_PAN: - return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E10_0); + return arm_cpu_get_phys_addr(env, addr, attrs, ARMMMUIdx_E10_0); case ARMMMUIdx_E20_2: case ARMMMUIdx_E20_2_PAN: - return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E20_0); + return arm_cpu_get_phys_addr(env, addr, attrs, ARMMMUIdx_E20_0); default: return -1; } -- 2.53.0
