From c836112997e19966565cd6eb68e0836c8972720b Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Fri, 22 Jul 2016 17:18:05 +0200 Subject: [PATCH] linux-user: ppc64: set MSR_CM bit for BookE 2.06 MMU 64 bit user mode doesn't work for the e5500 core because the MSR_CM bit is not set which enables the 64 bit mode for this MMU model. Memory addresses are truncated to 32 bit, which results in "Invalid data memory access" error messages. Fix it by setting the MSR_CM bit for this MMU model. Signed-off-by: Michael Walle Reviewed-by: Alexander Graf Signed-off-by: Riku Voipio --- linux-user/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 3ad70f8a6e..2aeda8a10d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4615,10 +4615,11 @@ int main(int argc, char **argv, char **envp) int i; #if defined(TARGET_PPC64) + int flag = (env->insns_flags2 & PPC2_BOOKE206) ? MSR_CM : MSR_SF; #if defined(TARGET_ABI32) - env->msr &= ~((target_ulong)1 << MSR_SF); + env->msr &= ~((target_ulong)1 << flag); #else - env->msr |= (target_ulong)1 << MSR_SF; + env->msr |= (target_ulong)1 << flag; #endif #endif env->nip = regs->nip;