Skip to content

Fixes for PPC64 CPU emulation #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kukrimate wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for PPC64 CPU emulation #2308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c6bbb
Fix setting PPC64 CPU model manually
kukrimate Mar 10, 2026
d36cfd6
Actually set MSR.HV correctly on reset
kukrimate Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion qemu/target/ppc/translate_init.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10140,6 +10140,7 @@ static void ppc_cpu_reset(CPUState *dev)
}
#endif

env->msr |= MSR_HVB; // alter_hv only does anything if MSR_HVB is already set
hreg_store_msr(env, msr, 1);

env->nip = env->hreset_vector | env->excp_prefix;
Expand Down Expand Up @@ -11024,11 +11025,12 @@ PowerPCCPU *cpu_ppc_init(struct uc_struct *uc)
memset(cpu, 0, sizeof(*cpu));
#ifdef TARGET_PPC64
if (uc->cpu_model == INT_MAX) {
uc->cpu_model = UC_CPU_PPC64_POWER10_V1_0 + UC_CPU_PPC32_7457A_V1_2 + 1; // power10_v1.0
uc->cpu_model = UC_CPU_PPC64_POWER10_V1_0; // power10_v1.0
} else if (uc->cpu_model + UC_CPU_PPC32_7457A_V1_2 + 1 >= ARRAY_SIZE(ppc_cpus)) {
free(cpu);
return NULL;
}
uc->cpu_model += UC_CPU_PPC32_7457A_V1_2 + 1; // PPC64 models come after PPC32
#else
if (uc->cpu_model == INT_MAX) {
uc->cpu_model = UC_CPU_PPC32_7457A_V1_2; // 7457a_v1.2
Expand Down