diff options
| -rw-r--r-- | target-ppc/cpu.h | 9 | ||||
| -rw-r--r-- | target-ppc/excp_helper.c | 9 | ||||
| -rw-r--r-- | target-ppc/mem_helper.c | 2 | ||||
| -rw-r--r-- | target-ppc/translate.c | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 12200ab443..7a77fff077 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -2212,6 +2212,15 @@ static inline uint32_t booke206_tlbnps(CPUPPCState *env, const int tlbn) #endif +static inline bool msr_is_64bit(CPUPPCState *env, target_ulong msr) +{ + if (env->mmu_model == POWERPC_MMU_BOOKE206) { + return msr & (1ULL << MSR_CM); + } + + return msr & (1ULL << MSR_SF); +} + extern void (*cpu_ppc_hypercall)(CPUPPCState *); static inline bool cpu_has_work(CPUPPCState *env) diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c index c7762b99c5..1a593f6f3f 100644 --- a/target-ppc/excp_helper.c +++ b/target-ppc/excp_helper.c @@ -608,10 +608,11 @@ static inline void powerpc_excp(CPUPPCState *env, int excp_model, int excp) vector |= env->excp_prefix; #if defined(TARGET_PPC64) if (excp_model == POWERPC_EXCP_BOOKE) { - if (!msr_icm) { - vector = (uint32_t)vector; - } else { + if (env->spr[SPR_BOOKE_EPCR] & EPCR_ICM) { + /* Cat.64-bit: EPCR.ICM is copied to MSR.CM */ new_msr |= (target_ulong)1 << MSR_CM; + } else { + vector = (uint32_t)vector; } } else { if (!msr_isf && !(env->mmu_model & POWERPC_MMU_64)) { @@ -803,7 +804,7 @@ static inline void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr, target_ulong msrm, int keep_msrh) { #if defined(TARGET_PPC64) - if (msr & (1ULL << MSR_SF)) { + if (msr_is_64bit(env, msr)) { nip = (uint64_t)nip; msr &= (uint64_t)msrm; } else { diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c index ebcd7b24a8..5b5f1bdd23 100644 --- a/target-ppc/mem_helper.c +++ b/target-ppc/mem_helper.c @@ -35,7 +35,7 @@ static inline target_ulong addr_add(CPUPPCState *env, target_ulong addr, target_long arg) { #if defined(TARGET_PPC64) - if (!msr_sf) { + if (!msr_is_64bit(env, env->msr)) { return (uint32_t)(addr + arg); } else #endif diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 9103fd5776..73ee74be21 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -9626,7 +9626,7 @@ static inline void gen_intermediate_code_internal(CPUPPCState *env, ctx.access_type = -1; ctx.le_mode = env->hflags & (1 << MSR_LE) ? 1 : 0; #if defined(TARGET_PPC64) - ctx.sf_mode = msr_sf; + ctx.sf_mode = msr_is_64bit(env, env->msr); ctx.has_cfar = !!(env->flags & POWERPC_FLAG_CFAR); #endif ctx.fpu_enabled = msr_fp; |