SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc: Don't compile ppc_tlb_invalid_all without TCG

Browse Source 
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) <lucas.araujo@eldorado.org.br>
Message-Id: <20210708164957.28096-2-lucas.araujo@eldorado.org.br>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Lucas Mateus Castro (alqotel) 2021-07-08 13:49:54 -03:00 committed by David Gibson
parent 5f2eb04961
commit 89bb5a4dfd
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/ppc/cpu_init.c
View File

@ -8847,9 +8847,11 @@ static void ppc_cpu_reset(DeviceState *dev)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->nip = env->hreset_vector | env->excp_prefix; env->nip = env->hreset_vector | env->excp_prefix;
#if defined(CONFIG_TCG)
if (env->mmu_model != POWERPC_MMU_REAL) { if (env->mmu_model != POWERPC_MMU_REAL) {
ppc_tlb_invalidate_all(env); ppc_tlb_invalidate_all(env);
} }
#endif /* CONFIG_TCG */
#endif #endif
hreg_compute_hflags(env); hreg_compute_hflags(env);

4
target/ppc/mmu_helper.c
View File

@ -825,6 +825,7 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
return ret; return ret;
} }
#ifdef CONFIG_TCG
static void booke206_flush_tlb(CPUPPCState *env, int flags, static void booke206_flush_tlb(CPUPPCState *env, int flags,
const int check_iprot) const int check_iprot)
{ {
@ -846,6 +847,7 @@ static void booke206_flush_tlb(CPUPPCState *env, int flags,
tlb_flush(env_cpu(env)); tlb_flush(env_cpu(env));
} }
#endif
static hwaddr booke206_tlb_to_page_size(CPUPPCState *env, static hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
ppcmas_tlb_t *tlb) ppcmas_tlb_t *tlb)
@ -1901,6 +1903,7 @@ void helper_store_601_batl(CPUPPCState *env, uint32_t nr, target_ulong value)
} }
#endif #endif
#ifdef CONFIG_TCG
/*****************************************************************************/ /*****************************************************************************/
/* TLB management */ /* TLB management */
void ppc_tlb_invalidate_all(CPUPPCState *env) void ppc_tlb_invalidate_all(CPUPPCState *env)
@ -1944,6 +1947,7 @@ void ppc_tlb_invalidate_all(CPUPPCState *env)
break; break;
} }
} }
#endif
#ifdef CONFIG_TCG #ifdef CONFIG_TCG
void ppc_tlb_invalidate_one(CPUPPCState *env, target_ulong addr) void ppc_tlb_invalidate_one(CPUPPCState *env, target_ulong addr)