target/ppc: moved ppc_store_sdr1 to mmu_common.c
ppc_store_sdr1 was at first in mmu_helper.c and was moved as part the patches to enable the disable-tcg option, now it's being moved back to a file that will be compiled with that option Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br> Message-Id: <20210723175627.72847-3-lucas.araujo@eldorado.org.br> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
5118ebe839
commit
d6ae8ec6ef
|
@ -67,34 +67,6 @@ uint32_t ppc_get_vscr(CPUPPCState *env)
|
||||||
return env->vscr | (sat << VSCR_SAT);
|
return env->vscr | (sat << VSCR_SAT);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SOFTMMU
|
|
||||||
void ppc_store_sdr1(CPUPPCState *env, target_ulong value)
|
|
||||||
{
|
|
||||||
PowerPCCPU *cpu = env_archcpu(env);
|
|
||||||
qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value);
|
|
||||||
assert(!cpu->env.has_hv_mode || !cpu->vhyp);
|
|
||||||
#if defined(TARGET_PPC64)
|
|
||||||
if (mmu_is_64bit(env->mmu_model)) {
|
|
||||||
target_ulong sdr_mask = SDR_64_HTABORG | SDR_64_HTABSIZE;
|
|
||||||
target_ulong htabsize = value & SDR_64_HTABSIZE;
|
|
||||||
|
|
||||||
if (value & ~sdr_mask) {
|
|
||||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid bits 0x"TARGET_FMT_lx
|
|
||||||
" set in SDR1", value & ~sdr_mask);
|
|
||||||
value &= sdr_mask;
|
|
||||||
}
|
|
||||||
if (htabsize > 28) {
|
|
||||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid HTABSIZE 0x" TARGET_FMT_lx
|
|
||||||
" stored in SDR1", htabsize);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif /* defined(TARGET_PPC64) */
|
|
||||||
/* FIXME: Should check for valid HTABMASK values in 32-bit case */
|
|
||||||
env->spr[SPR_SDR1] = value;
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_SOFTMMU */
|
|
||||||
|
|
||||||
/* GDBstub can read and write MSR... */
|
/* GDBstub can read and write MSR... */
|
||||||
void ppc_store_msr(CPUPPCState *env, target_ulong value)
|
void ppc_store_msr(CPUPPCState *env, target_ulong value)
|
||||||
{
|
{
|
||||||
|
|
|
@ -58,6 +58,32 @@
|
||||||
# define LOG_BATS(...) do { } while (0)
|
# define LOG_BATS(...) do { } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void ppc_store_sdr1(CPUPPCState *env, target_ulong value)
|
||||||
|
{
|
||||||
|
PowerPCCPU *cpu = env_archcpu(env);
|
||||||
|
qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value);
|
||||||
|
assert(!cpu->env.has_hv_mode || !cpu->vhyp);
|
||||||
|
#if defined(TARGET_PPC64)
|
||||||
|
if (mmu_is_64bit(env->mmu_model)) {
|
||||||
|
target_ulong sdr_mask = SDR_64_HTABORG | SDR_64_HTABSIZE;
|
||||||
|
target_ulong htabsize = value & SDR_64_HTABSIZE;
|
||||||
|
|
||||||
|
if (value & ~sdr_mask) {
|
||||||
|
qemu_log_mask(LOG_GUEST_ERROR, "Invalid bits 0x"TARGET_FMT_lx
|
||||||
|
" set in SDR1", value & ~sdr_mask);
|
||||||
|
value &= sdr_mask;
|
||||||
|
}
|
||||||
|
if (htabsize > 28) {
|
||||||
|
qemu_log_mask(LOG_GUEST_ERROR, "Invalid HTABSIZE 0x" TARGET_FMT_lx
|
||||||
|
" stored in SDR1", htabsize);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* defined(TARGET_PPC64) */
|
||||||
|
/* FIXME: Should check for valid HTABMASK values in 32-bit case */
|
||||||
|
env->spr[SPR_SDR1] = value;
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* PowerPC MMU emulation */
|
/* PowerPC MMU emulation */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue