The function ppc_tlb_invalid_all is not compiled anymore in a TCG-less environment, and the call to that function has been disabled in this situation.
Signed-off-by: Lucas Mateus Castro (alqotel) <[email protected]> --- Is there a better way than to deal with the ppc_tlb_invalidate_all call than ifdef? I couldn't think of one. --- target/ppc/cpu_init.c | 4 ++++ target/ppc/mmu_helper.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 74a397ad6c..2051f24467 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -9114,7 +9114,11 @@ static void ppc_cpu_reset(DeviceState *dev) #if !defined(CONFIG_USER_ONLY) env->nip = env->hreset_vector | env->excp_prefix; if (env->mmu_model != POWERPC_MMU_REAL) { +#if defined(CONFIG_TCG) ppc_tlb_invalidate_all(env); +#else + cpu_abort(env_cpu(env),"PowerPC not in real mode, invalid in this build\n"); +#endif } #endif diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 1ecb36e85a..803b66f2b0 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -825,6 +825,7 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, return ret; } +#ifdef CONFIG_TCG static void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot) { @@ -846,6 +847,7 @@ static void booke206_flush_tlb(CPUPPCState *env, int flags, tlb_flush(env_cpu(env)); } +#endif static hwaddr booke206_tlb_to_page_size(CPUPPCState *env, ppcmas_tlb_t *tlb) @@ -1952,6 +1954,7 @@ void helper_store_601_batl(CPUPPCState *env, uint32_t nr, target_ulong value) } #endif +#ifdef CONFIG_TCG /*****************************************************************************/ /* TLB management */ void ppc_tlb_invalidate_all(CPUPPCState *env) @@ -1995,6 +1998,7 @@ void ppc_tlb_invalidate_all(CPUPPCState *env) break; } } +#endif #ifdef CONFIG_TCG void ppc_tlb_invalidate_one(CPUPPCState *env, target_ulong addr) -- 2.17.1
