On 21.06.2012, at 20:09, Blue Swirl <blauwir...@gmail.com> wrote:
> On Wed, Jun 20, 2012 at 8:11 PM, Alexander Graf <ag...@suse.de> wrote: >> Some machines have MSR bits they reset with as enabled. Don't hardcode the >> logic, but let the individual core implementations save their own reset >> mask into an env variable. >> >> Signed-off-by: Alexander Graf <ag...@suse.de> >> --- >> target-ppc/cpu.h | 1 + >> target-ppc/translate_init.c | 14 ++++++++------ >> 2 files changed, 9 insertions(+), 6 deletions(-) >> >> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h >> index 652a35a..acf5816 100644 >> --- a/target-ppc/cpu.h >> +++ b/target-ppc/cpu.h >> @@ -1043,6 +1043,7 @@ struct CPUPPCState { >> #if defined(TARGET_PPC64) >> struct ppc_segment_page_sizes sps; >> #endif >> + uint64_t reset_msr; >> >> #if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) >> target_phys_addr_t vpa; >> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c >> index 57027a2..efa05fc 100644 >> --- a/target-ppc/translate_init.c >> +++ b/target-ppc/translate_init.c >> @@ -6273,6 +6273,7 @@ static void init_proc_970 (CPUPPCState *env) >> env->slb_nr = 32; >> #endif >> init_excp_970(env); >> + env->reset_msr = (1ULL < MSR_SF); > > The parenthesis are not necessary. Already dropped this patch :). Alex