From: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Date: Mon, 11 Jan 2010 14:23:58 +0000 (+0100)
Subject: ppc-40x: Correct decoding of zone protection bits.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ec5c3e487eb49100e6cb1b84e7f0bd022fbbf54b;p=qemu.git

ppc-40x: Correct decoding of zone protection bits.

The 40x MMU has 15 zones in the ZPR register.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index b233d4f535..f9b55890d3 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -1155,7 +1155,7 @@ static int mmu40x_get_physical_address (CPUState *env, mmu_ctx_t *ctx,
                              env->spr[SPR_40x_PID], 0, i) < 0)
             continue;
         zsel = (tlb->attr >> 4) & 0xF;
-        zpr = (env->spr[SPR_40x_ZPR] >> (28 - (2 * zsel))) & 0x3;
+        zpr = (env->spr[SPR_40x_ZPR] >> (30 - (2 * zsel))) & 0x3;
         LOG_SWTLB("%s: TLB %d zsel %d zpr %d rw %d attr %08x\n",
                     __func__, i, zsel, zpr, rw, tlb->attr);
         /* Check execute enable bit */