hash32_load_hpte() helpers are only used within mmu-hash32.c, no need to have each file including "mmu-hash32.h" to compile them. Move their definition to this source file.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/ppc/mmu-hash32.h | 16 ---------------- target/ppc/mmu-hash32.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/target/ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h index 5705f57935b..bfea03ea872 100644 --- a/target/ppc/mmu-hash32.h +++ b/target/ppc/mmu-hash32.h @@ -71,22 +71,6 @@ static inline hwaddr ppc_hash32_hpt_mask(PowerPCCPU *cpu) return ((cpu->env.spr[SPR_SDR1] & SDR_32_HTABMASK) << 16) | 0xFFFF; } -static inline target_ulong ppc_hash32_load_hpte0(PowerPCCPU *cpu, - hwaddr pte_offset) -{ - target_ulong base = ppc_hash32_hpt_base(cpu); - - return ldl_phys(CPU(cpu)->as, base + pte_offset); -} - -static inline target_ulong ppc_hash32_load_hpte1(PowerPCCPU *cpu, - hwaddr pte_offset) -{ - target_ulong base = ppc_hash32_hpt_base(cpu); - - return ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2); -} - static inline hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash) { return (hash * HASH_PTEG_SIZE_32) & ppc_hash32_hpt_mask(cpu); diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index 8b980a5aa90..08c9f63a132 100644 --- a/target/ppc/mmu-hash32.c +++ b/target/ppc/mmu-hash32.c @@ -201,6 +201,20 @@ static bool ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr, return false; } +static target_ulong ppc_hash32_load_hpte0(PowerPCCPU *cpu, hwaddr pte_offset) +{ + target_ulong base = ppc_hash32_hpt_base(cpu); + + return ldl_phys(CPU(cpu)->as, base + pte_offset); +} + +static target_ulong ppc_hash32_load_hpte1(PowerPCCPU *cpu, hwaddr pte_offset) +{ + target_ulong base = ppc_hash32_hpt_base(cpu); + + return ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2); +} + static hwaddr ppc_hash32_pteg_search(PowerPCCPU *cpu, hwaddr pteg_off, bool secondary, target_ulong ptem, ppc_hash_pte32_t *pte) -- 2.53.0
