On 01/07/16 07:41, David Gibson wrote: > From: Benjamin Herrenschmidt <b378bb0948277d71c78bc6d0c1ef80a253aafc80> > > The architecture specifies that any instruction that sets MSR:PR will also > set MSR:EE, IR and DR. > > Signed-off-by: Benjamin Herrenschmidt <b...@kernel.crashing.org> > Signed-off-by: Cédric Le Goater <c...@kaod.org> > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> > --- > target-ppc/helper_regs.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h > index 8fc0934..8fdfa5c 100644 > --- a/target-ppc/helper_regs.h > +++ b/target-ppc/helper_regs.h > @@ -136,6 +136,10 @@ static inline int hreg_store_msr(CPUPPCState *env, > target_ulong value, > /* Change the exception prefix on PowerPC 601 */ > env->excp_prefix = ((value >> MSR_EP) & 1) * 0xFFF00000; > } > + /* If PR=1 then EE, IR and DR must be 1 */ > + if ((value >> MSR_PR) & 1) { > + value |= (1 << MSR_EE) | (1 << MSR_DR) | (1 << MSR_IR); > + } > #endif > env->msr = value; > hreg_compute_hflags(env); >
Unfortunately this patch causes a regression and breaks booting OS 9 and OS X under qemu-system-ppc. ATB, Mark.