From 330c4d61a65801b994e7498163cec3ca74c4ece4 Mon Sep 17 00:00:00 2001 From: balrog Date: Sun, 29 Jul 2007 22:21:45 +0000 Subject: [PATCH] Fix XScale MMU's extended small pages. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3093 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-arm/helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 260a04a..8132d0c 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -516,16 +516,16 @@ static int get_phys_addr(CPUState *env, uint32_t address, int access_type, ap = (desc >> (4 + ((address >> 13) & 6))) & 3; break; case 3: /* 1k page. */ - if (arm_feature(env, ARM_FEATURE_XSCALE)) - phys_addr = (desc & 0xfffff000) | (address & 0xfff); - else { - if (type == 1) { + if (type == 1) { + if (arm_feature(env, ARM_FEATURE_XSCALE)) + phys_addr = (desc & 0xfffff000) | (address & 0xfff); + else { /* Page translation fault. */ code = 7; goto do_fault; } + } else phys_addr = (desc & 0xfffffc00) | (address & 0x3ff); - } ap = (desc >> 4) & 3; break; default: -- 1.7.9.5