From deb6ed13ebfcd6c73548225347c5f63225bb471f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 4 Jun 2014 00:27:31 +0200 Subject: [PATCH] PPC: e500: Fix TLB lookup for 32bit CPUs When we run 32bit guest CPUs (or 32bit guest code on 64bit CPUs) on qemu-system-ppc64 the TLB lookup will use the full effective address as pointer. However, only the first 32bits are valid when MSR.CM = 0. Check for that condition. This makes QEMU boot an e500v2 guest with more than 1G of RAM for me. Signed-off-by: Alexander Graf --- target-ppc/mmu_helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 1e70536..4d6b1e2 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -903,6 +903,11 @@ static int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb, target_ulong mask; uint32_t tlb_pid; + if (!msr_cm) { + /* In 32bit mode we can only address 32bit EAs */ + address = (uint32_t)address; + } + /* Check valid flag */ if (!(tlb->mas1 & MAS1_VALID)) { return -1; -- 2.7.4